diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-30 13:46:38 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-30 13:46:38 +0000 |
| commit | 6b807b2d248baee699eb2b5e43344cd278a7f01d (patch) | |
| tree | af42015fea9f5965c948b268802424c0129173e7 /apps | |
| parent | 43b9cda13c5e6275de0921dc457af9760c95a53b (diff) | |
| download | rockbox-6b807b2d248baee699eb2b5e43344cd278a7f01d.zip rockbox-6b807b2d248baee699eb2b5e43344cd278a7f01d.tar.gz rockbox-6b807b2d248baee699eb2b5e43344cd278a7f01d.tar.bz2 rockbox-6b807b2d248baee699eb2b5e43344cd278a7f01d.tar.xz | |
Fixed MAC initialization problem with mpa codec and removed workaround
for that bug.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7260 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/Tremor/asm_mcf5249.h | 4 | ||||
| -rw-r--r-- | apps/codecs/Tremor/vorbisfile.c | 1 | ||||
| -rw-r--r-- | apps/codecs/mpa.c | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/apps/codecs/Tremor/asm_mcf5249.h b/apps/codecs/Tremor/asm_mcf5249.h index 2dcff02..eb6ed75 100644 --- a/apps/codecs/Tremor/asm_mcf5249.h +++ b/apps/codecs/Tremor/asm_mcf5249.h @@ -29,10 +29,6 @@ #define MB() -static inline void mcf5249_init_mac(void) { - asm volatile ("move.l #0x20, %macsr;"); /* frac, truncate, no saturation */ -} - static inline ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) { asm volatile ("mac.l %[x], %[y], %%acc0;" /* multiply & shift */ diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c index 0d8c04a..92f42a3 100644 --- a/apps/codecs/Tremor/vorbisfile.c +++ b/apps/codecs/Tremor/vorbisfile.c @@ -21,6 +21,7 @@ #include <errno.h> #include <string.h> #include <math.h> +#include "system.h" #include "ivorbiscodec.h" #include "ivorbisfile.h" diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c index fb47822..8cfd6ef 100644 --- a/apps/codecs/mpa.c +++ b/apps/codecs/mpa.c @@ -24,6 +24,7 @@ #include "playback.h" #include "dsp.h" #include "lib/codeclib.h" +#include "system.h" struct mad_stream Stream IDATA_ATTR; struct mad_frame Frame IDATA_ATTR; @@ -92,7 +93,10 @@ enum codec_status codec_start(struct codec_api* api) ci->memset(&Frame, 0, sizeof(struct mad_frame)); ci->memset(&Synth, 0, sizeof(struct mad_synth)); ci->memset(&Timer, 0, sizeof(mad_timer_t)); - + +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) + mcf5249_init_mac(); +#endif mad_stream_init(&Stream); mad_frame_init(&Frame); mad_synth_init(&Synth); |