Sonic CD runs on GP2X

[libpicofe.git] / gp2x / 940.c

diff --git a/gp2x/940.c b/gp2x/940.c
index c3f0b11..e94bf21 100644 (file)
--- a/gp2x/940.c
+++ b/gp2x/940.c
@@ -1,9 +1,5 @@
 #include "940shared.h"\r
 \r
-/* this code assumes that we live @ 0x3000000 bank */\r
-//static volatile unsigned short *gp2x_memregs = (void *) 0x0xbd000000;\r
-//static volatile unsigned long  *gp2x_memregl = (void *) 0x0xbd000000;\r
-\r
 static _940_data_t *shared_data = (_940_data_t *) 0x100000;\r
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)  0x200000;\r
 YM2612 *ym2612_940;\r
@@ -28,10 +24,10 @@ void Main940(int startvector)
        shared_ctl->vstarts[startvector]++;\r
        asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0");\r
 \r
-       /* unmask IRQs */\r
 \r
        for (;; shared_ctl->loopc++)\r
        {\r
+               int job_num;\r
 /*\r
                while (!shared_ctl->busy)\r
                {\r
@@ -44,50 +40,54 @@ void Main940(int startvector)
                        wait_irq();\r
                }\r
 \r
-               switch (shared_ctl->job)\r
+               for (job_num = 0; job_num < MAX_940JOBS; job_num++)\r
                {\r
-                       case JOB940_YM2612INIT:\r
-                               shared_ctl->writebuff0[0] = shared_ctl->writebuff1[0] = 0xffff;\r
-                               YM2612Init_(shared_ctl->baseclock, shared_ctl->rate);\r
-                               break;\r
+                       switch (shared_ctl->jobs[job_num])\r
+                       {\r
+                               case JOB940_YM2612INIT:\r
+                                       shared_ctl->writebuff0[0] = shared_ctl->writebuff1[0] = 0xffff;\r
+                                       YM2612Init_(shared_ctl->baseclock, shared_ctl->rate);\r
+                                       break;\r
 \r
-                       case JOB940_YM2612RESETCHIP:\r
-                               YM2612ResetChip_();\r
-                               break;\r
+                               case JOB940_YM2612RESETCHIP:\r
+                                       YM2612ResetChip_();\r
+                                       break;\r
 \r
-                       case JOB940_PICOSTATELOAD:\r
-                               YM2612PicoStateLoad_();\r
-                               break;\r
+                               case JOB940_PICOSTATELOAD:\r
+                                       YM2612PicoStateLoad_();\r
+                                       break;\r
 \r
-                       case JOB940_YM2612UPDATEONE: {\r
-                               int i, dw, *wbuff;\r
-                               if (shared_ctl->writebuffsel == 1) {\r
-                                       wbuff = (int *) shared_ctl->writebuff1;\r
-                               } else {\r
-                                       wbuff = (int *) shared_ctl->writebuff0;\r
-                               }\r
+                               case JOB940_YM2612UPDATEONE: {\r
+                                       int i, dw, *wbuff;\r
+                                       if (shared_ctl->writebuffsel == 1) {\r
+                                               wbuff = (int *) shared_ctl->writebuff1;\r
+                                       } else {\r
+                                               wbuff = (int *) shared_ctl->writebuff0;\r
+                                       }\r
 \r
-                               /* playback all writes */\r
-                               for (i = 2048/2; i > 0; i--) {\r
-                                       UINT16 d;\r
-                                       dw = *wbuff++;\r
-                                       d = dw;\r
-                                       if (d == 0xffff) break;\r
-                                       YM2612Write_(d >> 8, d);\r
-                                       d = (dw>>16);\r
-                                       if (d == 0xffff) break;\r
-                                       YM2612Write_(d >> 8, d);\r
-                               }\r
+                                       /* playback all writes */\r
+                                       for (i = 2048/2; i > 0; i--) {\r
+                                               UINT16 d;\r
+                                               dw = *wbuff++;\r
+                                               d = dw;\r
+                                               if (d == 0xffff) break;\r
+                                               YM2612Write_(d >> 8, d);\r
+                                               d = (dw>>16);\r
+                                               if (d == 0xffff) break;\r
+                                               YM2612Write_(d >> 8, d);\r
+                                       }\r
 \r
-                               YM2612UpdateOne_(0, shared_ctl->length, shared_ctl->stereo);\r
-//                             cache_clean_flush();\r
-                               cache_clean();\r
-//                             asm volatile ("mov r0, #0" ::: "r0");\r
-//                             asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer, should be done on nonbuffered write */\r
-                               break;\r
+                                       YM2612UpdateOne_(0, shared_ctl->length, shared_ctl->stereo);\r
+                                       break;\r
+                               }\r
                        }\r
                }\r
 \r
                shared_ctl->busy = 0;\r
+//             cache_clean_flush();\r
+               cache_clean();\r
+//             asm volatile ("mov r0, #0" ::: "r0");\r
+//             asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer, should be done on nonbuffered write */\r
        }\r
 }\r
+\r