work on 'vblank on line start' problem, var changes, mask defines

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

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 917ed29..272b67b 100644 (file)
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -33,7 +33,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
+#define CODE940_FILE "pico940_v2.bin"\r
 \r
 int crashed_940 = 0;\r
 \r
@@ -611,7 +611,7 @@ int mp3_get_offset(void)
        unsigned int offs1024 = 0;\r
        int cdda_on;\r
 \r
-       cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
+       cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
                        (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3;\r
 \r
        if (cdda_on) {\r