diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/codec.h | 9 | ||||
-rw-r--r-- | apps/codecs/lib/codeclib.h | 9 | ||||
-rw-r--r-- | apps/codecs/lib/xxx2wav.h | 9 | ||||
-rw-r--r-- | apps/codecs/libmusepack/Makefile | 2 | ||||
-rw-r--r-- | apps/codecs/libmusepack/config-mpc.h (renamed from apps/codecs/libmusepack/config.h) | 0 |
5 files changed, 2 insertions, 27 deletions
diff --git a/apps/codecs/codec.h b/apps/codecs/codec.h index 3b6e7796ee..c00d2bda95 100644 --- a/apps/codecs/codec.h +++ b/apps/codecs/codec.h | |||
@@ -21,15 +21,6 @@ | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | 23 | ||
24 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | ||
25 | #define ICODE_ATTR __attribute__ ((section(".icode"))) | ||
26 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | ||
27 | #define USE_IRAM 1 | ||
28 | #else | ||
29 | #define ICODE_ATTR | ||
30 | #define IDATA_ATTR | ||
31 | #endif | ||
32 | |||
33 | #include <sys/types.h> | 24 | #include <sys/types.h> |
34 | 25 | ||
35 | /* Get these functions 'out of the way' of the standard functions. Not doing | 26 | /* Get these functions 'out of the way' of the standard functions. Not doing |
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 116f210c5f..762b68dd95 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h | |||
@@ -22,15 +22,6 @@ | |||
22 | 22 | ||
23 | /* Various codec "helper functions" */ | 23 | /* Various codec "helper functions" */ |
24 | 24 | ||
25 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | ||
26 | #define ICODE_ATTR __attribute__ ((section(".icode"))) | ||
27 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | ||
28 | #define USE_IRAM 1 | ||
29 | #else | ||
30 | #define ICODE_ATTR | ||
31 | #define IDATA_ATTR | ||
32 | #endif | ||
33 | |||
34 | extern int mem_ptr; | 25 | extern int mem_ptr; |
35 | extern int bufsize; | 26 | extern int bufsize; |
36 | extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer | 27 | extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer |
diff --git a/apps/codecs/lib/xxx2wav.h b/apps/codecs/lib/xxx2wav.h index 1fa7dc9413..1cdbc99878 100644 --- a/apps/codecs/lib/xxx2wav.h +++ b/apps/codecs/lib/xxx2wav.h | |||
@@ -19,14 +19,7 @@ | |||
19 | 19 | ||
20 | /* Various "helper functions" common to all the xxx2wav decoder plugins */ | 20 | /* Various "helper functions" common to all the xxx2wav decoder plugins */ |
21 | 21 | ||
22 | #if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) | 22 | #include "config.h" |
23 | #define ICODE_ATTR __attribute__ ((section(".icode"))) | ||
24 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | ||
25 | #define USE_IRAM 1 | ||
26 | #else | ||
27 | #define ICODE_ATTR | ||
28 | #define IDATA_ATTR | ||
29 | #endif | ||
30 | 23 | ||
31 | /* the main data structure of the program */ | 24 | /* the main data structure of the program */ |
32 | typedef struct { | 25 | typedef struct { |
diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index 1e3eaf6232..79ebffe9b8 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile | |||
@@ -8,7 +8,7 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | 10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ |
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers | 11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) |
12 | 12 | ||
13 | ifdef APPEXTRA | 13 | ifdef APPEXTRA |
14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) | 14 | INCLUDES += -I$(APPSDIR)/$(APPEXTRA) |
diff --git a/apps/codecs/libmusepack/config.h b/apps/codecs/libmusepack/config-mpc.h index 8d764c4031..8d764c4031 100644 --- a/apps/codecs/libmusepack/config.h +++ b/apps/codecs/libmusepack/config-mpc.h | |||