Move some stuff out of IRAM for the voice decoder.

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

7 files changed, 19 insertions, 11 deletions

diff --git a/apps/codecs/libspeex/config-speex.h b/apps/codecs/libspeex/config-speex.h
index db15948330..fc2d4b9475 100644
--- a/apps/codecs/libspeex/config-speex.h
+++ b/apps/codecs/libspeex/config-speex.h
@@ -51,8 +51,14 @@
 
 #ifndef ROCKBOX_VOICE_CODEC
 #define EXC_ICONST_ATTR ICONST_ATTR
+#define GAIN_ICONST_ATTR ICONST_ATTR
+#define HEXC_ICONST_ATTR ICONST_ATTR
+#define LSP_ICONST_ATTR ICONST_ATTR
 #else
 #define EXC_ICONST_ATTR
+#define GAIN_ICONST_ATTR
+#define HEXC_ICONST_ATTR
+#define LSP_ICONST_ATTR
 #endif
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
diff --git a/apps/codecs/libspeex/gain_table.c b/apps/codecs/libspeex/gain_table.c
index 7d222450e1..bf236e80fc 100644
--- a/apps/codecs/libspeex/gain_table.c
+++ b/apps/codecs/libspeex/gain_table.c
@@ -31,7 +31,7 @@
 
 #include "config-speex.h"
 
-const signed char gain_cdbk_nb[512] ICONST_ATTR = {
+const signed char gain_cdbk_nb[512] GAIN_ICONST_ATTR = {
 -32, -32, -32, 0,
 -28, -67, -5, 33,
 -42, -6, -32, 18,
diff --git a/apps/codecs/libspeex/gain_table_lbr.c b/apps/codecs/libspeex/gain_table_lbr.c
index b97045b078..b74df318a3 100644
--- a/apps/codecs/libspeex/gain_table_lbr.c
+++ b/apps/codecs/libspeex/gain_table_lbr.c
@@ -31,7 +31,7 @@
 
 #include "config-speex.h"
 
-const signed char gain_cdbk_lbr[128] ICONST_ATTR = {
+const signed char gain_cdbk_lbr[128] GAIN_ICONST_ATTR = {
 -32, -32, -32, 0,
 -31, -58, -16, 22,
 -41, -24, -43, 14,
diff --git a/apps/codecs/libspeex/hexc_10_32_table.c b/apps/codecs/libspeex/hexc_10_32_table.c
index f54f716db8..9a924e7ff0 100644
--- a/apps/codecs/libspeex/hexc_10_32_table.c
+++ b/apps/codecs/libspeex/hexc_10_32_table.c
@@ -32,7 +32,7 @@
 
 #include "config-speex.h"
 
-const signed char hexc_10_32_table[320] ICONST_ATTR = {
+const signed char hexc_10_32_table[320] HEXC_ICONST_ATTR = {
 -3, -2, -1, 0, -4, 5, 35, -40, -9, 13, 
 -44, 5, -27, -1, -7, 6, -11, 7, -8, 7, 
 19, -14, 15, -4, 9, -10, 10, -8, 10, -9, 
diff --git a/apps/codecs/libspeex/hexc_table.c b/apps/codecs/libspeex/hexc_table.c
index 98893f9a23..d892abd18c 100644
--- a/apps/codecs/libspeex/hexc_table.c
+++ b/apps/codecs/libspeex/hexc_table.c
@@ -32,7 +32,7 @@
 
 #include "config-speex.h"
 
-const signed char hexc_table[1024] ICONST_ATTR = {
+const signed char hexc_table[1024] HEXC_ICONST_ATTR = {
 -24, 21, -20, 5, -5, -7, 14, -10, 
 2, -27, 16, -20, 0, -32, 26, 19, 
 8, -11, -41, 31, 28, -27, -32, 34, 
diff --git a/apps/codecs/libspeex/high_lsp_tables.c b/apps/codecs/libspeex/high_lsp_tables.c
index e82e87550d..56dc0f9faa 100644
--- a/apps/codecs/libspeex/high_lsp_tables.c
+++ b/apps/codecs/libspeex/high_lsp_tables.c
@@ -29,7 +29,9 @@
    POSSIBILITY OF SUCH DAMAGE.
 */
  
-const signed char high_lsp_cdbk[512]={
+#include "config-speex.h"
+
+const signed char high_lsp_cdbk[512] LSP_ICONST_ATTR ={
 39,12,-14,-20,-29,-61,-67,-76,
 -32,-71,-67,68,77,46,34,5,
 -13,-48,-46,-72,-81,-84,-60,-58,
@@ -96,7 +98,7 @@ const signed char high_lsp_cdbk[512]={
 -42,-74,-48,21,-4,70,52,10};
 
 
-const signed char high_lsp_cdbk2[512]={
+const signed char high_lsp_cdbk2[512] LSP_ICONST_ATTR ={
 -36,-62,6,-9,-10,-14,-56,23,
 1,-26,23,-48,-17,12,8,-7,
 23,29,-36,-28,-6,-29,-17,-5,
diff --git a/apps/codecs/libspeex/lsp_tables_nb.c b/apps/codecs/libspeex/lsp_tables_nb.c
index e9fe9cebd5..6bdd2e4d0f 100644
--- a/apps/codecs/libspeex/lsp_tables_nb.c
+++ b/apps/codecs/libspeex/lsp_tables_nb.c
@@ -31,7 +31,7 @@
 
 #include "config-speex.h"
 
-const signed char cdbk_nb[640] ICONST_ATTR = {
+const signed char cdbk_nb[640] LSP_ICONST_ATTR = {
 30,19,38,34,40,32,46,43,58,43,
 5,-18,-25,-40,-33,-55,-52,20,34,28,
 -20,-63,-97,-92,61,53,47,49,53,75,
@@ -97,7 +97,7 @@ const signed char cdbk_nb[640] ICONST_ATTR = {
 -6,-41,-67,6,-2,-9,19,2,85,74,
 -22,-67,-84,-71,-50,3,11,-9,2,62};
 
-const signed char cdbk_nb_low1[320] ICONST_ATTR = {
+const signed char cdbk_nb_low1[320] LSP_ICONST_ATTR = {
 -34,-52,-15,45,2,
 23,21,52,24,-33,
 -9,-1,9,-44,-41,
@@ -163,7 +163,7 @@ const signed char cdbk_nb_low1[320] ICONST_ATTR = {
 13,20,20,-19,-22,
 -2,-8,2,51,-51};
 
-const signed char cdbk_nb_low2[320] ICONST_ATTR = {
+const signed char cdbk_nb_low2[320] LSP_ICONST_ATTR = {
 -6,53,-21,-24,4,
 26,17,-4,-37,25,
 17,-36,-13,31,3,
@@ -229,7 +229,7 @@ const signed char cdbk_nb_low2[320] ICONST_ATTR = {
 -23,-29,-16,1,-3,
 -8,-10,31,64,-65};
 
-const signed char cdbk_nb_high1[320] ICONST_ATTR = {
+const signed char cdbk_nb_high1[320] LSP_ICONST_ATTR = {
 -26,-8,29,21,4,
 19,-39,33,-7,-36,
 56,54,48,40,29,
@@ -295,7 +295,7 @@ const signed char cdbk_nb_high1[320] ICONST_ATTR = {
 29,17,8,-29,-39,
 -69,18,15,-15,-5};
 
-const signed char cdbk_nb_high2[320] ICONST_ATTR = {
+const signed char cdbk_nb_high2[320] LSP_ICONST_ATTR = {
 11,47,16,-9,-46,
 -32,26,-64,34,-5,
 38,-7,47,20,2,