devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Corrected MAS version checks

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4989 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2004-08-05 17:06:31 +00:00
parent 87ab7cef11
commit 536dff1a27
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
firmware/mp3_playback.c
View file

@ -935,8 +935,9 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
init_playback(); init_playback();
mas_version_code = mas_readver(); mas_version_code = mas_readver();
DEBUGF("MAS3587 derivate %d, version B%d\n", DEBUGF("MAS3587 derivate %d, version %c%d\n",
(mas_version_code & 0xff00) >> 8, mas_version_code & 0xff); (mas_version_code & 0xf000) >> 12,
'A' + ((mas_version_code & 0x0f00) >> 8), mas_version_code & 0xff);
#endif #endif
#ifdef HAVE_DAC3550A #ifdef HAVE_DAC3550A

6
firmware/mpeg.c
View file

@ -570,7 +570,7 @@ static void drain_dma_buffer(void)
"mov.b @%0,r1 \n" /* read PBDR */ "mov.b @%0,r1 \n" /* read PBDR */
"cmp/pz r1 \n" /* and wait for /PRTW */ "cmp/pz r1 \n" /* and wait for /PRTW */
"bt .d_wait2 \n" "bt .d_wait2 \n"
".d_start: \n" ".d_start: \n"
"tst r1,r2 \n" /* EOD low? */ "tst r1,r2 \n" /* EOD low? */
"bf .d_loop \n" /* no: next pass */ "bf .d_loop \n" /* no: next pass */
@ -2107,8 +2107,8 @@ static void init_recording(void)
} while(val); } while(val);
/* Perform black magic as described by the data sheet */ /* 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"); DEBUGF("Performing MAS black magic for B2 version\n");
mas_writereg(0xa3, 0x98); mas_writereg(0xa3, 0x98);
mas_writereg(0x94, 0xfffff); mas_writereg(0x94, 0xfffff);