From 5d74a45e9aef6f5e0e1668d721d9d14c59177ac6 Mon Sep 17 00:00:00 2001 From: Buschel Date: Thu, 12 May 2011 22:24:09 +0000 Subject: [PATCH] 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 --- apps/codecs/libfaad/common.h | 1 + apps/codecs/libfaad/sbr_dec.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/codecs/libfaad/common.h b/apps/codecs/libfaad/common.h index e5b86ba97..720042b4a 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 4904c702e..21e8e028a 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)); -- 2.11.4.GIT