diff options
-rw-r--r-- | apps/recorder/peakmeter.c | 6 | ||||
-rw-r--r-- | apps/recorder/recording.c | 2 | ||||
-rw-r--r-- | apps/recorder/wormlet.c | 2 | ||||
-rw-r--r-- | apps/status.c | 12 | ||||
-rw-r--r-- | apps/status.h | 1 | ||||
-rw-r--r-- | apps/tree.c | 4 | ||||
-rw-r--r-- | firmware/kernel.c | 2 | ||||
-rw-r--r-- | firmware/mpeg.c | 18 | ||||
-rw-r--r-- | firmware/powermgmt.h | 2 |
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; | |||
49 | static int peak_meter_clip_hold; | 49 | static int peak_meter_clip_hold; |
50 | 50 | ||
51 | /* specifies the value range in peak volume values */ | 51 | /* specifies the value range in peak volume values */ |
52 | unsigned short peak_meter_range_min; | 52 | static unsigned short peak_meter_range_min; |
53 | unsigned short peak_meter_range_max; | 53 | static unsigned short peak_meter_range_max; |
54 | unsigned short peak_meter_range; | 54 | static unsigned short peak_meter_range; |
55 | 55 | ||
56 | /* if set to true clip timeout is disabled */ | 56 | /* if set to true clip timeout is disabled */ |
57 | static bool peak_meter_clip_eternal = false; | 57 | 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) | |||
104 | return str; | 104 | return str; |
105 | } | 105 | } |
106 | 106 | ||
107 | int cursor; | 107 | static int cursor; |
108 | 108 | ||
109 | void adjust_cursor(void) | 109 | void adjust_cursor(void) |
110 | { | 110 | { |
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 @@ | |||
64 | /** | 64 | /** |
65 | * All the properties that a worm has. | 65 | * All the properties that a worm has. |
66 | */ | 66 | */ |
67 | struct worm { | 67 | static struct worm { |
68 | /* The worm is stored in a ring of xy coordinates */ | 68 | /* The worm is stored in a ring of xy coordinates */ |
69 | char x[MAX_WORM_SEGMENTS]; | 69 | char x[MAX_WORM_SEGMENTS]; |
70 | char y[MAX_WORM_SEGMENTS]; | 70 | 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 @@ | |||
35 | 35 | ||
36 | static enum playmode current_mode = STATUS_STOP; | 36 | static enum playmode current_mode = STATUS_STOP; |
37 | 37 | ||
38 | long switch_tick; | 38 | #if defined(HAVE_LCD_CHARCELLS) || defined(HAVE_CHARGE_CTRL) |
39 | int battery_charge_step = 0; | 39 | static long switch_tick; |
40 | #ifdef HAVE_LCD_BITMAP | 40 | static int battery_charge_step = 0; |
41 | bool plug_state; | 41 | #ifdef HAVE_CHARGE_CTRL |
42 | bool battery_state; | 42 | static bool plug_state; |
43 | static bool battery_state; | ||
44 | #endif | ||
43 | #endif | 45 | #endif |
44 | 46 | ||
45 | void status_init(void) | 47 | 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 | |||
33 | void status_init(void); | 33 | void status_init(void); |
34 | void status_set_playmode(enum playmode mode); | 34 | void status_set_playmode(enum playmode mode); |
35 | #ifdef HAVE_LCD_BITMAP | 35 | #ifdef HAVE_LCD_BITMAP |
36 | extern bool statusbar_enabled; | ||
37 | bool statusbar(bool state); | 36 | bool statusbar(bool state); |
38 | #endif | 37 | #endif |
39 | void status_draw(void); | 38 | 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 @@ | |||
56 | 56 | ||
57 | #define NAME_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH * MAX_FILES_IN_DIR) | 57 | #define NAME_BUFFER_SIZE (AVERAGE_FILENAME_LENGTH * MAX_FILES_IN_DIR) |
58 | 58 | ||
59 | char name_buffer[NAME_BUFFER_SIZE]; | 59 | static char name_buffer[NAME_BUFFER_SIZE]; |
60 | int name_buffer_length; | 60 | static int name_buffer_length; |
61 | struct entry { | 61 | struct entry { |
62 | short attr; /* FAT attributes + file type flags */ | 62 | short attr; /* FAT attributes + file type flags */ |
63 | char *name; | 63 | 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 @@ | |||
26 | 26 | ||
27 | long current_tick = 0; | 27 | long current_tick = 0; |
28 | 28 | ||
29 | void (*tick_funcs[MAX_NUM_TICK_TASKS])(void); | 29 | static void (*tick_funcs[MAX_NUM_TICK_TASKS])(void); |
30 | 30 | ||
31 | static void tick_start(unsigned int interval_in_ms); | 31 | static void tick_start(unsigned int interval_in_ms); |
32 | 32 | ||
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); | |||
67 | #define MPEG_SAVE_DATA 102 | 67 | #define MPEG_SAVE_DATA 102 |
68 | #define MPEG_STOP_DONE 103 | 68 | #define MPEG_STOP_DONE 103 |
69 | 69 | ||
70 | enum | 70 | #ifdef HAVE_MAS3587F |
71 | static enum | ||
71 | { | 72 | { |
72 | MPEG_DECODER, | 73 | MPEG_DECODER, |
73 | MPEG_ENCODER | 74 | MPEG_ENCODER |
74 | } mpeg_mode; | 75 | } mpeg_mode; |
76 | #endif | ||
75 | 77 | ||
76 | extern char* playlist_peek(int steps); | 78 | extern char* playlist_peek(int steps); |
77 | extern int playlist_next(int steps); | 79 | extern int playlist_next(int steps); |
@@ -457,9 +459,9 @@ extern unsigned char mp3buf[]; | |||
457 | extern unsigned char mp3end[]; | 459 | extern unsigned char mp3end[]; |
458 | 460 | ||
459 | static int mp3buflen; | 461 | static int mp3buflen; |
460 | int mp3buf_write; | 462 | static int mp3buf_write; |
461 | static int mp3buf_swapwrite; | 463 | static int mp3buf_swapwrite; |
462 | int mp3buf_read; | 464 | static int mp3buf_read; |
463 | 465 | ||
464 | static int last_dma_chunk_size; | 466 | static int last_dma_chunk_size; |
465 | 467 | ||
@@ -691,10 +693,12 @@ static void stop_dma(void) | |||
691 | } | 693 | } |
692 | 694 | ||
693 | #ifdef HAVE_MAS3587F | 695 | #ifdef HAVE_MAS3587F |
694 | long timing_info_index = 0; | 696 | #ifdef DEBUG |
695 | long timing_info[1024]; | 697 | static long timing_info_index = 0; |
696 | bool inverted_pr; | 698 | static long timing_info[1024]; |
697 | unsigned long num_rec_bytes; | 699 | #endif |
700 | static bool inverted_pr; | ||
701 | static unsigned long num_rec_bytes; | ||
698 | 702 | ||
699 | void drain_dma_buffer(void) | 703 | void drain_dma_buffer(void) |
700 | { | 704 | { |
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 | |||
70 | #define CURRENT_CHARGING 300 /* charging current */ | 70 | #define CURRENT_CHARGING 300 /* charging current */ |
71 | 71 | ||
72 | extern unsigned short power_history[POWER_HISTORY_LEN]; | 72 | extern unsigned short power_history[POWER_HISTORY_LEN]; |
73 | void set_battery_capacity(int capacity); /* set local battery capacity value */ | ||
74 | 73 | ||
75 | /* Start up power management thread */ | 74 | /* Start up power management thread */ |
76 | void power_init(void); | 75 | void power_init(void); |
@@ -85,6 +84,7 @@ int battery_time(void); /* minutes */ | |||
85 | bool battery_level_safe(void); | 84 | bool battery_level_safe(void); |
86 | 85 | ||
87 | void set_poweroff_timeout(int timeout); | 86 | void set_poweroff_timeout(int timeout); |
87 | void set_battery_capacity(int capacity); /* set local battery capacity value */ | ||
88 | 88 | ||
89 | void set_sleep_timer(int seconds); | 89 | void set_sleep_timer(int seconds); |
90 | int get_sleep_timer(void); | 90 | int get_sleep_timer(void); |