Trapped into ifdef-hell. Configure libfaad's IRAM/DRAM usage like it is meant to be.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29864 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 2 deletions

diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h
index e5b86ba978..720042b4aa 100644
--- a/apps/codecs/libfaad/common.h
+++ b/apps/codecs/libfaad/common.h
@@ -71,6 +71,7 @@ extern struct codec_api* ci;
 #define ICODE_ATTR_FAAD_LARGE_IRAM  ICODE_ATTR
 #define ICONST_ATTR_FAAD_LARGE_IRAM ICONST_ATTR
 #define IBSS_ATTR_FAAD_XLR          IBSS_ATTR
+#define HAVE_FAAD_XLR_IN_IRAM
 
 #else
 /* Not enough IRAM available. */
diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c
index 4904c702ee..21e8e028a1 100644
--- a/apps/codecs/libfaad/sbr_dec.c
+++ b/apps/codecs/libfaad/sbr_dec.c
@@ -57,7 +57,7 @@ typedef struct {
 
 /* static variables */
 static XLR_t *p_XLR = NULL;
-#if defined(FAAD_STATIC_ALLOC) || defined(IBSS_ATTR_FAAD_XLR)
+#if defined(FAAD_STATIC_ALLOC) || defined(HAVE_FAAD_XLR_IN_IRAM)
 static XLR_t s_XLR IBSS_ATTR_FAAD_XLR MEM_ALIGN_ATTR;
 #endif
 #if defined(FAAD_STATIC_ALLOC)
@@ -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(IBSS_ATTR_FAAD_XLR)
+#if defined(FAAD_STATIC_ALLOC) || defined(HAVE_FAAD_XLR_IN_IRAM)
     p_XLR  = &s_XLR;
 #else
     p_XLR  = (XLR_t*)faad_malloc(sizeof(XLR_t));