diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-07-03 14:05:12 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-07-03 14:05:12 +0000 |
| commit | d2456b44f73e6a1310d8dc2c98db92364b70e793 (patch) | |
| tree | 5f6a7ff48924ebb9b35dd57775c4538d3388d136 /apps/codecs | |
| parent | d50ed1248de6f347e928bae349c3393696a0383f (diff) | |
| download | rockbox-d2456b44f73e6a1310d8dc2c98db92364b70e793.zip rockbox-d2456b44f73e6a1310d8dc2c98db92364b70e793.tar.gz rockbox-d2456b44f73e6a1310d8dc2c98db92364b70e793.tar.bz2 rockbox-d2456b44f73e6a1310d8dc2c98db92364b70e793.tar.xz | |
Centralised the ICODE_ATTR and IDATA_ATTR #defines. Renamed some musepack and rockboy headers to avoid clashes with rockbox headers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6991 a1c6a512-1295-4272-9138-f99709370657
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 3b6e779..c00d2bd 100644 --- a/apps/codecs/codec.h +++ b/apps/codecs/codec.h @@ -21,15 +21,6 @@ #include "config.h" -#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) -#define ICODE_ATTR __attribute__ ((section(".icode"))) -#define IDATA_ATTR __attribute__ ((section(".idata"))) -#define USE_IRAM 1 -#else -#define ICODE_ATTR -#define IDATA_ATTR -#endif - #include <sys/types.h> /* 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 116f210..762b68d 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h @@ -22,15 +22,6 @@ /* Various codec "helper functions" */ -#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) -#define ICODE_ATTR __attribute__ ((section(".icode"))) -#define IDATA_ATTR __attribute__ ((section(".idata"))) -#define USE_IRAM 1 -#else -#define ICODE_ATTR -#define IDATA_ATTR -#endif - extern int mem_ptr; extern int bufsize; 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 1fa7dc9..1cdbc99 100644 --- a/apps/codecs/lib/xxx2wav.h +++ b/apps/codecs/lib/xxx2wav.h @@ -19,14 +19,7 @@ /* Various "helper functions" common to all the xxx2wav decoder plugins */ -#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR) -#define ICODE_ATTR __attribute__ ((section(".icode"))) -#define IDATA_ATTR __attribute__ ((section(".idata"))) -#define USE_IRAM 1 -#else -#define ICODE_ATTR -#define IDATA_ATTR -#endif +#include "config.h" /* the main data structure of the program */ typedef struct { diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile index 1e3eaf6..79ebffe 100644 --- a/apps/codecs/libmusepack/Makefile +++ b/apps/codecs/libmusepack/Makefile @@ -8,7 +8,7 @@ # INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ - -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers + -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) ifdef APPEXTRA INCLUDES += -I$(APPSDIR)/$(APPEXTRA) diff --git a/apps/codecs/libmusepack/config.h b/apps/codecs/libmusepack/config-mpc.h index 8d764c4..8d764c4 100644 --- a/apps/codecs/libmusepack/config.h +++ b/apps/codecs/libmusepack/config-mpc.h |