From 08c878e9a0d50c10cb2d8d1f0ce6f11708c4edc3 Mon Sep 17 00:00:00 2001 From: Buschel Date: Thu, 12 May 2011 18:06:03 +0000 Subject: [PATCH] The last submit had one define too much. Nevertheless fix the IRAM configuration for static allocation method. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29863 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libfaad/common.h | 7 +++++-- apps/codecs/libfaad/sbr_dec.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h index fa8f4e0f3..e5b86ba97 100644 --- a/apps/codecs/libfaad/common.h +++ b/apps/codecs/libfaad/common.h @@ -56,29 +56,32 @@ extern struct codec_api* ci; #define IBSS_ATTR_FAAD_LARGE_IRAM IBSS_ATTR #define ICODE_ATTR_FAAD_LARGE_IRAM #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR +#define IBSS_ATTR_FAAD_XLR #elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) /* Enough IRAM to move additional data and code to it. */ #define IBSS_ATTR_FAAD_LARGE_IRAM IBSS_ATTR #define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR +#define IBSS_ATTR_FAAD_XLR #elif defined(CPU_S5L870X) /* Very large IRAM. Move even more data to it. */ #define IBSS_ATTR_FAAD_LARGE_IRAM IBSS_ATTR #define ICODE_ATTR_FAAD_LARGE_IRAM ICODE_ATTR #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR -#define FAAD_HAVE_XLR_IN_IRAM +#define IBSS_ATTR_FAAD_XLR IBSS_ATTR #else /* Not enough IRAM available. */ #define IBSS_ATTR_FAAD_LARGE_IRAM #define ICODE_ATTR_FAAD_LARGE_IRAM #define ICONST_ATTR_FAAD_LARGE_IRAM +#define IBSS_ATTR_FAAD_XLR #endif /* Used to allocate several SBR + PS arrays and variables statically. */ -#define FAAD_STATIC_ALLOC +//#define FAAD_STATIC_ALLOC #define INLINE __inline #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c index d369868f7..4904c702e 100644 --- a/apps/codecs/libfaad/sbr_dec.c +++ b/apps/codecs/libfaad/sbr_dec.c @@ -57,8 +57,8 @@ typedef struct { /* static variables */ static XLR_t *p_XLR = NULL; -#if defined(FAAD_STATIC_ALLOC) || defined(FAAD_HAVE_XLR_IN_IRAM) -static XLR_t s_XLR IBSS_ATTR MEM_ALIGN_ATTR; +#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR) +static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR; #endif #if defined(FAAD_STATIC_ALLOC) static sbr_info s_sbr[MAX_SYNTAX_ELEMENTS]; @@ -102,7 +102,7 @@ sbr_info *sbrDecodeInit(uint16_t framelength, uint8_t id_aac, uint8_t id_ele, /* Allocate XLR temporary variable. Use static allocation if either * FAAD_STATIC_ALLOC is set or XLR fits to IRAM. */ -#if defined(FAAD_STATIC_ALLOC) || defined(FAAD_HAVE_XLR_IN_IRAM) +#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR) p_XLR = &s_XLR; #else p_XLR = (XLR_t*)faad_malloc(sizeof(XLR_t)); -- 2.11.4.GIT