diff options
author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-21 17:36:18 +0000 |
---|---|---|
committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-21 17:36:18 +0000 |
commit | 14c2e677fd3c23ce7ae633b04dc64973c07a4479 (patch) | |
tree | 343ace015d576df26e0f6e9f71f8a077204852af | |
parent | 2800c55a6adda5987d9675e3e73185b8d7b30cab (diff) | |
download | rockbox-14c2e677fd3c23ce7ae633b04dc64973c07a4479.tar.gz rockbox-14c2e677fd3c23ce7ae633b04dc64973c07a4479.zip |
Make more local functions static.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31395 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/screen_access.c | 4 | ||||
-rw-r--r-- | firmware/drivers/serial.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/philips/hdd1630/button-hdd1630.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/philips/hdd6330/button-hdd6330.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/pcf50606-coldfire.c | 6 | ||||
-rw-r--r-- | firmware/target/sh/archos/uart-archos.c | 4 |
9 files changed, 17 insertions, 11 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c index 834ece3cb8..cd58654f7c 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -129,7 +129,7 @@ void screen_helper_remote_setfont(int font) | |||
129 | lcd_remote_setfont(font); | 129 | lcd_remote_setfont(font); |
130 | } | 130 | } |
131 | 131 | ||
132 | int screen_helper_remote_getuifont(void) | 132 | static int screen_helper_remote_getuifont(void) |
133 | { | 133 | { |
134 | #ifdef HAVE_LCD_BITMAP | 134 | #ifdef HAVE_LCD_BITMAP |
135 | return global_status.font_id[SCREEN_REMOTE]; | 135 | return global_status.font_id[SCREEN_REMOTE]; |
@@ -138,7 +138,7 @@ int screen_helper_remote_getuifont(void) | |||
138 | #endif | 138 | #endif |
139 | } | 139 | } |
140 | 140 | ||
141 | void screen_helper_remote_setuifont(int font) | 141 | static void screen_helper_remote_setuifont(int font) |
142 | { | 142 | { |
143 | #ifdef HAVE_LCD_BITMAP | 143 | #ifdef HAVE_LCD_BITMAP |
144 | global_status.font_id[SCREEN_REMOTE] = font; | 144 | global_status.font_id[SCREEN_REMOTE] = font; |
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index af0f3abe68..a46342389d 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c | |||
@@ -99,7 +99,7 @@ int tx_rdy(void) | |||
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | 101 | ||
102 | int rx_rdy(void) | 102 | static int rx_rdy(void) |
103 | { | 103 | { |
104 | if((SER0_LSR & 0x1)) | 104 | if((SER0_LSR & 0x1)) |
105 | return 1; | 105 | return 1; |
@@ -112,7 +112,7 @@ void tx_writec(unsigned char c) | |||
112 | SER0_THR =(int) c; | 112 | SER0_THR =(int) c; |
113 | } | 113 | } |
114 | 114 | ||
115 | unsigned char rx_readc(void) | 115 | static unsigned char rx_readc(void) |
116 | { | 116 | { |
117 | return (SER0_RBR & 0xFF); | 117 | return (SER0_RBR & 0xFF); |
118 | } | 118 | } |
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c index d1e1c82c95..1f7ab47a0f 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | |||
@@ -233,7 +233,7 @@ static void remote_dev_enable(bool enable) | |||
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
236 | void remote_update_lcd(void) | 236 | static void remote_update_lcd(void) |
237 | { | 237 | { |
238 | int x, y, draw_now; | 238 | int x, y, draw_now; |
239 | unsigned char data[RC_WIDTH + 7]; | 239 | unsigned char data[RC_WIDTH + 7]; |
diff --git a/firmware/target/arm/philips/hdd1630/button-hdd1630.c b/firmware/target/arm/philips/hdd1630/button-hdd1630.c index ab06c0cf1a..df0f5afbed 100644 --- a/firmware/target/arm/philips/hdd1630/button-hdd1630.c +++ b/firmware/target/arm/philips/hdd1630/button-hdd1630.c | |||
@@ -33,7 +33,7 @@ static int int_btn = BUTTON_NONE; | |||
33 | * Generate a click sound from the player (not in headphones yet) | 33 | * Generate a click sound from the player (not in headphones yet) |
34 | * TODO: integrate this with the "key click" option | 34 | * TODO: integrate this with the "key click" option |
35 | */ | 35 | */ |
36 | void button_click(void) | 36 | static void button_click(void) |
37 | { | 37 | { |
38 | GPO32_ENABLE |= 0x2000; | 38 | GPO32_ENABLE |= 0x2000; |
39 | GPO32_VAL |= 0x2000; | 39 | GPO32_VAL |= 0x2000; |
diff --git a/firmware/target/arm/philips/hdd6330/button-hdd6330.c b/firmware/target/arm/philips/hdd6330/button-hdd6330.c index 4e40de57ab..924069bcbd 100644 --- a/firmware/target/arm/philips/hdd6330/button-hdd6330.c +++ b/firmware/target/arm/philips/hdd6330/button-hdd6330.c | |||
@@ -39,7 +39,7 @@ static int repeat = 0; | |||
39 | * Generate a click sound from the player (not in headphones yet) | 39 | * Generate a click sound from the player (not in headphones yet) |
40 | * TODO: integrate this with the "key click" option | 40 | * TODO: integrate this with the "key click" option |
41 | */ | 41 | */ |
42 | void button_click(void) | 42 | static void button_click(void) |
43 | { | 43 | { |
44 | GPO32_ENABLE |= 0x2000; | 44 | GPO32_ENABLE |= 0x2000; |
45 | GPO32_VAL |= 0x2000; | 45 | GPO32_VAL |= 0x2000; |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c index 51f40c7a33..6434469881 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c | |||
@@ -211,7 +211,7 @@ bool lcd_active(void) | |||
211 | 211 | ||
212 | #ifdef HAVE_LCD_SLEEP | 212 | #ifdef HAVE_LCD_SLEEP |
213 | 213 | ||
214 | void lcd_wakeup(void) | 214 | static void lcd_wakeup(void) |
215 | { | 215 | { |
216 | unsigned short *lcd_init_sequence; | 216 | unsigned short *lcd_init_sequence; |
217 | unsigned int lcd_init_sequence_length; | 217 | unsigned int lcd_init_sequence_length; |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c index 548d007780..78e7f00347 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c | |||
@@ -37,7 +37,7 @@ void INT_TIMERD(void) | |||
37 | } | 37 | } |
38 | } | 38 | } |
39 | 39 | ||
40 | void piezo_start(unsigned short cycles, unsigned short periods) | 40 | static void piezo_start(unsigned short cycles, unsigned short periods) |
41 | { | 41 | { |
42 | #ifndef SIMULATOR | 42 | #ifndef SIMULATOR |
43 | duration = periods; | 43 | duration = periods; |
diff --git a/firmware/target/coldfire/pcf50606-coldfire.c b/firmware/target/coldfire/pcf50606-coldfire.c index 6206ae4deb..d5d0022fc0 100644 --- a/firmware/target/coldfire/pcf50606-coldfire.c +++ b/firmware/target/coldfire/pcf50606-coldfire.c | |||
@@ -299,6 +299,9 @@ inline bool pcf50606_i2c_getack(void) | |||
299 | return ret; | 299 | return ret; |
300 | } | 300 | } |
301 | 301 | ||
302 | #if !defined(IRIVER_H300_SERIES) | ||
303 | static | ||
304 | #endif | ||
302 | void pcf50606_i2c_outb(unsigned char byte) | 305 | void pcf50606_i2c_outb(unsigned char byte) |
303 | { | 306 | { |
304 | #ifdef USE_ASM | 307 | #ifdef USE_ASM |
@@ -370,6 +373,9 @@ void pcf50606_i2c_outb(unsigned char byte) | |||
370 | #endif | 373 | #endif |
371 | } | 374 | } |
372 | 375 | ||
376 | #if !defined(IRIVER_H300_SERIES) | ||
377 | static | ||
378 | #endif | ||
373 | unsigned char pcf50606_i2c_inb(bool ack) | 379 | unsigned char pcf50606_i2c_inb(bool ack) |
374 | { | 380 | { |
375 | unsigned char byte = 0; | 381 | unsigned char byte = 0; |
diff --git a/firmware/target/sh/archos/uart-archos.c b/firmware/target/sh/archos/uart-archos.c index 14fea943b3..d17678f812 100644 --- a/firmware/target/sh/archos/uart-archos.c +++ b/firmware/target/sh/archos/uart-archos.c | |||
@@ -65,7 +65,7 @@ int tx_rdy(void) | |||
65 | return 1; | 65 | return 1; |
66 | } | 66 | } |
67 | 67 | ||
68 | int rx_rdy(void) | 68 | static int rx_rdy(void) |
69 | { | 69 | { |
70 | if(SSR1 & SCI_RDRF) | 70 | if(SSR1 & SCI_RDRF) |
71 | return 1; | 71 | return 1; |
@@ -79,7 +79,7 @@ void tx_writec(unsigned char c) | |||
79 | (void)c; | 79 | (void)c; |
80 | } | 80 | } |
81 | 81 | ||
82 | unsigned char rx_readc(void) | 82 | static unsigned char rx_readc(void) |
83 | { | 83 | { |
84 | char tmp; | 84 | char tmp; |
85 | /* Read byte and clear the Rx Full bit */ | 85 | /* Read byte and clear the Rx Full bit */ |