Adapted codecs and DSP system to having MACSR saved in thread context.

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

2 files changed, 4 insertions, 3 deletions

diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c
index 0c8b8b76a7..a37dc4583c 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/apps/codecs/libmusepack/mpc_decoder.c
@@ -1173,6 +1173,10 @@ void mpc_decoder_setup(mpc_decoder *d, mpc_reader *r)
   mpc_decoder_initialisiere_quantisierungstabellen(d, 1.0f);
   mpc_decoder_init_huffman_sv6(d);
   mpc_decoder_init_huffman_sv7(d);
+
+  #if defined(CPU_COLDFIRE)&& !defined(SIMULATOR)
+  coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_ROUND | EMAC_SATURATE);
+  #endif
 }
 
 static void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si)
diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c
index 7644551d16..51ffcce921 100644
--- a/apps/codecs/libmusepack/synth_filter.c
+++ b/apps/codecs/libmusepack/synth_filter.c
@@ -335,9 +335,6 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL
 {
     mpc_uint32_t n;
     
-    #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
-    asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */
-    #endif
     for ( n = 0; n < 36; n++, Y += 32 ) {
         V -= 64;
         Calculate_New_V ( Y, V );