X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=5469c56265afbc2e2a0d6bf9607f238e125ccd06;hb=b682092681909a8c8e8165b9c3898833e36708b7;hp=97547242b7f4afc6f50175b0ff1f2c58e143cdbb;hpb=0fc0e24180bc89d8a5be33464669de0691720e9d;p=picodrive.git

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index 9754724..5469c56 100644
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -10,12 +10,13 @@
 #include "../common/emu.h"
 #include "../common/lprintf.h"
 #include "../common/arm_utils.h"
+#include "../common/config.h"
 #include "emu.h"
 #include "menu.h"
 #include "giz.h"
 #include "asm_utils.h"
 
-#include <Pico/PicoInt.h>
+#include <pico/pico_int.h>
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
@@ -44,15 +45,17 @@ void emu_noticeMsgUpdated(void)
 	noticeMsgTime = GetTickCount();
 }
 
-void emu_getMainDir(char *dst, int len)
+int emu_getMainDir(char *dst, int len)
 {
 	if (len > 0) *dst = 0;
+
+	return 0;
 }
 
 static void emu_msg_cb(const char *msg)
 {
-	if (giz_screen != NULL) Framework2D_UnlockBuffer();
-	giz_screen = Framework2D_LockBuffer(1);
+	if (giz_screen != NULL) fb_unlock();
+	giz_screen = fb_lock(1);
 
 	memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
 	emu_textOut16(4, 232, msg);
@@ -61,19 +64,19 @@ static void emu_msg_cb(const char *msg)
 	/* assumption: emu_msg_cb gets called only when something slow is about to happen */
 	reset_timing = 1;
 
-	Framework2D_UnlockBuffer();
-	giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1);
+	fb_unlock();
+	giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1);
 }
 
 void emu_stateCb(const char *str)
 {
-	if (giz_screen != NULL) Framework2D_UnlockBuffer();
-	giz_screen = Framework2D_LockBuffer(1);
+	if (giz_screen != NULL) fb_unlock();
+	giz_screen = fb_lock(1);
 
 	clearArea(0);
 	blit("", str);
 
-	Framework2D_UnlockBuffer();
+	fb_unlock();
 	giz_screen = NULL;
 
 	Sleep(0); /* yield the CPU, the system may need it */
@@ -114,32 +117,32 @@ void emu_Deinit(void)
 	PicoExit();
 }
 
-void emu_setDefaultConfig(void)
+void emu_prepareDefaultConfig(void)
 {
-	memset(&currentConfig, 0, sizeof(currentConfig));
-	currentConfig.lastRomFile[0] = 0;
-	currentConfig.EmuOpt  = 0x1f | 0x680; // | confirm_save, cd_leds, 16bit rend
-	currentConfig.PicoOpt = 0x07 | 0xc00; // | cd_pcm, cd_cdda
-	currentConfig.PsndRate = 22050;
-	currentConfig.PicoRegion = 0; // auto
-	currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
-	currentConfig.Frameskip = -1; // auto
-	currentConfig.volume = 50;
-	currentConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
-	currentConfig.KeyBinds[ 3] = 1<<1;
-	currentConfig.KeyBinds[ 0] = 1<<2;
-	currentConfig.KeyBinds[ 1] = 1<<3;
-	currentConfig.KeyBinds[ 5] = 1<<4;
-	currentConfig.KeyBinds[ 6] = 1<<5;
-	currentConfig.KeyBinds[ 7] = 1<<6;
-	currentConfig.KeyBinds[ 4] = 1<<7;
-	currentConfig.KeyBinds[13] = 1<<26; // switch rend
-	currentConfig.KeyBinds[ 8] = 1<<27; // save state
-	currentConfig.KeyBinds[ 9] = 1<<28; // load state
-	currentConfig.KeyBinds[12] = 1<<29; // vol up
-	currentConfig.KeyBinds[11] = 1<<30; // vol down
-	currentConfig.PicoCDBuffers = 0;
-	currentConfig.scaling = 0;
+	memset(&defaultConfig, 0, sizeof(defaultConfig));
+	defaultConfig.EmuOpt    = 0x1d | 0x680; // | confirm_save, cd_leds, 16bit rend
+	defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;
+	defaultConfig.s_PsndRate = 22050;
+	defaultConfig.s_PicoRegion = 0; // auto
+	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
+	defaultConfig.s_PicoCDBuffers = 0;
+	defaultConfig.Frameskip = -1; // auto
+	defaultConfig.volume = 50;
+	defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
+	defaultConfig.KeyBinds[ 3] = 1<<1;
+	defaultConfig.KeyBinds[ 0] = 1<<2;
+	defaultConfig.KeyBinds[ 1] = 1<<3;
+	defaultConfig.KeyBinds[ 5] = 1<<4;
+	defaultConfig.KeyBinds[ 6] = 1<<5;
+	defaultConfig.KeyBinds[ 7] = 1<<6;
+	defaultConfig.KeyBinds[ 4] = 1<<7;
+	defaultConfig.KeyBinds[13] = 1<<26; // switch rend
+	defaultConfig.KeyBinds[ 8] = 1<<27; // save state
+	defaultConfig.KeyBinds[ 9] = 1<<28; // load state
+	defaultConfig.KeyBinds[12] = 1<<29; // vol up
+	defaultConfig.KeyBinds[11] = 1<<30; // vol down
+	defaultConfig.scaling = 0;
+	defaultConfig.turbo_rate = 15;
 }
 
 
@@ -213,6 +216,9 @@ static void blit(const char *fps, const char *notice)
 			Pico.m.dirtyPal = 0;
 			vidConvCpyRGB565(localPal, Pico.cram, 0x40);
 		}
