From 14c2e677fd3c23ce7ae633b04dc64973c07a4479 Mon Sep 17 00:00:00 2001 From: Boris Gjenero Date: Wed, 21 Dec 2011 17:36:18 +0000 Subject: Make more local functions static. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31395 a1c6a512-1295-4272-9138-f99709370657 --- apps/screen_access.c | 4 ++-- firmware/drivers/serial.c | 4 ++-- firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | 2 +- firmware/target/arm/philips/hdd1630/button-hdd1630.c | 2 +- firmware/target/arm/philips/hdd6330/button-hdd6330.c | 2 +- firmware/target/arm/s5l8700/ipodnano2g/lcd-nano2g.c | 2 +- firmware/target/arm/s5l8700/ipodnano2g/piezo-nano2g.c | 2 +- firmware/target/coldfire/pcf50606-coldfire.c | 6 ++++++ 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) lcd_remote_setfont(font); } -int screen_helper_remote_getuifont(void) +static int screen_helper_remote_getuifont(void) { #ifdef HAVE_LCD_BITMAP return global_status.font_id[SCREEN_REMOTE]; @@ -138,7 +138,7 @@ int screen_helper_remote_getuifont(void) #endif } -void screen_helper_remote_setuifont(int font) +static void screen_helper_remote_setuifont(int font) { #ifdef HAVE_LCD_BITMAP 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) return 0; } -int rx_rdy(void) +static int rx_rdy(void) { if((SER0_LSR & 0x1)) return 1; @@ -112,7 +112,7 @@ void tx_writec(unsigned char c) SER0_THR =(int) c; } -unsigned char rx_readc(void) +static unsigned char rx_readc(void) { return (SER0_RBR & 0xFF); } 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) } } -void remote_update_lcd(void) +static void remote_update_lcd(void) { int x, y, draw_now; 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; * Generate a click sound from the player (not in headphones yet) * TODO: integrate this with the "key click" option */ -void button_click(void) +static void button_click(void) { GPO32_ENABLE |= 0x2000; 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; * Generate a click sound from the player (not in headphones yet) * TODO: integrate this with the "key click" option */ -void button_click(void) +static void button_click(void) { GPO32_ENABLE |= 0x2000; 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) #ifdef HAVE_LCD_SLEEP -void lcd_wakeup(void) +static void lcd_wakeup(void) { unsigned short *lcd_init_sequence; 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) } } -void piezo_start(unsigned short cycles, unsigned short periods) +static void piezo_start(unsigned short cycles, unsigned short periods) { #ifndef SIMULATOR 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) return ret; } +#if !defined(IRIVER_H300_SERIES) +static +#endif void pcf50606_i2c_outb(unsigned char byte) { #ifdef USE_ASM @@ -370,6 +373,9 @@ void pcf50606_i2c_outb(unsigned char byte) #endif } +#if !defined(IRIVER_H300_SERIES) +static +#endif unsigned char pcf50606_i2c_inb(bool ack) { 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) return 1; } -int rx_rdy(void) +static int rx_rdy(void) { if(SSR1 & SCI_RDRF) return 1; @@ -79,7 +79,7 @@ void tx_writec(unsigned char c) (void)c; } -unsigned char rx_readc(void) +static unsigned char rx_readc(void) { char tmp; /* Read byte and clear the Rx Full bit */ -- cgit v1.2.3