region detection, cd states wip, fixes, stuff

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

diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c
index e0c4002..34b42b9 100644 (file)
--- a/platform/gp2x/code940/940.c
+++ b/platform/gp2x/code940/940.c
@@ -11,11 +11,52 @@ void wait_irq(void);
 void spend_cycles(int c);\r
 void cache_clean(void);\r
 void cache_clean_flush(void);\r
+// this should help to resolve race confition where shared var\r
+// is changed by other core just before we update it\r
+void set_if_not_changed(int *val, int oldval, int newval);\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
 \r
+\r
+static void mp3_decode(void)\r
+{\r
+       int mp3_offs = shared_ctl->mp3_offs;\r
+       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
+\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
+                       shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF\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
+               }\r
+               shared_ctl->mp3_errors++;\r
+               shared_ctl->mp3_lasterr = err;\r
+       }\r
+       set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, readPtr - mp3_data);\r
+}\r
+\r
+\r
 void Main940(int startvector)\r
 {\r
        ym2612_940 = &shared_data->ym2612;\r
@@ -85,40 +126,9 @@ void Main940(int startvector)
                                        break;\r
                                }\r
 \r
-                               case JOB940_MP3DECODE: {\r
-                                       int mp3_offs = shared_ctl->mp3_offs;\r
-                                       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
-\r
-                                       if (bytesLeft <= 0) break; // EOF, nothing to do\r
-\r
-                                       offset = MP3FindSyncWord(readPtr, bytesLeft);\r
-                                       if (offset < 0) {\r
-                                               shared_ctl->mp3_offs = shared_ctl->mp3_len;\r
-                                               break; // 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
-                                                       shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF\r
-                                                       break;\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
-                                               }\r
-                                               shared_ctl->mp3_errors++;\r
-                                               shared_ctl->mp3_lasterr = err;\r
-                                       }\r
-                                       shared_ctl->mp3_offs = readPtr - mp3_data;\r
+                               case JOB940_MP3DECODE:\r
+                                       mp3_decode();\r
                                        break;\r
-                               }\r
                        }\r
                }\r
 \r