X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2F940ctl.c;h=083036e8df110f5581585a0966e333019a56c650;hb=421713439805e3d389c420a04afc48fc267eb28f;hp=f01ffa3329b3950eda59f87f2492ce0eab3781f0;hpb=091facb8fe133c8318ed13147b244e9af602a2ac;p=picodrive.git

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index f01ffa3..083036e 100644
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -11,20 +11,16 @@
 #include <errno.h>
 
 #include "code940/940shared.h"
-#include "gp2x.h"
+#include "soc_mmsp2.h"
+#include "soc.h"
 #include "emu.h"
-#include "menu.h"
 #include "../common/mp3.h"
 #include "../common/arm_utils.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
-#include "../../Pico/PicoInt.h"
-#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;
+#include "../../pico/pico_int.h"
+#include "../../pico/sound/ym2612.h"
+#include "../../pico/sound/mix.h"
 
 extern int reset_timing;
 static unsigned char *shared_mem = 0;
@@ -150,7 +146,7 @@ static void wait_busy_940(int job)
 		gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);
 	printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob);
 
-	strcpy(menuErrorMsg, "940 crashed, too much overclock?");
+	me_update_msg("940 crashed, too much overclock?");
 	engineState = PGS_Menu;
 	crashed_940 = 1;
 }
@@ -287,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
@@ -313,7 +309,7 @@ void YM2612Init_940(int baseclock, int rate)
 		fp = fopen(binpath, "rb");
 		if(!fp)
 		{
-			memset(gp2x_screen, 0, 320*240*2);
+			memset(g_screen_ptr, 0, 320*240*2);
 			text_out16(10, 100, "failed to open required file:");
 			text_out16(10, 110, CODE940_FILE);
 			gp2x_video_flip2();
@@ -348,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