diff options
author | Michael Sparmann <theseven@rockbox.org> | 2009-10-05 12:29:01 +0000 |
---|---|---|
committer | Michael Sparmann <theseven@rockbox.org> | 2009-10-05 12:29:01 +0000 |
commit | e05ca6c7c517ae4b53c01c615428f7be72c1becb (patch) | |
tree | 6e805a08716560526e42f3e33f0feebda11ef848 | |
parent | 37e2d65c1877576dbdb78cbf0b0dbe624da6b403 (diff) | |
download | rockbox-e05ca6c7c517ae4b53c01c615428f7be72c1becb.tar.gz rockbox-e05ca6c7c517ae4b53c01c615428f7be72c1becb.zip |
Fix displaying strings on stack for iPod Nano 2G
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22951 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/settings.h b/apps/settings.h index b64fe37c74..7ecd63cf29 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -192,6 +192,10 @@ 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 | ||
196 | /* the S5L8700 has IRAM at 0, so we use 0xffff bytes right after that */ | ||
197 | #define VIRT_PTR ((unsigned char*)0x2C000) | ||
198 | #else | ||
195 | #if CONFIG_CPU==DM320 | 199 | #if CONFIG_CPU==DM320 |
196 | /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ | 200 | /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ |
197 | #define VIRT_PTR ((unsigned char*)0x4000) | 201 | #define VIRT_PTR ((unsigned char*)0x4000) |
@@ -199,6 +203,7 @@ enum { ALARM_START_WPS = 0, | |||
199 | /* a location where we won't store strings, 0 is the fastest */ | 203 | /* a location where we won't store strings, 0 is the fastest */ |
200 | #define VIRT_PTR ((unsigned char*)0) | 204 | #define VIRT_PTR ((unsigned char*)0) |
201 | #endif | 205 | #endif |
206 | #endif | ||
202 | 207 | ||
203 | /* form a "virtual pointer" out of a language ID */ | 208 | /* form a "virtual pointer" out of a language ID */ |
204 | #define ID2P(id) (VIRT_PTR + id) | 209 | #define ID2P(id) (VIRT_PTR + id) |