libtremor: comment out some more unused functions, make a function param unsigned to simplify generated code, gives a small speedup on cf.

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

2 files changed, 14 insertions, 11 deletions

diff --git a/apps/codecs/libtremor/bitwise.c b/apps/codecs/libtremor/bitwise.c
index 2ca3c028a6..040384abc6 100644
--- a/apps/codecs/libtremor/bitwise.c
+++ b/apps/codecs/libtremor/bitwise.c
@@ -329,12 +329,12 @@ long oggpackB_look(oggpack_buffer *b,int bits){
   }
   return ((ret&0xffffffff)>>(m>>1))>>((m+1)>>1);
 }
-#endif
+
 long oggpack_look1(oggpack_buffer *b){
   if(b->endbyte>=b->storage)return(-1);
   return((b->ptr[0]>>b->endbit)&1);
 }
-#if 0
+
 long oggpackB_look1(oggpack_buffer *b){
   if(b->endbyte>=b->storage)return(-1);
   return((b->ptr[0]>>(7-b->endbit))&1);
@@ -361,7 +361,7 @@ void oggpack_adv(oggpack_buffer *b,int bits){
 void oggpackB_adv(oggpack_buffer *b,int bits){
   oggpack_adv(b,bits);
 }
-#endif
+
 void oggpack_adv1(oggpack_buffer *b){
   if(++(b->endbit)>7){
     b->endbit=0;
@@ -369,7 +369,7 @@ void oggpack_adv1(oggpack_buffer *b){
     b->endbyte++;
   }
 }
-#if 0
+
 void oggpackB_adv1(oggpack_buffer *b){
   oggpack_adv1(b);
 }
@@ -461,7 +461,7 @@ long oggpackB_read(oggpack_buffer *b,int bits){
   b->endbit=1;
   return -1L;
 }
-#endif
+
 long oggpack_read1(oggpack_buffer *b){
   long ret;
 
@@ -482,7 +482,7 @@ long oggpack_read1(oggpack_buffer *b){
   b->endbit=1;
   return -1L;
 }
-#if 0
+
 long oggpackB_read1(oggpack_buffer *b){
   long ret;
 
diff --git a/apps/codecs/libtremor/ogg.h b/apps/codecs/libtremor/ogg.h
index dcac0c22dd..3ded7fc113 100644
--- a/apps/codecs/libtremor/ogg.h
+++ b/apps/codecs/libtremor/ogg.h
@@ -161,14 +161,15 @@ static inline long oggpack_look(oggpack_buffer *b,int bits){
   }
   return(m&ret);
 }
-
+/*
 extern long  oggpack_look1(oggpack_buffer *b);
+extern void  oggpack_adv(oggpack_buffer *b,int bits);
+*/
 
-/* extern void  oggpack_adv(oggpack_buffer *b,int bits); */
-static inline void oggpack_adv(oggpack_buffer *b,int bits){
+static inline void oggpack_adv(oggpack_buffer *b, unsigned int bits){
   bits+=b->endbit;
 
-  if(b->endbyte > b->storage-((bits+7)>>3)) goto overflow;
+  if(b->endbyte > b->storage-(int)((bits+7)>>3)) goto overflow;
 
   b->ptr+=bits/8;
   b->endbyte+=bits/8;
@@ -181,10 +182,12 @@ static inline void oggpack_adv(oggpack_buffer *b,int bits){
   b->endbit=1;
 }
 
+/*
 extern void  oggpack_adv1(oggpack_buffer *b);
+*/
 extern long  oggpack_read(oggpack_buffer *b,int bits);
+/*
 extern long  oggpack_read1(oggpack_buffer *b);
-/* 
 extern long  oggpack_bytes(oggpack_buffer *b);
 */
 static inline long oggpack_bytes(oggpack_buffer *b){