Make codeclib_misc.h include the asm headers to simplify inclusion magic.

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

6 files changed, 3 insertions, 15 deletions

diff --git a/apps/codecs/lib/codeclib_misc.h b/apps/codecs/lib/codeclib_misc.h
index a393df4183..f3ec209e78 100644
--- a/apps/codecs/lib/codeclib_misc.h
+++ b/apps/codecs/lib/codeclib_misc.h
@@ -22,8 +22,8 @@
 //#include "ivorbiscodec.h"
 //#include "os_types.h"
 
-//#include "asm_arm.h"
-//#include "asm_mcf5249.h"
+#include "asm_arm.h"
+#include "asm_mcf5249.h"
 
 
 /* Some prototypes that were not defined elsewhere */
diff --git a/apps/codecs/lib/fft-ffmpeg.c b/apps/codecs/lib/fft-ffmpeg.c
index d18f0481c0..a5ffab9086 100644
--- a/apps/codecs/lib/fft-ffmpeg.c
+++ b/apps/codecs/lib/fft-ffmpeg.c
@@ -44,8 +44,6 @@
 #include <time.h>
 #include <codecs/lib/codeclib.h>
 
-#include "asm_arm.h"
-#include "asm_mcf5249.h"
 #include "codeclib_misc.h"
 #include "mdct_lookup.h"
 
diff --git a/apps/codecs/lib/mdct.c b/apps/codecs/lib/mdct.c
index 4b0a509401..8382a7213d 100644
--- a/apps/codecs/lib/mdct.c
+++ b/apps/codecs/lib/mdct.c
@@ -20,8 +20,6 @@
 
 #include "codeclib.h"
 #include "mdct.h"
-#include "asm_arm.h"
-#include "asm_mcf5249.h"
 #include "codeclib_misc.h"
 #include "mdct_lookup.h"
 
diff --git a/apps/codecs/lib/mdct2.h b/apps/codecs/lib/mdct2.h
index 3c25e03093..12b0c0845f 100644
--- a/apps/codecs/lib/mdct2.h
+++ b/apps/codecs/lib/mdct2.h
@@ -32,8 +32,6 @@
 #include <codecs.h>
 #endif /* ROCKBOX */
 
-#include "asm_arm.h"
-#include "asm_mcf5249.h"
 #include "codeclib_misc.h"
 
 #ifndef ICONST_ATTR_TREMOR_WINDOW
diff --git a/apps/codecs/libcook/cook_fixpoint.h b/apps/codecs/libcook/cook_fixpoint.h
index faa86dc77a..182409071d 100644
--- a/apps/codecs/libcook/cook_fixpoint.h
+++ b/apps/codecs/libcook/cook_fixpoint.h
@@ -37,8 +37,6 @@
 
 #ifdef ROCKBOX
 /* get definitions of MULT31, MULT31_SHIFT15, vect_add, from codelib */
-#include "asm_arm.h"
-#include "asm_mcf5249.h"
 #include "codeclib_misc.h"
 #include "codeclib.h"
 #endif
diff --git a/apps/codecs/libwmapro/wmapro_mdct.c b/apps/codecs/libwmapro/wmapro_mdct.c
index 3f5439e5f3..2fa7040257 100644
--- a/apps/codecs/libwmapro/wmapro_mdct.c
+++ b/apps/codecs/libwmapro/wmapro_mdct.c
@@ -4,11 +4,7 @@
 #include "../lib/mdct_lookup.h" /* for revtab */
 #include "../lib/fft.h"     /* for FFT data structures */
 #include "codeclib.h"
-
- /* for XNPROD31 */
-#include "asm_arm.h"
-#include "asm_mcf5249.h"
-#include "codeclib_misc.h"
+#include "codeclib_misc.h"  /* for XNPROD31 */
 
 #include "wmapro_math.h"