diff options
author | Michael Sparmann <theseven@rockbox.org> | 2009-10-05 14:42:18 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2009-10-05 14:42:18 +0000 |
commit | 112bc15d65f133876654b45090618c3cd1da148c (patch) | |
tree | 9c51c580f85ef8f286b4754cac7b055f4948ebbe /apps | |
parent | bbeb3ec75154502a956506f0455229a355c8a84a (diff) | |
download | rockbox-112bc15d65f133876654b45090618c3cd1da148c.tar.gz rockbox-112bc15d65f133876654b45090618c3cd1da148c.zip |
Fix the stack string issue for the Meizus, too
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22957 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/settings.h b/apps/settings.h index 7ecd63cf29..275d1c1ad0 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -192,18 +192,16 @@ enum { ALARM_START_WPS = 0, | |||
192 | This helps to save space for menus and options. */ | 192 | This helps to save space for menus and options. */ |
193 | 193 | ||
194 | #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ | 194 | #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ |
195 | #if CONFIG_CPU==S5L8701 | 195 | #if defined(CPU_S5L870X) |
196 | /* the S5L8700 has IRAM at 0, so we use 0xffff bytes right after that */ | 196 | /* the S5L870X has IRAM at 0, so we use 0xffff bytes right after that */ |
197 | #define VIRT_PTR ((unsigned char*)0x2C000) | 197 | #define VIRT_PTR ((unsigned char*)0x40000) |
198 | #else | 198 | #elif CONFIG_CPU==DM320 |
199 | #if CONFIG_CPU==DM320 | ||
200 | /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ | 199 | /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ |
201 | #define VIRT_PTR ((unsigned char*)0x4000) | 200 | #define VIRT_PTR ((unsigned char*)0x4000) |
202 | #else | 201 | #else |
203 | /* a location where we won't store strings, 0 is the fastest */ | 202 | /* a location where we won't store strings, 0 is the fastest */ |
204 | #define VIRT_PTR ((unsigned char*)0) | 203 | #define VIRT_PTR ((unsigned char*)0) |
205 | #endif | 204 | #endif |
206 | #endif | ||
207 | 205 | ||
208 | /* form a "virtual pointer" out of a language ID */ | 206 | /* form a "virtual pointer" out of a language ID */ |
209 | #define ID2P(id) (VIRT_PTR + id) | 207 | #define ID2P(id) (VIRT_PTR + id) |