summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/filetypes.c2
-rw-r--r--apps/recorder/peakmeter.c4
-rw-r--r--apps/recorder/recording.c6
-rw-r--r--apps/sound_menu.c2
-rw-r--r--apps/talk.c2
-rw-r--r--apps/talk.h2
-rw-r--r--apps/tree.c4
-rw-r--r--apps/tree.h2
-rw-r--r--apps/wps.c2
9 files changed, 13 insertions, 13 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c
index cab9618f36..d7151ca661 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -84,7 +84,7 @@ static void scan_plugins(void);
84void filetype_init(void) 84void filetype_init(void)
85{ 85{
86 int cnt,i,ix; 86 int cnt,i,ix;
87 struct filetype* ftypes; 87 const struct filetype* ftypes;
88 88
89 memset(exttypes,0,sizeof(exttypes)); 89 memset(exttypes,0,sizeof(exttypes));
90 memset(filetypes,0,sizeof(filetypes)); 90 memset(filetypes,0,sizeof(filetypes));
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 33d1e25ee7..b069c1566b 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -103,14 +103,14 @@ static unsigned int ticks_per_redraw[TICKS_PER_DRAW_SIZE];
103#endif 103#endif
104 104
105/* time out values for max */ 105/* time out values for max */
106static long max_time_out[] = { 106static const long max_time_out[] = {
107 0 * HZ, HZ / 5, 30, HZ / 2, HZ, 2 * HZ, 107 0 * HZ, HZ / 5, 30, HZ / 2, HZ, 2 * HZ,
108 3 * HZ, 4 * HZ, 5 * HZ, 6 * HZ, 7 * HZ, 8 * HZ, 108 3 * HZ, 4 * HZ, 5 * HZ, 6 * HZ, 7 * HZ, 8 * HZ,
109 9 * HZ, 10 * HZ, 15 * HZ, 20 * HZ, 30 * HZ, 60 * HZ 109 9 * HZ, 10 * HZ, 15 * HZ, 20 * HZ, 30 * HZ, 60 * HZ
110}; 110};
111 111
112/* time out values for clip */ 112/* time out values for clip */
113static long clip_time_out[] = { 113static const long clip_time_out[] = {
114 0 * HZ, 1 * HZ, 2 * HZ, 3 * HZ, 4 * HZ, 5 * HZ, 114 0 * HZ, 1 * HZ, 2 * HZ, 3 * HZ, 4 * HZ, 5 * HZ,
115 6 * HZ, 7 * HZ, 8 * HZ, 9 * HZ, 10 * HZ, 15 * HZ, 115 6 * HZ, 7 * HZ, 8 * HZ, 9 * HZ, 10 * HZ, 15 * HZ,
116 20 * HZ, 25 * HZ, 30 * HZ, 45 * HZ, 60 * HZ, 90 * HZ, 116 20 * HZ, 25 * HZ, 30 * HZ, 45 * HZ, 60 * HZ, 90 * HZ,
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 242351a0d6..20b5fa016f 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -56,7 +56,7 @@ bool f3_rec_screen(void);
56#define SOURCE_LINE 1 56#define SOURCE_LINE 1
57#define SOURCE_SPDIF 2 57#define SOURCE_SPDIF 2
58 58
59char *freq_str[6] = 59const char* const freq_str[6] =
60{ 60{
61 "44.1kHz", 61 "44.1kHz",
62 "48kHz", 62 "48kHz",
@@ -79,7 +79,7 @@ static void set_gain(void)
79 } 79 }
80} 80}
81 81
82static char *fmtstr[] = 82static const char* const fmtstr[] =
83{ 83{
84 "", /* no decimals */ 84 "", /* no decimals */
85 "%d.%d %s ", /* 1 decimal */ 85 "%d.%d %s ", /* 1 decimal */
@@ -632,7 +632,7 @@ bool f2_rec_screen(void)
632 lcd_getstringsize("A",&w,&h); 632 lcd_getstringsize("A",&w,&h);
633 633
634 while (!exit) { 634 while (!exit) {
635 char* ptr=NULL; 635 const char* ptr=NULL;
636 636
637 lcd_clear_display(); 637 lcd_clear_display();
638 638
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index 6f62ce2417..bbf1c6c473 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -35,7 +35,7 @@
35#include "talk.h" 35#include "talk.h"
36#include "misc.h" 36#include "misc.h"
37 37
38static char *fmt[] = 38static const char* const fmt[] =
39{ 39{
40 "", /* no decimals */ 40 "", /* no decimals */
41 "%d.%d %s ", /* 1 decimal */ 41 "%d.%d %s ", /* 1 decimal */
diff --git a/apps/talk.c b/apps/talk.c
index 51e8ae7f01..1b3dda39ed 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -38,7 +38,7 @@ extern void bitswap(unsigned char *data, int length); /* no header for this */
38 38
39#define QUEUE_SIZE 64 /* must be a power of two */ 39#define QUEUE_SIZE 64 /* must be a power of two */
40#define QUEUE_MASK (QUEUE_SIZE-1) 40#define QUEUE_MASK (QUEUE_SIZE-1)
41const char* dir_thumbnail_name = "_dirname.talk"; 41const char* const dir_thumbnail_name = "_dirname.talk";
42 42
43/***************** Functional Macros *****************/ 43/***************** Functional Macros *****************/
44 44
diff --git a/apps/talk.h b/apps/talk.h
index 2476c8ec02..de93b1678c 100644
--- a/apps/talk.h
+++ b/apps/talk.h
@@ -55,7 +55,7 @@ enum {
55#define STR(id) ID2P(id), id 55#define STR(id) ID2P(id), id
56 56
57/* publish this string, so it's stored only once (better than #define) */ 57/* publish this string, so it's stored only once (better than #define) */
58extern const char* dir_thumbnail_name; 58extern const char* const dir_thumbnail_name;
59 59
60 60
61void talk_init(void); 61void talk_init(void);
diff --git a/apps/tree.c b/apps/tree.c
index 9ce5a9c5f0..017e9877f1 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -70,7 +70,7 @@
70extern bool language_changed; 70extern bool language_changed;
71 71
72/* a table for the know file types */ 72/* a table for the know file types */
73struct filetype filetypes[] = { 73const struct filetype filetypes[] = {
74 { ".mp3", TREE_ATTR_MPA, File, VOICE_EXT_MPA }, 74 { ".mp3", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
75 { ".mp2", TREE_ATTR_MPA, File, VOICE_EXT_MPA }, 75 { ".mp2", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
76 { ".mpa", TREE_ATTR_MPA, File, VOICE_EXT_MPA }, 76 { ".mpa", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
@@ -132,7 +132,7 @@ void browse_root(void)
132#endif 132#endif
133} 133}
134 134
135void tree_get_filetypes(struct filetype** types, int* count) 135void tree_get_filetypes(const struct filetype** types, int* count)
136{ 136{
137 *types = filetypes; 137 *types = filetypes;
138 *count = sizeof(filetypes) / sizeof(*filetypes); 138 *count = sizeof(filetypes) / sizeof(*filetypes);
diff --git a/apps/tree.h b/apps/tree.h
index 01f3669477..0889b7211e 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -48,7 +48,7 @@ struct filetype {
48#define TREE_ATTR_MOD 0x0900 /* firmware file */ 48#define TREE_ATTR_MOD 0x0900 /* firmware file */
49#define TREE_ATTR_MASK 0xFFC0 /* which bits tree.c uses (above) */ 49#define TREE_ATTR_MASK 0xFFC0 /* which bits tree.c uses (above) */
50 50
51void tree_get_filetypes(struct filetype**, int*); 51void tree_get_filetypes(const struct filetype**, int*);
52void tree_init(void); 52void tree_init(void);
53void browse_root(void); 53void browse_root(void);
54void set_current_file(char *path); 54void set_current_file(char *path);
diff --git a/apps/wps.c b/apps/wps.c
index 86ce4b09c1..45aa8235a5 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -309,7 +309,7 @@ bool browse_id3(void)
309 309
310static bool ffwd_rew(int button) 310static bool ffwd_rew(int button)
311{ 311{
312 static int ff_rew_steps[] = { 312 static const int ff_rew_steps[] = {
313 1000, 2000, 3000, 4000, 313 1000, 2000, 3000, 4000,
314 5000, 6000, 8000, 10000, 314 5000, 6000, 8000, 10000,
315 15000, 20000, 25000, 30000, 315 15000, 20000, 25000, 30000,