+		// a hack for VR
+		if (PicoRead16Hook == PicoSVPRead16)
+			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
 		if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
 		if (currentConfig.EmuOpt&0x4000)
 			lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
@@ -228,7 +234,7 @@ static void blit(const char *fps, const char *notice)
 			if (Pico.video.reg[0xC]&8) { // shadow/hilight mode
 				//vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
 				//vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO?
-				blockcpy(localPal+0xc0, localPal+0x40, 0x40*2);
+				memcpy32((void *)(localPal+0xc0), (void *)(localPal+0x40), 0x40*2/4);
 				localPal[0xc0] = 0x0600;
 				localPal[0xd0] = 0xc000;
 				localPal[0xe0] = 0x0000; // reserved pixels for OSD
@@ -261,13 +267,13 @@ static void blit(const char *fps, const char *notice)
 static void clearArea(int full)
 {
 	if (giz_screen == NULL)
-		giz_screen = Framework2D_LockBuffer(1);
+		giz_screen = fb_lock(1);
 	if (full) memset32(giz_screen, 0, 320*240*2/4);
 	else      memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
 
 	if (currentConfig.EmuOpt&0x8000) {
-		Framework2D_UnlockBuffer();
-		giz_screen = Framework2D_LockBuffer(0);
+		fb_unlock();
+		giz_screen = fb_lock(0);
 		if (full) memset32(giz_screen, 0, 320*240*2/4);
 		else      memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
 	}
@@ -275,7 +281,7 @@ static void clearArea(int full)
 
 static void vidResetMode(void)
 {
-	giz_screen = Framework2D_LockBuffer(1);
+	giz_screen = fb_lock(1);
 
 	if (PicoOpt&0x10) {
 	} else if (currentConfig.EmuOpt&0x80) {
@@ -296,11 +302,11 @@ static void vidResetMode(void)
 
 	memset32(giz_screen, 0, 321*240*2/4);
 	if (currentConfig.EmuOpt&0x8000) {
-		Framework2D_UnlockBuffer();
-		giz_screen = Framework2D_LockBuffer(0);
+		fb_unlock();
+		giz_screen = fb_lock(0);
 		memset32(giz_screen, 0, 321*240*2/4);
 	}
-	Framework2D_UnlockBuffer();
+	fb_unlock();
 	giz_screen = NULL;
 }
 
@@ -353,14 +359,14 @@ void emu_forcedFrame(int opts)
 	currentConfig.EmuOpt |= 0x80;
 
 	if (giz_screen == NULL)
-		giz_screen = Framework2D_LockBuffer(1);
+		giz_screen = fb_lock(1);
 
 	PicoDrawSetColorFormat(1);
 	PicoScanBegin = EmuScanBegin16;
 	Pico.m.dirtyPal = 1;
 	PicoFrameDrawOnly();
 
-	Framework2D_UnlockBuffer();
+	fb_unlock();
 	giz_screen = NULL;
 
 	PicoOpt = po_old;
@@ -377,17 +383,17 @@ static void RunEvents(unsigned int which)
 		if (PsndOut != NULL)
 			FrameworkAudio_SetPause(1);
 		if (giz_screen == NULL)
-			giz_screen = Framework2D_LockBuffer(1);
+			giz_screen = fb_lock(1);
 		if ( emu_checkSaveFile(state_slot) &&
 				(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
 				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
 		{
 			int keys;
 			blit("", (which & 0x1000) ? "LOAD STATE? (PLAY=yes, STOP=no)" : "OVERWRITE SAVE? (PLAY=yes, STOP=no)");
-			while( !((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) )
+			while( !((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) )
 				Sleep(50);
-			if (keys & BTN_STOP) do_it = 0;
-			while(  ((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) // wait for release
+			if (keys & PBTN_STOP) do_it = 0;
+			while(  ((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) ) // wait for release
 				Sleep(50);
 			clearArea(0);
 		}
@@ -443,7 +449,7 @@ static void updateKeys(void)
 	int i;
 
 	keys = Framework_PollGetButtons();
-	if (keys & BTN_HOME)
+	if (keys & PBTN_HOME)
 		engineState = PGS_Menu;
 
 	keys &= CONFIGURABLE_KEYS;
@@ -476,8 +482,11 @@ static void updateKeys(void)
 		}
 	}
 
-	PicoPad[0] = (unsigned short) allActions[0];
-	PicoPad[1] = (unsigned short) allActions[1];
+	PicoPad[0] = allActions[0] & 0xfff;
+	PicoPad[1] = allActions[1] & 0xfff;
+
+	if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
+	if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
 
 	events = (allActions[0] | allActions[1]) >> 16;
 
@@ -503,6 +512,10 @@ static void updateKeys(void)
 	prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
 
+void emu_platformDebugCat(char *str)
+{
+	// nothing
+}
 
 static void simpleWait(DWORD until)
 {
@@ -713,17 +726,17 @@ void emu_Loop(void)
 
 		if (currentConfig.EmuOpt&0x80)
 			/* be sure correct framebuffer is locked */
-			giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1);
+			giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1);
 
 		PicoFrame();
 
 		if (giz_screen == NULL)
-			giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1);
+			giz_screen = fb_lock((currentConfig.EmuOpt&0x8000) ? 0 : 1);
 
 		blit(fpsbuff, notice);
 
 		if (giz_screen != NULL) {
-			Framework2D_UnlockBuffer();
+			fb_unlock();
 			giz_screen = NULL;
 		}
 
@@ -731,7 +744,7 @@ void emu_Loop(void)
 			Framework2D_WaitVSync();
 
 		if (currentConfig.EmuOpt&0x8000)
-			Framework2D_Flip();
+			fb_flip();
 
 		// check time
 		tval = GetTickCount();