fix DrawSpritesHiAS

[picodrive.git] / platform / gp2x / code940 / 940.c

diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c
index 4c7082a..760816e 100644 (file)
--- a/platform/gp2x/code940/940.c
+++ b/platform/gp2x/code940/940.c
@@ -2,10 +2,11 @@
 // (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas\r
 \r
 #include "940shared.h"\r
+#include "../../common/mp3.h"\r
 \r
 static _940_data_t *shared_data = (_940_data_t *)   0x00100000;\r
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)    0x00200000;\r
-static unsigned char *mp3_data  = (unsigned char *) 0x01000000;\r
+static unsigned char *mp3_data  = (unsigned char *) 0x00400000;\r
 YM2612 *ym2612_940;\r
 \r
 // from init.s\r
@@ -18,6 +19,8 @@ void drain_wb(void);
 // is changed by other core just before we update it\r
 void set_if_not_changed(int *val, int oldval, int newval);\r
 \r
+void _memcpy(void *dst, const void *src, int count);\r
+\r
 //     asm volatile ("mov r0, #0" ::: "r0");\r
 //     asm volatile ("mcr p15, 0, r0, c7, c6,  0" ::: "r0"); /* flush dcache */\r
 //     asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer */\r
@@ -29,33 +32,67 @@ static void mp3_decode(void)
        unsigned char *readPtr = mp3_data + mp3_offs;\r
        int bytesLeft = shared_ctl->mp3_len - mp3_offs;\r
        int offset; // frame offset from readPtr\r
-       int err;\r
+       int retries = 0, err;\r
 \r
        if (bytesLeft <= 0) return; // EOF, nothing to do\r
 \r
-       offset = MP3FindSyncWord(readPtr, bytesLeft);\r
-       if (offset < 0) {\r
-               set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
-               return; // EOF\r
-       }\r
-       readPtr += offset;\r
-       bytesLeft -= offset;\r
-\r
-       err = MP3Decode(shared_data->mp3dec, &readPtr, &bytesLeft,\r
-                       shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);\r
-       if (err) {\r
-               if (err == ERR_MP3_INDATA_UNDERFLOW) {\r
-                       set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
-                       return;\r
-               } else if (err <= -6 && err >= -12) {\r
-                       // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*\r
-                       // just try to skip the offending frame..\r
-                       readPtr++;\r
+       for (retries = 0; retries < 2; retries++)\r
+       {\r
+               offset = mp3_find_sync_word(readPtr, bytesLeft);\r
+               if (offset < 0)\r
+                       goto set_eof;\r
+\r
+               readPtr += offset;\r
+               bytesLeft -= offset;\r
+\r
+               err = MP3Decode(shared_data->mp3dec, &readPtr, &bytesLeft,\r
+                               shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);\r
+               if (err) {\r
+                       if (err == ERR_MP3_MAINDATA_UNDERFLOW)\r
+                               // just need another frame\r
+                               continue;\r
+\r
+                       if (err == ERR_MP3_INDATA_UNDERFLOW)\r
+                               goto set_eof;\r
+\r
+                       if (err <= -6 && err >= -12) {\r
+                               // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*\r
+                               // just try to skip the offending frame..\r
+                               readPtr++;\r
+                               bytesLeft--;\r
+                               continue;\r
+                       }\r
+                       shared_ctl->mp3_errors++;\r
+                       shared_ctl->mp3_lasterr = err;\r
                }\r
-               shared_ctl->mp3_errors++;\r
-               shared_ctl->mp3_lasterr = err;\r
+               break;\r
        }\r
+\r
        set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, readPtr - mp3_data);\r
+       return;\r
+\r
+set_eof:\r
+       set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
+}\r
+\r
+static void ym_flush_writes(void)\r
+{\r
+       UINT16 *wbuff;\r
+       int i;\r
+\r
+       if (shared_ctl->writebuffsel == 1) {\r
+               wbuff = shared_ctl->writebuff1;\r
+       } else {\r
+               wbuff = shared_ctl->writebuff0;\r
+       }\r
+\r
+       /* playback all writes */\r
+       for (i = 2048; i > 0; i--) {\r
+               UINT16 d = *wbuff++;\r
+               if (d == 0xffff) break;\r
+               if (d == 0xfffe) continue;\r
+               YM2612Write_(d >> 8, d);\r
+       }\r
 }\r
 \r
 static void ym_update(int *ym_buffer)\r
@@ -86,7 +123,8 @@ static void ym_update(int *ym_buffer)
                YM2612Write_(d >> 8, d);\r
        }\r
 \r
-       if (two_upds) {\r
+       if (two_upds)\r
+       {\r
                int len1 = shared_ctl->length / 2;\r
                shared_ctl->ym_active_chs =\r
                        YM2612UpdateOne_(ym_buffer, len1, shared_ctl->stereo, 1);\r
@@ -145,6 +183,20 @@ void Main940(void)
                                YM2612PicoStateLoad_();\r
                                break;\r
 \r
+                       case JOB940_PICOSTATESAVE2:\r
+                               YM2612PicoStateSave2(0, 0);\r
+                               _memcpy(shared_ctl->writebuff0, ym2612_940->REGS, 0x200);\r
+                               break;\r
+\r
+                       case JOB940_PICOSTATELOAD2_PREP:\r
+                               ym_flush_writes();\r
+                               break;\r
+\r
+                       case JOB940_PICOSTATELOAD2:\r
+                               _memcpy(ym2612_940->REGS, shared_ctl->writebuff0, 0x200);\r
+                               YM2612PicoStateLoad2(0, 0);\r
+                               break;\r
+\r
                        case JOB940_YM2612UPDATEONE:\r
                                ym_update(ym_buffer);\r
                                break;\r
@@ -152,6 +204,11 @@ void Main940(void)
                        case JOB940_MP3DECODE:\r
                                mp3_decode();\r
                                break;\r
+\r
+                       case JOB940_MP3RESET:\r
+                               if (shared_data->mp3dec) MP3FreeDecoder(shared_data->mp3dec);\r
+                               shared_data->mp3dec = MP3InitDecoder();\r
+                               break;\r
                }\r
 \r
                shared_ctl->loopc++;\r