diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2011-11-03 23:32:49 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-11-03 23:32:49 +0000 |
commit | e71750b7a398197f3884819d0713107b2ce04f08 (patch) | |
tree | 61142002bbd8c8700713bd60ba10b9a974bc2dcc | |
parent | e4cc3d4b3ab72ad5fc897fd4003a97dcab72c22a (diff) | |
download | rockbox-e71750b7a398197f3884819d0713107b2ce04f08.tar.gz rockbox-e71750b7a398197f3884819d0713107b2ce04f08.zip |
Make local functions and variables static where possible
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30897 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/dsp.c | 2 | ||||
-rw-r--r-- | firmware/font.c | 3 | ||||
-rw-r--r-- | firmware/font_cache.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 8 |
4 files changed, 7 insertions, 8 deletions
diff --git a/apps/dsp.c b/apps/dsp.c index 2113d251a1..d9c097af66 100644 --- a/apps/dsp.c +++ b/apps/dsp.c | |||
@@ -344,7 +344,7 @@ static int move_callback(int handle, void* current, void* new) | |||
344 | return BUFLIB_CB_OK; | 344 | return BUFLIB_CB_OK; |
345 | } | 345 | } |
346 | 346 | ||
347 | void lock_sample_buf( bool lock ) | 347 | static void lock_sample_buf( bool lock ) |
348 | { | 348 | { |
349 | if ( lock ) | 349 | if ( lock ) |
350 | big_sample_locks++; | 350 | big_sample_locks++; |
diff --git a/firmware/font.c b/firmware/font.c index eb15bb7420..8e576016bd 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -801,8 +801,7 @@ const unsigned char* font_get_bits(struct font* pf, unsigned short char_code) | |||
801 | return bits; | 801 | return bits; |
802 | } | 802 | } |
803 | 803 | ||
804 | void font_path_to_glyph_path( const char *font_path, char *glyph_path) | 804 | static void font_path_to_glyph_path( const char *font_path, char *glyph_path) |
805 | |||
806 | { | 805 | { |
807 | /* take full file name, cut extension, and add .glyphcache */ | 806 | /* take full file name, cut extension, and add .glyphcache */ |
808 | strlcpy(glyph_path, font_path, MAX_PATH); | 807 | strlcpy(glyph_path, font_path, MAX_PATH); |
diff --git a/firmware/font_cache.c b/firmware/font_cache.c index 24a5faf385..4624b1866e 100644 --- a/firmware/font_cache.c +++ b/firmware/font_cache.c | |||
@@ -76,7 +76,7 @@ void font_cache_create( | |||
76 | * search and new search. Returns a negative of insertion point if | 76 | * search and new search. Returns a negative of insertion point if |
77 | * not found. | 77 | * not found. |
78 | ************************************************************************/ | 78 | ************************************************************************/ |
79 | int search( struct font_cache* fcache, | 79 | static int search(struct font_cache* fcache, |
80 | unsigned short char_code, | 80 | unsigned short char_code, |
81 | int *p_insertion_point ) | 81 | int *p_insertion_point ) |
82 | { | 82 | { |
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index 2c15e0ebd7..2abe25f2e3 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c | |||
@@ -68,16 +68,16 @@ | |||
68 | 68 | ||
69 | int old_wheel_value = -1; | 69 | int old_wheel_value = -1; |
70 | int new_wheel_value = 0; | 70 | int new_wheel_value = 0; |
71 | int repeat = 0; | 71 | static int repeat = 0; |
72 | int wheel_delta = 0; | 72 | int wheel_delta = 0; |
73 | bool wheel_is_touched = false; | 73 | bool wheel_is_touched = false; |
74 | unsigned int accumulated_wheel_delta = 0; | 74 | unsigned int accumulated_wheel_delta = 0; |
75 | unsigned int wheel_repeat = 0; | 75 | static unsigned int wheel_repeat = 0; |
76 | unsigned int wheel_velocity = 0; | 76 | unsigned int wheel_velocity = 0; |
77 | unsigned long last_wheel_usec = 0; | 77 | static unsigned long last_wheel_usec = 0; |
78 | 78 | ||
79 | /* Variable to use for setting button status in interrupt handler */ | 79 | /* Variable to use for setting button status in interrupt handler */ |
80 | int int_btn = BUTTON_NONE; | 80 | static int int_btn = BUTTON_NONE; |
81 | #ifdef HAVE_WHEEL_POSITION | 81 | #ifdef HAVE_WHEEL_POSITION |
82 | static int wheel_position = -1; | 82 | static int wheel_position = -1; |
83 | static bool send_events = true; | 83 | static bool send_events = true; |