diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-08-06 09:28:25 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-08-06 09:28:25 +0000 |
commit | d767883a417667ceebf5bb241d02337f34bc8016 (patch) | |
tree | 7136c4a1fd24d01176d3790e4b5d49f39cd6267b | |
parent | 0307cd16a094b9b03da8fbcf237470ce2ad75cf7 (diff) | |
download | rockbox-d767883a417667ceebf5bb241d02337f34bc8016.tar.gz rockbox-d767883a417667ceebf5bb241d02337f34bc8016.zip |
Various files: make functions static if they're local or make sure there is a proper #include if not
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22184 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/codecs/librm/rm.c | 2 | ||||
-rw-r--r-- | apps/gui/list.c | 5 | ||||
-rw-r--r-- | apps/gui/list.h | 5 | ||||
-rw-r--r-- | apps/gui/wps.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/system-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/video/lcd-video.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/iriver/h10/backlight-h10.c | 1 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/backlight-h100.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/backlight-h300.c | 1 | ||||
-rw-r--r-- | firmware/target/coldfire/pcf50606-coldfire.c | 2 | ||||
-rw-r--r-- | firmware/usbstack/usb_hid.c | 4 |
11 files changed, 19 insertions, 17 deletions
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 @@ | |||
29 | 29 | ||
30 | #define SWAP(a, b) do{uint8_t SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) | 30 | #define SWAP(a, b) do{uint8_t SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) |
31 | 31 | ||
32 | void advance_buffer(uint8_t **buf, int val) | 32 | static void advance_buffer(uint8_t **buf, int val) |
33 | { | 33 | { |
34 | *buf += val; | 34 | *buf += val; |
35 | } | 35 | } |
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) | |||
580 | else _gui_synclist_speak_item(lists, false); | 580 | else _gui_synclist_speak_item(lists, false); |
581 | } | 581 | } |
582 | 582 | ||
583 | #if defined(HAVE_TOUCHSCREEN) | ||
584 | /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ | ||
585 | unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list); | ||
586 | #endif | ||
587 | |||
588 | bool gui_synclist_do_button(struct gui_synclist * lists, | 583 | bool gui_synclist_do_button(struct gui_synclist * lists, |
589 | int *actionptr, enum list_wrap wrap) | 584 | int *actionptr, enum list_wrap wrap) |
590 | { | 585 | { |
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, | |||
182 | int *action, | 182 | int *action, |
183 | enum list_wrap); | 183 | enum list_wrap); |
184 | 184 | ||
185 | #if defined(HAVE_TOUCHSCREEN) | ||
186 | /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ | ||
187 | unsigned gui_synclist_do_touchscreen(struct gui_synclist * gui_list); | ||
188 | #endif | ||
189 | |||
185 | /* If the list has a pending postponed scheduled announcement, that | 190 | /* If the list has a pending postponed scheduled announcement, that |
186 | may become due before the next get_action tmieout. This function | 191 | may become due before the next get_action tmieout. This function |
187 | adjusts the get_action timeout appropriately. */ | 192 | 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) | |||
197 | return wps_fading_out; | 197 | return wps_fading_out; |
198 | } | 198 | } |
199 | 199 | ||
200 | bool update_onvol_change(struct gui_wps * gwps) | 200 | static bool update_onvol_change(struct gui_wps * gwps) |
201 | { | 201 | { |
202 | skin_update(gwps, WPS_REFRESH_NON_STATIC); | 202 | skin_update(gwps, WPS_REFRESH_NON_STATIC); |
203 | 203 | ||
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) | |||
41 | return system_rev & IIM_SREV_SREV; | 41 | return system_rev & IIM_SREV_SREV; |
42 | } | 42 | } |
43 | 43 | ||
44 | unsigned int iim_prod_rev(void) | 44 | static unsigned int iim_prod_rev(void) |
45 | { | 45 | { |
46 | return product_rev; | 46 | return product_rev; |
47 | } | 47 | } |
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; | |||
123 | Based on part of FS#6721. This may belong elsewhere. | 123 | Based on part of FS#6721. This may belong elsewhere. |
124 | (BCM initialization uploads the vmcs section to the BCM.) | 124 | (BCM initialization uploads the vmcs section to the BCM.) |
125 | */ | 125 | */ |
126 | bool flash_get_section(const unsigned int imageid, | 126 | static bool flash_get_section(const unsigned int imageid, |
127 | void **offset, | 127 | void **offset, |
128 | unsigned int *length) | 128 | unsigned int *length) |
129 | { | 129 | { |
130 | unsigned long *p = (unsigned long*)(ROM_BASE + 0xffe00); | 130 | unsigned long *p = (unsigned long*)(ROM_BASE + 0xffe00); |
131 | unsigned char *csp, *csend; | 131 | unsigned char *csp, *csend; |
@@ -505,7 +505,7 @@ static void bcm_command(unsigned cmd) | |||
505 | } | 505 | } |
506 | } | 506 | } |
507 | 507 | ||
508 | void bcm_powerdown(void) | 508 | static void bcm_powerdown(void) |
509 | { | 509 | { |
510 | bcm_write32(0x10001400, bcm_read32(0x10001400) & ~0xF0); | 510 | bcm_write32(0x10001400, bcm_read32(0x10001400) & ~0xF0); |
511 | 511 | ||
@@ -530,7 +530,7 @@ const unsigned char bcm_bootstrapdata[] = | |||
530 | 0xA1, 0x81, 0x91, 0x02, 0x12, 0x22, 0x72, 0x62 | 530 | 0xA1, 0x81, 0x91, 0x02, 0x12, 0x22, 0x72, 0x62 |
531 | }; | 531 | }; |
532 | 532 | ||
533 | void bcm_init(void) | 533 | static void bcm_init(void) |
534 | { | 534 | { |
535 | int i; | 535 | int i; |
536 | 536 | ||
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 @@ | |||
22 | #include "cpu.h" | 22 | #include "cpu.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "backlight.h" | 24 | #include "backlight.h" |
25 | #include "backlight-target.h" | ||
25 | #include "lcd.h" | 26 | #include "lcd.h" |
26 | 27 | ||
27 | void _backlight_on(void) | 28 | 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 @@ | |||
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "cpu.h" | 22 | #include "cpu.h" |
23 | #include "kernel.h" | 23 | #include "kernel.h" |
24 | #include "thread.h" | ||
25 | #include "system.h" | 24 | #include "system.h" |
26 | #include "backlight.h" | 25 | #include "backlight.h" |
26 | #include "backlight-target.h" | ||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | 28 | ||
29 | /* Returns the current state of the backlight (true=ON, false=OFF). */ | 29 | /* 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 @@ | |||
24 | #include "thread.h" | 24 | #include "thread.h" |
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "backlight.h" | 26 | #include "backlight.h" |
27 | #include "backlight-target.h" | ||
27 | #include "pcf50606.h" | 28 | #include "pcf50606.h" |
28 | #include "lcd.h" | 29 | #include "lcd.h" |
29 | 30 | ||
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) | |||
447 | return byte; | 447 | return byte; |
448 | } | 448 | } |
449 | 449 | ||
450 | int pcf50606_i2c_write(int address, const unsigned char* buf, int count) | 450 | static int pcf50606_i2c_write(int address, const unsigned char* buf, int count) |
451 | { | 451 | { |
452 | int i,x=0; | 452 | int i,x=0; |
453 | 453 | ||
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) | |||
277 | #define buf_dump(...) | 277 | #define buf_dump(...) |
278 | #endif | 278 | #endif |
279 | 279 | ||
280 | uint8_t buf_set_keyboard(unsigned char *buf, int id) | 280 | static uint8_t buf_set_keyboard(unsigned char *buf, int id) |
281 | { | 281 | { |
282 | memset(buf, 0, 7); | 282 | memset(buf, 0, 7); |
283 | 283 | ||
@@ -289,7 +289,7 @@ uint8_t buf_set_keyboard(unsigned char *buf, int id) | |||
289 | return 7; | 289 | return 7; |
290 | } | 290 | } |
291 | 291 | ||
292 | uint8_t buf_set_consumer(unsigned char *buf, int id) | 292 | static uint8_t buf_set_consumer(unsigned char *buf, int id) |
293 | { | 293 | { |
294 | memset(buf, 0, 4); | 294 | memset(buf, 0, 4); |
295 | buf[0] = (uint8_t)id; | 295 | buf[0] = (uint8_t)id; |