X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2F940ctl.c;h=921922c90365355cb42ec3853ba9f6dbad522952;hb=d90f5bd7488f5e5f41fd091fe05c1d67eccc276d;hp=77083c991220c52f81626a8548d3d56d6e63f88d;hpb=c6c6c9cde2d6ea12e8e38b75da02f8b0bb162766;p=picodrive.git

diff --git a/platform/gp2x/940ctl.c b/platform/gp2x/940ctl.c
index 77083c9..921922c 100644
--- a/platform/gp2x/940ctl.c
+++ b/platform/gp2x/940ctl.c
@@ -11,9 +11,8 @@
 #include <errno.h>
 
 #include "code940/940shared.h"
-#include "gp2x.h"
-#include "emu.h"
-#include "menu.h"
+#include "soc_mmsp2.h"
+#include "soc.h"
 #include "../common/mp3.h"
 #include "../common/arm_utils.h"
 #include "../common/menu.h"
@@ -22,11 +21,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;
 _940_ctl_t *shared_ctl = 0;
@@ -247,7 +241,7 @@ static void internal_reset(void)
 
 
 /* this must be called after mmu hack, the allocated regions must not get cached */
-void sharedmem_init(void)
+void sharedmem940_init(void)
 {
 	if (shared_mem != NULL) return;
 
@@ -270,7 +264,7 @@ void sharedmem_init(void)
 }
 
 
-void sharedmem_deinit(void)
+void sharedmem940_finish(void)
 {
 	munmap(shared_mem, 0x210000);
 	munmap(mp3_mem, MP3_SIZE_MAX);
@@ -287,8 +281,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
@@ -301,15 +295,10 @@ void YM2612Init_940(int baseclock, int rate)
 	{
 		unsigned char ucData[1024];
 		int nRead, i, nLen = 0;
-		char binpath[1024];
+		char binpath[512];
 		FILE *fp;
 
-		strncpy(binpath, g_argv[0], 1023);
-		binpath[1023] = 0;
-		for (i = strlen(binpath); i > 0; i--)
-			if (binpath[i] == '/') { binpath[i] = 0; break; }
-		strcat(binpath, "/" CODE940_FILE);
-
+		emu_make_path(binpath, CODE940_FILE, sizeof(binpath));
 		fp = fopen(binpath, "rb");
 		if(!fp)
 		{
@@ -348,8 +337,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