From 353ebd09670edea2fb9316e1c8ec79c9c5df8380 Mon Sep 17 00:00:00 2001 From: Tom Ross Date: Fri, 27 Feb 2009 07:57:29 +0000 Subject: 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 --- apps/settings.h | 6 +----- uisimulator/common/stubs.c | 4 ---- 2 files changed, 1 insertion(+), 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, This helps to save space for menus and options. */ #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ -#ifdef SIMULATOR -/* a space which is defined in stubs.c */ -extern unsigned char vp_dummy[VIRT_SIZE]; -#define VIRT_PTR vp_dummy -#elif CONFIG_CPU==DM320 +#if CONFIG_CPU==DM320 /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ #define VIRT_PTR ((unsigned char*)0x4000) #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) thread_sdl_exception_wait(); } -/* assure an unused place to direct virtual pointers to */ -#define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ -unsigned char vp_dummy[VIRT_SIZE]; - -- cgit v1.2.3