X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2F940ctl.c;h=083036e8df110f5581585a0966e333019a56c650;hb=d572cbad9886a04f8c51edb825dc6aaec9b02e23;hp=7d7a400d174484b7e6d6c6f9cb01aa25d7de7f21;hpb=9c0d458840d6eb0216232eabd3ca29b57f638c92;p=libpicofe.git

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 7d7a400..083036e 100644
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -11,7 +11,8 @@
 #include <errno.h>
 
 #include "code940/940shared.h"
-#include "gp2x.h"
+#include "soc_mmsp2.h"
+#include "soc.h"
 #include "emu.h"
 #include "../common/mp3.h"
 #include "../common/arm_utils.h"
@@ -21,10 +22,6 @@
 #include "../../pico/sound/ym2612.h"
 #include "../../pico/sound/mix.h"
 
-/* we will need some gp2x internals here */
-extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
-extern volatile unsigned long  *gp2x_memregl;
-
 extern int reset_timing;
 static unsigned char *shared_mem = 0;
 static _940_data_t *shared_data = 0;
@@ -286,8 +283,8 @@ void YM2612Init_940(int baseclock, int rate)
 	printf("YM2612Init_940()\n");
 	printf("Mem usage: shared_data: %i, shared_ctl: %i\n", sizeof(*shared_data), sizeof(*shared_ctl));
 
-	Reset940(1, 2);
-	Pause940(1);
+	reset940(1, 2);
+	pause940(1);
 
 	gp2x_memregs[0x3B40>>1] = 0;      // disable DUALCPU interrupts for 920
 	gp2x_memregs[0x3B42>>1] = 1;      // enable  DUALCPU interrupts for 940
@@ -347,8 +344,8 @@ void YM2612Init_940(int baseclock, int rate)
 	gp2x_memregl[0x4510>>2] = 0xffffffff; // clear pending IRQs in INTPND
 
 	/* start the 940 */
-	Reset940(0, 2);
-	Pause940(0);
+	reset940(0, 2);
+	pause940(0);
 
 	// YM2612ResetChip_940(); // will be done on JOB940_YM2612INIT