From d50e2d1531049ad9108168eec58f4a4f24785cb5 Mon Sep 17 00:00:00 2001 From: amiconn Date: Thu, 4 Feb 2010 20:20:10 +0000 Subject: [PATCH] Put back the insane buffer where it belongs on non-ARM, and simplify the selection. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24512 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/demac/libdemac/demac_config.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/codecs/demac/libdemac/demac_config.h b/apps/codecs/demac/libdemac/demac_config.h index 7388aa105..c908c3ea1 100644 --- a/apps/codecs/demac/libdemac/demac_config.h +++ b/apps/codecs/demac/libdemac/demac_config.h @@ -48,24 +48,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA #define FILTER256_IRAM #endif -#if CONFIG_CPU == PP5002 +#if CONFIG_CPU == PP5002 || defined(CPU_S5L870X) /* Code in IRAM for speed, not enough IRAM for the insane filter buffer. */ #define ICODE_SECTION_DEMAC_ARM .icode #define ICODE_ATTR_DEMAC ICODE_ATTR #define IBSS_ATTR_DEMAC_INSANEBUF -#elif CONFIG_CPU == PP5020 -/* Not enough IRAM for the insane filter buffer. */ +#elif defined(CPU_PP502x) +/* Insane filter buffer not in IRAM due to division table. */ #define ICODE_SECTION_DEMAC_ARM .text #define ICODE_ATTR_DEMAC #define IBSS_ATTR_DEMAC_INSANEBUF -#elif defined(CPU_S5L870X) -#define ICODE_SECTION_DEMAC_ARM .icode -#define ICODE_ATTR_DEMAC ICODE_ATTR -#define IBSS_ATTR_DEMAC_INSANEBUF #else #define ICODE_SECTION_DEMAC_ARM .text #define ICODE_ATTR_DEMAC -#define IBSS_ATTR_DEMAC_INSANEBUF +#define IBSS_ATTR_DEMAC_INSANEBUF IBSS_ATTR #endif #else /* !ROCKBOX */ -- 2.11.4.GIT