From 112bc15d65f133876654b45090618c3cd1da148c Mon Sep 17 00:00:00 2001 From: Michael Sparmann Date: Mon, 5 Oct 2009 14:42:18 +0000 Subject: [PATCH] Fix the stack string issue for the Meizus, too git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22957 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.h | 10 ++++------ 1 file 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, This helps to save space for menus and options. */ #define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ -#if CONFIG_CPU==S5L8701 -/* the S5L8700 has IRAM at 0, so we use 0xffff bytes right after that */ -#define VIRT_PTR ((unsigned char*)0x2C000) -#else -#if CONFIG_CPU==DM320 +#if defined(CPU_S5L870X) +/* the S5L870X has IRAM at 0, so we use 0xffff bytes right after that */ +#define VIRT_PTR ((unsigned char*)0x40000) +#elif CONFIG_CPU==DM320 /* the DM320 has IRAM at 0, so we use 0xffff bytes right after that */ #define VIRT_PTR ((unsigned char*)0x4000) #else /* a location where we won't store strings, 0 is the fastest */ #define VIRT_PTR ((unsigned char*)0) #endif -#endif /* form a "virtual pointer" out of a language ID */ #define ID2P(id) (VIRT_PTR + id)