Killed a dozen global variables

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3015 a1c6a512-1295-4272-9138-f99709370657

9 files changed, 27 insertions, 22 deletions

diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 2e787ba982..a49a46a04b 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -49,9 +49,9 @@ static long peak_meter_clip_timeout_r;
 static int  peak_meter_clip_hold;
 
 /* specifies the value range in peak volume values */
-unsigned short peak_meter_range_min;
-unsigned short peak_meter_range_max;
-unsigned short peak_meter_range;
+static unsigned short peak_meter_range_min;
+static unsigned short peak_meter_range_max;
+static unsigned short peak_meter_range;
 
 /* if set to true clip timeout is disabled */
 static bool peak_meter_clip_eternal = false;
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 3926382daa..22c8da2a33 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -104,7 +104,7 @@ char *fmt_gain(int snd, int val, char *str, int len)
     return str;
 }
 
-int cursor;
+static int cursor;
 
 void adjust_cursor(void)
 {
diff --git a/apps/recorder/wormlet.c b/apps/recorder/wormlet.c
index f1654227ff..d6850dc039 100644
--- a/apps/recorder/wormlet.c
+++ b/apps/recorder/wormlet.c
@@ -64,7 +64,7 @@
 /**
  * All the properties that a worm has.
  */
-struct worm {
+static struct worm {
     /* The worm is stored in a ring of xy coordinates */
     char x[MAX_WORM_SEGMENTS];
     char y[MAX_WORM_SEGMENTS];
diff --git a/apps/status.c b/apps/status.c
index 20e672d8dc..91379bba2b 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -35,11 +35,13 @@
 
 static enum playmode current_mode = STATUS_STOP;
 
-long switch_tick;
-int  battery_charge_step = 0;
-#ifdef HAVE_LCD_BITMAP
-bool plug_state;
-bool battery_state;
+#if defined(HAVE_LCD_CHARCELLS) || defined(HAVE_CHARGE_CTRL)
+static long switch_tick;
+static int  battery_charge_step = 0;
+#ifdef HAVE_CHARGE_CTRL
+static bool plug_state;
+static bool battery_state;
+#endif
 #endif
 
 void status_init(void)
diff --git a/apps/status.h b/apps/status.h
index 74118f303b..8d0a492bf2 100644
--- a/apps/status.h
+++ b/apps/status.h
@@ -33,7 +33,6 @@ enum playmode
 void status_init(void);
 void status_set_playmode(enum playmode mode);
 #ifdef HAVE_LCD_BITMAP
-extern bool statusbar_enabled;
 bool statusbar(bool state);
 #endif
 void status_draw(void);
diff --git a/apps/tree.c b/apps/tree.c
index 22cda58897..03de011255 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -56,8 +56,8 @@
 
 #define NAME_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH * MAX_FILES_IN_DIR)
 
-char name_buffer[NAME_BUFFER_SIZE];
-int name_buffer_length;
+static char name_buffer[NAME_BUFFER_SIZE];
+static int name_buffer_length;
 struct entry {
     short attr; /* FAT attributes + file type flags */
     char *name;
diff --git a/firmware/kernel.c b/firmware/kernel.c
index 2b4b09f52b..4d2f519171 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -26,7 +26,7 @@
 
 long current_tick = 0;
 
-void (*tick_funcs[MAX_NUM_TICK_TASKS])(void);
+static void (*tick_funcs[MAX_NUM_TICK_TASKS])(void);
 
 static void tick_start(unsigned int interval_in_ms);
 
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 8d0cedd9f9..fb27a3b904 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -67,11 +67,13 @@ static int get_unswapped_space(void);
 #define MPEG_SAVE_DATA    102
 #define MPEG_STOP_DONE    103
 
-enum
+#ifdef HAVE_MAS3587F
+static enum
 {
     MPEG_DECODER,
     MPEG_ENCODER
 } mpeg_mode;
+#endif
 
 extern char* playlist_peek(int steps);
 extern int playlist_next(int steps);
@@ -457,9 +459,9 @@ extern unsigned char mp3buf[];
 extern unsigned char mp3end[];
 
 static int mp3buflen;
-int mp3buf_write;
+static int mp3buf_write;
 static int mp3buf_swapwrite;
-int mp3buf_read;
+static int mp3buf_read;
 
 static int last_dma_chunk_size;
 
@@ -691,10 +693,12 @@ static void stop_dma(void)
 }
 
 #ifdef HAVE_MAS3587F
-long timing_info_index = 0;
-long timing_info[1024];
-bool inverted_pr;
-unsigned long num_rec_bytes;
+#ifdef DEBUG
+static long timing_info_index = 0;
+static long timing_info[1024];
+#endif
+static bool inverted_pr;
+static unsigned long num_rec_bytes;
 
 void drain_dma_buffer(void)
 {
diff --git a/firmware/powermgmt.h b/firmware/powermgmt.h
index ea6319c02e..b9686119c0 100644
--- a/firmware/powermgmt.h
+++ b/firmware/powermgmt.h
@@ -70,7 +70,6 @@ extern int charge_state;         /* tells what the charger is doing (for info di
 #define CURRENT_CHARGING  300    /* charging current */
 
 extern unsigned short power_history[POWER_HISTORY_LEN];
-void set_battery_capacity(int capacity); /* set local battery capacity value */
 
 /* Start up power management thread */
 void power_init(void);
@@ -85,6 +84,7 @@ int battery_time(void); /* minutes */
 bool battery_level_safe(void);
 
 void set_poweroff_timeout(int timeout);
+void set_battery_capacity(int capacity); /* set local battery capacity value */
 
 void set_sleep_timer(int seconds);
 int get_sleep_timer(void);