diff options
author | Tom Ross <midgey@rockbox.org> | 2009-02-27 07:57:29 +0000 |
---|---|---|
committer | Tom Ross <midgey@rockbox.org> | 2009-02-27 07:57:29 +0000 |
commit | 353ebd09670edea2fb9316e1c8ec79c9c5df8380 (patch) | |
tree | 07d976d91ec79dc5f8d844fdb7c5f6bc81d4b5ee | |
parent | 5d190bc13ca9af15d50029ecbcb5c178ed3f2b85 (diff) | |
download | rockbox-353ebd09670edea2fb9316e1c8ec79c9c5df8380.tar.gz rockbox-353ebd09670edea2fb9316e1c8ec79c9c5df8380.zip |
Small bit from my GSoC work: Unify the way the simulator accesses voice strings. In the future this will allow plugin menus to be translated and voiced.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20125 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.h | 6 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/apps/settings.h b/apps/settings.h index 3bb590c974..7f5f025a8f 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -189,11 +189,7 @@ enum { ALARM_START_WPS = 0, | |||
189 | This helps to save space for menus and options. */ | 189 | This helps to save space for menus and options. */ |
190 | 190 | ||
191 | #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ | 191 | #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ |
192 | #ifdef SIMULATOR | 192 | #if CONFIG_CPU==DM320 |
193 | /* a space which is defined in stubs.c */ | ||
194 | extern unsigned char vp_dummy[VIRT_SIZE]; | ||
195 | #define VIRT_PTR vp_dummy | ||
196 | #elif CONFIG_CPU==DM320 | ||
197 | /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ | 193 | /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ |
198 | #define VIRT_PTR ((unsigned char*)0x4000) | 194 | #define VIRT_PTR ((unsigned char*)0x4000) |
199 | #else | 195 | #else |
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index d73fe4cdd6..78171ac82b 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c | |||
@@ -351,7 +351,3 @@ void system_reboot(void) | |||
351 | thread_sdl_exception_wait(); | 351 | thread_sdl_exception_wait(); |
352 | } | 352 | } |
353 | 353 | ||
354 | /* assure an unused place to direct virtual pointers to */ | ||
355 | #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ | ||
356 | unsigned char vp_dummy[VIRT_SIZE]; | ||
357 | |||