sound code rewrite for lower sample rates (except mp3s)

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

diff --git a/platform/gp2x/code940/940.c b/platform/gp2x/code940/940.c
index 34b42b9..18d282c 100644 (file)
--- a/platform/gp2x/code940/940.c
+++ b/platform/gp2x/code940/940.c
@@ -4,7 +4,6 @@ static _940_data_t *shared_data = (_940_data_t *)   0x00100000;
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)    0x00200000;\r
 static unsigned char *mp3_data  = (unsigned char *) 0x01000000;\r
 YM2612 *ym2612_940;\r
-int *mix_buffer;\r
 \r
 // from init.s\r
 void wait_irq(void);\r
@@ -57,17 +56,18 @@ static void mp3_decode(void)
 }\r
 \r
 \r
-void Main940(int startvector)\r
+void Main940(int startvector, int pc_at_irq)\r
 {\r
+       int mix_buffer = shared_data->mix_buffer;\r
        ym2612_940 = &shared_data->ym2612;\r
-       mix_buffer = shared_data->mix_buffer;\r
 \r
        // debug\r
        shared_ctl->vstarts[startvector]++;\r
+       shared_ctl->last_irq_pc = pc_at_irq;\r
        // asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0");\r
 \r
 \r
-       for (;;)\r
+//     for (;;)\r
        {\r
                int job_num = 0;\r
 /*\r
@@ -77,13 +77,18 @@ void Main940(int startvector)
                        spend_cycles(8*1024);\r
                }\r
 */\r
+/*\r
                if (!shared_ctl->busy)\r
                {\r
                        wait_irq();\r
                }\r
+               shared_ctl->lastbusy = shared_ctl->busy;\r
+*/\r
 \r
                for (job_num = 0; job_num < MAX_940JOBS; job_num++)\r
                {\r
+                       shared_ctl->lastjob = (job_num << 8) | shared_ctl->jobs[job_num];\r
+\r
                        switch (shared_ctl->jobs[job_num])\r
                        {\r
                                case JOB940_INITALL:\r
@@ -122,7 +127,7 @@ void Main940(int startvector)
                                                YM2612Write_(d >> 8, d);\r
                                        }\r
 \r
-                                       YM2612UpdateOne_(0, shared_ctl->length, shared_ctl->stereo);\r
+                                       YM2612UpdateOne_(mix_buffer, shared_ctl->length, shared_ctl->stereo, 1);\r
                                        break;\r
                                }\r
 \r
@@ -138,7 +143,10 @@ void Main940(int startvector)
 //             cache_clean_flush();\r
 \r
                shared_ctl->loopc++;\r
-               shared_ctl->busy = 0;\r
+\r
+//             // shared_ctl->busy = 0; // shared mem is not reliable?\r
+\r
+               wait_irq();\r
        }\r
 }\r
 \r