summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-08-01 21:50:57 +0000
committerJens Arnold <amiconn@rockbox.org>2004-08-01 21:50:57 +0000
commitabe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104 (patch)
treed6ea7f30e04c644693dc50f9b112a5d2cbc0cd41 /apps
parent27a4b60f1a0cd2bfef48f59acf236081fd3b787e (diff)
downloadrockbox-abe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104.tar.gz
rockbox-abe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104.zip
More const policeing step 1
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4978 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/main.c2
-rw-r--r--apps/misc.c4
-rw-r--r--apps/plugin.h6
-rw-r--r--apps/settings.c4
-rw-r--r--apps/settings.h6
-rw-r--r--apps/version.h2
6 files changed, 12 insertions, 12 deletions
diff --git a/apps/main.c b/apps/main.c
index 346c9bcddc..270f3d6dc3 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -59,7 +59,7 @@
59 59
60/*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ 60/*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */
61 61
62char appsversion[]=APPSVERSION; 62const char appsversion[]=APPSVERSION;
63 63
64void init(void); 64void init(void);
65 65
diff --git a/apps/misc.c b/apps/misc.c
index 2ee6627f03..582901f2ef 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
114 114
115#ifdef HAVE_LCD_BITMAP 115#ifdef HAVE_LCD_BITMAP
116extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; 116extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
117static unsigned char bmpheader[] = 117static const unsigned char bmpheader[] =
118{ 118{
119 0x42, 0x4d, 0x3e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 119 0x42, 0x4d, 0x3e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00,
120 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x40, 0x00, 120 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x40, 0x00,
@@ -126,7 +126,7 @@ static unsigned char bmpheader[] =
126 126
127static unsigned char buf[112*8]; 127static unsigned char buf[112*8];
128static unsigned char buf2[112*8]; 128static unsigned char buf2[112*8];
129static char dummy[2] = {0, 0}; 129static const char dummy[2] = {0, 0};
130 130
131void screen_dump(void) 131void screen_dump(void)
132{ 132{
diff --git a/apps/plugin.h b/apps/plugin.h
index 3d5f9a5504..4656b05be5 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -111,7 +111,7 @@ struct plugin_api {
111 111
112 /* lcd */ 112 /* lcd */
113 void (*lcd_clear_display)(void); 113 void (*lcd_clear_display)(void);
114 void (*lcd_puts)(int x, int y, unsigned char *string); 114 void (*lcd_puts)(int x, int y, const unsigned char *string);
115 void (*lcd_puts_scroll)(int x, int y, unsigned char* string); 115 void (*lcd_puts_scroll)(int x, int y, unsigned char* string);
116 void (*lcd_stop_scroll)(void); 116 void (*lcd_stop_scroll)(void);
117 void (*lcd_set_contrast)(int x); 117 void (*lcd_set_contrast)(int x);
@@ -125,7 +125,7 @@ struct plugin_api {
125 void (*lcd_icon)(int icon, bool enable); 125 void (*lcd_icon)(int icon, bool enable);
126#else 126#else
127 void (*lcd_putsxy)(int x, int y, const unsigned char *string); 127 void (*lcd_putsxy)(int x, int y, const unsigned char *string);
128 void (*lcd_puts_style)(int x, int y, unsigned char *str, int style); 128 void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style);
129 void (*lcd_bitmap)(const unsigned char *src, int x, int y, 129 void (*lcd_bitmap)(const unsigned char *src, int x, int y,
130 int nx, int ny, bool clear); 130 int nx, int ny, bool clear);
131 void (*lcd_drawline)(int x1, int y1, int x2, int y2); 131 void (*lcd_drawline)(int x1, int y1, int x2, int y2);
@@ -138,7 +138,7 @@ struct plugin_api {
138 void (*lcd_fillrect)(int x, int y, int nx, int ny); 138 void (*lcd_fillrect)(int x, int y, int nx, int ny);
139 void (*lcd_drawrect)(int x, int y, int nx, int ny); 139 void (*lcd_drawrect)(int x, int y, int nx, int ny);
140 void (*lcd_invertrect)(int x, int y, int nx, int ny); 140 void (*lcd_invertrect)(int x, int y, int nx, int ny);
141 int (*lcd_getstringsize)(unsigned char *str, int *w, int *h); 141 int (*lcd_getstringsize)(const unsigned char *str, int *w, int *h);
142 void (*lcd_update)(void); 142 void (*lcd_update)(void);
143 void (*lcd_update_rect)(int x, int y, int width, int height); 143 void (*lcd_update_rect)(int x, int y, int width, int height);
144 void (*scrollbar)(int x, int y, int width, int height, int items, 144 void (*scrollbar)(int x, int y, int width, int height, int items,
diff --git a/apps/settings.c b/apps/settings.c
index 0487f250b3..47969d1abe 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -67,7 +67,7 @@
67void dac_line_in(bool enable); 67void dac_line_in(bool enable);
68#endif 68#endif
69struct user_settings global_settings; 69struct user_settings global_settings;
70char rec_base_directory[] = REC_BASE_DIR; 70const char rec_base_directory[] = REC_BASE_DIR;
71 71
72 72
73#define CONFIG_BLOCK_VERSION 16 73#define CONFIG_BLOCK_VERSION 16
@@ -1513,7 +1513,7 @@ bool set_option(char* string, void* variable, enum optiontype type,
1513 1513
1514#ifdef HAVE_MAS3587F 1514#ifdef HAVE_MAS3587F
1515/* This array holds the record timer interval lengths, in seconds */ 1515/* This array holds the record timer interval lengths, in seconds */
1516static unsigned long rec_timer_seconds[] = 1516static const unsigned long rec_timer_seconds[] =
1517{ 1517{
1518 24*60*60, /* OFF really means 24 hours, to avoid >2Gbyte files */ 1518 24*60*60, /* OFF really means 24 hours, to avoid >2Gbyte files */
1519 5*60, /* 00:05 */ 1519 5*60, /* 00:05 */
diff --git a/apps/settings.h b/apps/settings.h
index 36b4a839a4..78f46eaa4f 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -69,7 +69,7 @@
69#define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ 69#define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */
70#ifdef SIMULATOR 70#ifdef SIMULATOR
71/* a space which is defined in stubs.c */ 71/* a space which is defined in stubs.c */
72extern unsigned char vp_dummy[VIRT_SIZE]; 72extern unsigned char vp_dummy[VIRT_SIZE];
73#define VIRT_PTR vp_dummy 73#define VIRT_PTR vp_dummy
74#else 74#else
75/* a location where we won't store strings, 0 is the fastest */ 75/* a location where we won't store strings, 0 is the fastest */
@@ -250,7 +250,7 @@ struct user_settings
250enum optiontype { INT, BOOL }; 250enum optiontype { INT, BOOL };
251 251
252struct opt_items { 252struct opt_items {
253 unsigned char* string; 253 unsigned const char* string;
254 int voice_id; 254 int voice_id;
255}; 255};
256 256
@@ -291,7 +291,7 @@ extern struct user_settings global_settings;
291extern long lasttime; 291extern long lasttime;
292 292
293/* Recording base directory */ 293/* Recording base directory */
294extern char rec_base_directory[]; 294extern const char rec_base_directory[];
295 295
296/* system defines */ 296/* system defines */
297 297
diff --git a/apps/version.h b/apps/version.h
index 0090bce571..2eb9c26857 100644
--- a/apps/version.h
+++ b/apps/version.h
@@ -19,6 +19,6 @@
19#ifndef _VERSION_H_ 19#ifndef _VERSION_H_
20#define _VERSION_H_ 20#define _VERSION_H_
21 21
22extern char appsversion[]; 22extern const char appsversion[];
23 23
24#endif 24#endif