X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=f217dea6bb02d76086c958a7f01c4042bb267330;hb=e1cd546fc7ec6f3c83a5b0f50e2d4ea93b139e3c;hp=917ed29c0d8284cecd1894f6b22fb38fefd7b58b;hpb=5ecedd0cc2257b564dfcf68cb0e9d7d541bfc2b8;p=libpicofe.git

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 917ed29..f217dea 100644
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -33,7 +33,7 @@ _940_ctl_t *shared_ctl = 0;
 unsigned char *mp3_mem = 0;
 
 #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M
-#define CODE940_FILE "pico940.bin"
+#define CODE940_FILE "pico940_v2.bin"
 
 int crashed_940 = 0;
 
@@ -434,7 +434,7 @@ void YM2612Init_940(int baseclock, int rate)
 
 void YM2612ResetChip_940(void)
 {
-	printf("YM2612ResetChip_940()\n");
+	//printf("YM2612ResetChip_940()\n");
 	if (shared_data == NULL) {
 		printf("YM2612ResetChip_940: reset before init?\n");
 		return;
@@ -611,7 +611,7 @@ int mp3_get_offset(void)
 	unsigned int offs1024 = 0;
 	int cdda_on;
 
-	cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+	cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
 			(Pico_mcd->scd.Status_CDC & 1) && loaded_mp3;
 
 	if (cdda_on) {