Remove floor0 stuff from IRAM. Results in a tiny speed decrease for files encoded with 6+ year old versions of the Xiph encoder, but saves IRAM which can be better used elsewhere. Thanks Nils Wallmenius in FS#7832 for the idea.

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

2 files changed, 10 insertions, 10 deletions

diff --git a/apps/codecs/libtremor/floor0.c b/apps/codecs/libtremor/floor0.c
index 81587ca..cceb113 100644
--- a/apps/codecs/libtremor/floor0.c
+++ b/apps/codecs/libtremor/floor0.c
@@ -47,7 +47,7 @@ typedef struct {
    16.16 format 
    returns in m.8 format */
 
-static const long ADJUST_SQRT2[2] ICONST_ATTR ={8192,5792};
+static const long ADJUST_SQRT2[2]  ={8192,5792};
 static inline ogg_int32_t vorbis_invsqlook_i(long a,long e){
   long i=(a&0x7fff)>>(INVSQ_LOOKUP_I_SHIFT-1); 
   long d=a&INVSQ_LOOKUP_I_MASK;                              /*  0.10 */
@@ -94,7 +94,7 @@ static inline ogg_int32_t vorbis_coslook2_i(long a){
   return(a);
 }
 
-static const int barklook[28] IDATA_ATTR ={
+static const int barklook[28] ={
   0,100,200,301,          405,516,635,766,
   912,1077,1263,1476,     1720,2003,2333,2721,
   3184,3742,4428,5285,    6376,7791,9662,12181,
@@ -117,21 +117,21 @@ static inline ogg_int32_t toBARK(int n){
   }
 }
 
-static const unsigned char MLOOP_1[64] ICONST_ATTR ={
+static const unsigned char MLOOP_1[64]  ={
    0,10,11,11, 12,12,12,12, 13,13,13,13, 13,13,13,13,
   14,14,14,14, 14,14,14,14, 14,14,14,14, 14,14,14,14,
   15,15,15,15, 15,15,15,15, 15,15,15,15, 15,15,15,15,
   15,15,15,15, 15,15,15,15, 15,15,15,15, 15,15,15,15,
 };
 
-static const unsigned char MLOOP_2[64] ICONST_ATTR ={
+static const unsigned char MLOOP_2[64]  ={
   0,4,5,5, 6,6,6,6, 7,7,7,7, 7,7,7,7,
   8,8,8,8, 8,8,8,8, 8,8,8,8, 8,8,8,8,
   9,9,9,9, 9,9,9,9, 9,9,9,9, 9,9,9,9,
   9,9,9,9, 9,9,9,9, 9,9,9,9, 9,9,9,9,
 };
 
-static const unsigned char MLOOP_3[8] ICONST_ATTR ={0,1,2,2,3,3,3,3};
+static const unsigned char MLOOP_3[8]  ={0,1,2,2,3,3,3,3};
 
 static void vorbis_lsp_to_curve(ogg_int32_t *curve,int *map,int n,int ln,
                                 ogg_int32_t *lsp,int m,
diff --git a/apps/codecs/libtremor/lsp_lookup.h b/apps/codecs/libtremor/lsp_lookup.h
index 8609936..cced7c9 100644
--- a/apps/codecs/libtremor/lsp_lookup.h
+++ b/apps/codecs/libtremor/lsp_lookup.h
@@ -26,7 +26,7 @@
 #define FROMdB2_SHIFT 3
 #define FROMdB2_MASK 31
 
-static const ogg_int32_t FROMdB_LOOKUP[FROMdB_LOOKUP_SZ] ICONST_ATTR ={
+static const ogg_int32_t FROMdB_LOOKUP[FROMdB_LOOKUP_SZ]  ={
   0x003fffff, 0x0028619b, 0x00197a96, 0x0010137a,
   0x000a24b0, 0x00066666, 0x000409c3, 0x00028c42,
   0x00019b8c, 0x000103ab, 0x0000a3d7, 0x00006760,
@@ -37,7 +37,7 @@ static const ogg_int32_t FROMdB_LOOKUP[FROMdB_LOOKUP_SZ] ICONST_ATTR ={
   0x0000000b, 0x00000007, 0x00000004, 0x00000003,
   0x00000002, 0x00000001, 0x00000001};
 
-static const ogg_int32_t FROMdB2_LOOKUP[FROMdB2_LOOKUP_SZ] ICONST_ATTR ={
+static const ogg_int32_t FROMdB2_LOOKUP[FROMdB2_LOOKUP_SZ]  ={
   0x000001fc, 0x000001f5, 0x000001ee, 0x000001e7,
   0x000001e0, 0x000001d9, 0x000001d2, 0x000001cc,
   0x000001c5, 0x000001bf, 0x000001b8, 0x000001b2,
@@ -50,7 +50,7 @@ static const ogg_int32_t FROMdB2_LOOKUP[FROMdB2_LOOKUP_SZ] ICONST_ATTR ={
 
 #define INVSQ_LOOKUP_I_SHIFT 10
 #define INVSQ_LOOKUP_I_MASK 1023
-static const long INVSQ_LOOKUP_I[64+1] ICONST_ATTR ={
+static const long INVSQ_LOOKUP_I[64+1]  ={
 	   92682,   91966,   91267,   90583,
 	   89915,   89261,   88621,   87995,
 	   87381,   86781,   86192,   85616,
@@ -70,7 +70,7 @@ static const long INVSQ_LOOKUP_I[64+1] ICONST_ATTR ={
 	   65536,
 };
 
-static const long INVSQ_LOOKUP_IDel[64] ICONST_ATTR ={
+static const long INVSQ_LOOKUP_IDel[64]  ={
              716,     699,     684,     668,
              654,     640,     626,     614,
              600,     589,     576,     565,
@@ -92,7 +92,7 @@ static const long INVSQ_LOOKUP_IDel[64] ICONST_ATTR ={
 #define COS_LOOKUP_I_SHIFT 9
 #define COS_LOOKUP_I_MASK 511
 #define COS_LOOKUP_I_SZ 128
-static const ogg_int32_t COS_LOOKUP_I[COS_LOOKUP_I_SZ+1] ICONST_ATTR ={
+static const ogg_int32_t COS_LOOKUP_I[COS_LOOKUP_I_SZ+1]  ={
 	   16384,   16379,   16364,   16340,
 	   16305,   16261,   16207,   16143,
 	   16069,   15986,   15893,   15791,