diff --git a/apps/codecs/librm/rm.c b/apps/codecs/librm/rm.c index b205e7f88d..00ee37a2f2 100644 --- a/apps/codecs/librm/rm.c +++ b/apps/codecs/librm/rm.c @@ -29,7 +29,7 @@ #define SWAP(a, b) do{uint8_t SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) -void advance_buffer(uint8_t **buf, int val) +static void advance_buffer(uint8_t **buf, int val) { *buf += val; } diff --git a/apps/gui/list.c b/apps/gui/list.c index eb9c025a95..8a65d3f298 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -580,11 +580,6 @@ void gui_synclist_speak_item(struct gui_synclist * lists) else _gui_synclist_speak_item(lists, false); } -#if defined(HAVE_TOUCHSCREEN) -/* this needs to be fixed if we ever get more than 1 touchscreen on a target */ -unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list); -#endif - bool gui_synclist_do_button(struct gui_synclist * lists, int *actionptr, enum list_wrap wrap) { diff --git a/apps/gui/list.h b/apps/gui/list.h index 6b9f557d38..50aaebe93a 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h @@ -182,6 +182,11 @@ extern bool gui_synclist_do_button(struct gui_synclist * lists, int *action, enum list_wrap); +#if defined(HAVE_TOUCHSCREEN) +/* this needs to be fixed if we ever get more than 1 touchscreen on a target */ +unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list); +#endif + /* If the list has a pending postponed scheduled announcement, that may become due before the next get_action tmieout. This function adjusts the get_action timeout appropriately. */ diff --git a/apps/gui/wps.c b/apps/gui/wps.c index a5142a0726..29c9403235 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -197,7 +197,7 @@ bool is_wps_fading(void) return wps_fading_out; } -bool update_onvol_change(struct gui_wps * gwps) +static bool update_onvol_change(struct gui_wps * gwps) { skin_update(gwps, WPS_REFRESH_NON_STATIC); diff --git a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c index de39128497..2a0d3e41a3 100644 --- a/firmware/target/arm/imx31/gigabeat-s/system-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/system-imx31.c @@ -41,7 +41,7 @@ unsigned int iim_system_rev(void) return system_rev & IIM_SREV_SREV; } -unsigned int iim_prod_rev(void) +static unsigned int iim_prod_rev(void) { return product_rev; } diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c index 56c606f940..613cc759ee 100644 --- a/firmware/target/arm/ipod/video/lcd-video.c +++ b/firmware/target/arm/ipod/video/lcd-video.c @@ -123,9 +123,9 @@ unsigned flash_vmcs_length; Based on part of FS#6721. This may belong elsewhere. (BCM initialization uploads the vmcs section to the BCM.) */ -bool flash_get_section(const unsigned int imageid, - void **offset, - unsigned int *length) +static bool flash_get_section(const unsigned int imageid, + void **offset, + unsigned int *length) { unsigned long *p = (unsigned long*)(ROM_BASE + 0xffe00); unsigned char *csp, *csend; @@ -505,7 +505,7 @@ static void bcm_command(unsigned cmd) } } -void bcm_powerdown(void) +static void bcm_powerdown(void) { bcm_write32(0x10001400, bcm_read32(0x10001400) & ~0xF0); @@ -530,7 +530,7 @@ const unsigned char bcm_bootstrapdata[] = 0xA1, 0x81, 0x91, 0x02, 0x12, 0x22, 0x72, 0x62 }; -void bcm_init(void) +static void bcm_init(void) { int i; diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c index e74f2b8d43..db10f39057 100644 --- a/firmware/target/arm/iriver/h10/backlight-h10.c +++ b/firmware/target/arm/iriver/h10/backlight-h10.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "system.h" #include "backlight.h" +#include "backlight-target.h" #include "lcd.h" void _backlight_on(void) diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c index 1b61f31ea4..47c02cb351 100644 --- a/firmware/target/coldfire/iriver/h100/backlight-h100.c +++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c @@ -21,9 +21,9 @@ #include "config.h" #include "cpu.h" #include "kernel.h" -#include "thread.h" #include "system.h" #include "backlight.h" +#include "backlight-target.h" #include "lcd.h" /* Returns the current state of the backlight (true=ON, false=OFF). */ diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c index 7f63e75976..64e09b9b40 100644 --- a/firmware/target/coldfire/iriver/h300/backlight-h300.c +++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c @@ -24,6 +24,7 @@ #include "thread.h" #include "system.h" #include "backlight.h" +#include "backlight-target.h" #include "pcf50606.h" #include "lcd.h" diff --git a/firmware/target/coldfire/pcf50606-coldfire.c b/firmware/target/coldfire/pcf50606-coldfire.c index 03c22a12e9..6206ae4deb 100644 --- a/firmware/target/coldfire/pcf50606-coldfire.c +++ b/firmware/target/coldfire/pcf50606-coldfire.c @@ -447,7 +447,7 @@ unsigned char pcf50606_i2c_inb(bool ack) return byte; } -int pcf50606_i2c_write(int address, const unsigned char* buf, int count) +static int pcf50606_i2c_write(int address, const unsigned char* buf, int count) { int i,x=0; diff --git a/firmware/usbstack/usb_hid.c b/firmware/usbstack/usb_hid.c index e1ae75c0f9..4eb25841bb 100644 --- a/firmware/usbstack/usb_hid.c +++ b/firmware/usbstack/usb_hid.c @@ -277,7 +277,7 @@ void buf_dump(unsigned char *buf, size_t size) #define buf_dump(...) #endif -uint8_t buf_set_keyboard(unsigned char *buf, int id) +static uint8_t buf_set_keyboard(unsigned char *buf, int id) { memset(buf, 0, 7); @@ -289,7 +289,7 @@ uint8_t buf_set_keyboard(unsigned char *buf, int id) return 7; } -uint8_t buf_set_consumer(unsigned char *buf, int id) +static uint8_t buf_set_consumer(unsigned char *buf, int id) { memset(buf, 0, 4); buf[0] = (uint8_t)id;