diff options
| -rw-r--r-- | firmware/mp3_playback.c | 5 | ||||
| -rw-r--r-- | firmware/mpeg.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c index 87db1a2..1d4f77b 100644 --- a/firmware/mp3_playback.c +++ b/firmware/mp3_playback.c @@ -935,8 +935,9 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness, init_playback(); mas_version_code = mas_readver(); - DEBUGF("MAS3587 derivate %d, version B%d\n", - (mas_version_code & 0xff00) >> 8, mas_version_code & 0xff); + DEBUGF("MAS3587 derivate %d, version %c%d\n", + (mas_version_code & 0xf000) >> 12, + 'A' + ((mas_version_code & 0x0f00) >> 8), mas_version_code & 0xff); #endif #ifdef HAVE_DAC3550A diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 45b6f05..c6afbd8 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c @@ -570,7 +570,7 @@ static void drain_dma_buffer(void) "mov.b @%0,r1 \n" /* read PBDR */ "cmp/pz r1 \n" /* and wait for /PRTW */ "bt .d_wait2 \n" - + ".d_start: \n" "tst r1,r2 \n" /* EOD low? */ "bf .d_loop \n" /* no: next pass */ @@ -2107,8 +2107,8 @@ static void init_recording(void) } while(val); /* Perform black magic as described by the data sheet */ - if((mas_version_code & 0xff) == 2) - { + if((mas_version_code & 0x0fff) == 0x0102) + { DEBUGF("Performing MAS black magic for B2 version\n"); mas_writereg(0xa3, 0x98); mas_writereg(0x94, 0xfffff); |