key config adjustment

[libpicofe.git] / gp2x / 940ctl.c

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 8b3c7fe..9498858 100644 (file)
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -14,9 +14,11 @@
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
-#include "asmutils.h"\r
 #include "mp3.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/menu.h"\r
 #include "../../Pico/PicoInt.h"\r
+#include "../../Pico/sound/ym2612.h"\r
 #include "../../Pico/sound/mix.h"\r
 \r
 /* we will need some gp2x internals here */\r
@@ -30,6 +32,7 @@ _940_ctl_t *shared_ctl = 0;
 unsigned char *mp3_mem = 0;\r
 \r
 #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M\r
+#define CODE940_FILE "pico940.bin"\r
 \r
 int crashed_940 = 0;\r
 \r
@@ -49,11 +52,10 @@ static FILE *loaded_mp3 = 0;
 /* these will be managed locally on our side */\r
 extern int   *ym2612_dacen;\r
 extern INT32 *ym2612_dacout;\r
-extern void  *ym2612_regs;\r
-\r
 static UINT8 *REGS = 0;                /* we will also keep local copy of regs for savestates and such */\r
-static INT32 addr_A1;          /* address line A1      */\r
-static int      dacen;\r
+static INT32 *addr_A1;         /* address line A1      */\r
+\r
+static int   dacen;\r
 static INT32 dacout;\r
 static UINT8 ST_address;       /* address register     */\r
 static UINT8 ST_status;                /* status flag          */\r
@@ -111,19 +113,19 @@ int YM2612Write_940(unsigned int a, unsigned int v)
 \r
        switch( a ) {\r
        case 0: /* address port 0 */\r
-               if (!addr_A1 && ST_address == v)\r
+               if (!*addr_A1 && ST_address == v)\r
                        return 0;       /* address already selected, don't send this command to 940 */\r
                ST_address = v;\r
                /* don't send DAC or timer related address changes to 940 */\r
-               if (!addr_A1 && (v & 0xf0) == 0x20 &&\r
+               if (!*addr_A1 && (v & 0xf0) == 0x20 &&\r
                        (v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a))\r
                                return 0;\r
-               addr_A1 = 0;\r
+               *addr_A1 = 0;\r
                upd = 0;\r
                break;\r
 \r
        case 1: /* data port 0    */\r
-               if (addr_A1 != 0) {\r
+               if (*addr_A1 != 0) {\r
                        return 0;       /* verified on real YM2608 */\r
                }\r
 \r
@@ -182,15 +184,15 @@ int YM2612Write_940(unsigned int a, unsigned int v)
                break;\r
 \r
        case 2: /* address port 1 */\r
-               if (addr_A1 && ST_address == v)\r
+               if (*addr_A1 && ST_address == v)\r
                        return 0;\r
                ST_address = v;\r
-               addr_A1 = 1;\r
+               *addr_A1 = 1;\r
                upd = 0;\r
                break;\r
 \r
        case 3: /* data port 1    */\r
-               if (addr_A1 != 1) {\r
+               if (*addr_A1 != 1) {\r
                        return 0;       /* verified on real YM2608 */\r
                }\r
 \r
@@ -311,7 +313,7 @@ static void add_job_940(int job)
 \r
 void YM2612PicoStateLoad_940(void)\r
 {\r
-       int i, old_A1 = addr_A1;\r
+       int i, old_A1 = *addr_A1;\r
 \r
        /* make sure JOB940_PICOSTATELOAD gets done before next JOB940_YM2612UPDATEONE */\r
        add_job_940(JOB940_PICOSTATELOAD);\r
@@ -329,7 +331,7 @@ void YM2612PicoStateLoad_940(void)
                YM2612Write_940(3, REGS[i|0x100]);\r
        }\r
 \r
-       addr_A1 = old_A1;\r
+       *addr_A1 = old_A1;\r
 }\r
 \r
 \r
@@ -342,7 +344,9 @@ static void internal_reset(void)
        ST_TAC    = 0;\r
        ST_TB     = 0;\r
        ST_TBC    = 0;\r
-       dacen = 0;\r
+       dacen     = 0;\r
+       dacout    = 0;\r
+       ST_address= 0;\r
 }\r
 \r
 \r
@@ -409,15 +413,15 @@ void YM2612Init_940(int baseclock, int rate)
                binpath[1023] = 0;\r
                for (i = strlen(binpath); i > 0; i--)\r
                        if (binpath[i] == '/') { binpath[i] = 0; break; }\r
-               strcat(binpath, "/code940.bin");\r
+               strcat(binpath, "/" CODE940_FILE);\r
 \r
                fp = fopen(binpath, "rb");\r
                if(!fp)\r
                {\r
-                       memset(gp2x_screen, 0, 320*240);\r
-                       gp2x_text_out8(10, 100, "failed to open required file:");\r
-                       gp2x_text_out8(10, 110, "code940.bin");\r
-                       gp2x_video_flip();\r
+                       memset(gp2x_screen, 0, 320*240*2);\r
+                       text_out16(10, 100, "failed to open required file:");\r
+                       text_out16(10, 110, CODE940_FILE);\r
+                       gp2x_video_flip2();\r
                        printf("failed to open %s\n", binpath);\r
                        exit(1);\r
                }\r
@@ -437,7 +441,11 @@ void YM2612Init_940(int baseclock, int rate)
        memset(shared_data, 0, sizeof(*shared_data));\r
        memset(shared_ctl,  0, sizeof(*shared_ctl));\r
 \r
+       /* cause local ym2612 to init REGS */\r
+       YM2612Init_(baseclock, rate);\r
+\r
        REGS = YM2612GetRegs();\r
+       addr_A1 = (INT32 *) (REGS + 0x200);\r
 \r
        ym2612_dacen  = &dacen;\r
        ym2612_dacout = &dacout;\r