From 0c1eff9334a595cc5ee3b9ae34675220445301cb Mon Sep 17 00:00:00 2001 From: sorgelig Date: Mon, 25 Jun 2018 01:23:19 +0800 Subject: [PATCH] Some minor fixes. --- brightness.cpp | 2 +- input.cpp | 2 ++ st_tos.cpp | 4 ++-- user_io.cpp | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/brightness.cpp b/brightness.cpp index 3b6ee0f..74e4df9 100644 --- a/brightness.cpp +++ b/brightness.cpp @@ -107,7 +107,7 @@ static int spi_open(int speed, int mode) return -1; } -static int spi_close() +static void spi_close() { if(spiFd >= 0) close(spiFd); spiFd = -1; diff --git a/input.cpp b/input.cpp index c932d97..aaf7410 100644 --- a/input.cpp +++ b/input.cpp @@ -2198,6 +2198,8 @@ int input_poll(int getchar) user_io_digital_joystick(i, af[i] ? joy[i] & ~autofire[i] : joy[i], newdir); } } + + return 0; } int is_key_pressed(int key) diff --git a/st_tos.cpp b/st_tos.cpp index e0e8a60..d8c9206 100644 --- a/st_tos.cpp +++ b/st_tos.cpp @@ -1126,9 +1126,9 @@ void tos_config_init(void) { // set default values config.system_ctrl = TOS_MEMCONFIG_4M | TOS_CONTROL_BLITTER; - memcpy(config.tos_img, "TOS.IMG", 12); + strcpy(config.tos_img, "TOS.IMG"); config.cart_img[0] = 0; - memcpy(config.acsi_img[0], "HARDDISK.HD", 12); + strcpy(config.acsi_img[0], "HARDDISK.HD"); config.acsi_img[1][0] = 0; config.video_adjust[0] = config.video_adjust[1] = 0; diff --git a/user_io.cpp b/user_io.cpp index 8b019ca..0bfdb48 100644 --- a/user_io.cpp +++ b/user_io.cpp @@ -2121,6 +2121,9 @@ static int findPLLpar(double Fout, uint32_t *pc, uint32_t *pm, double *pko) return 1; } } + + //will never reach here + return 0; } static void setPLL(double Fout) @@ -2173,7 +2176,7 @@ static void setPLL(double Fout) vitems[20] = k; } -static int setVideo() +static void setVideo() { printf("Send HDMI parameters:\n"); spi_uio_cmd_cont(UIO_SET_VIDEO);