X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=86a5d8c65b9968f74c7197bb49d65dce03d58a2b;hb=ab61cff780f6b4b6a632305143845b2903ccd4b9;hp=1ba4d76b1419f13113c921d7c97595e8cf56c8b8;hpb=45f2f245f51ef0c0d37df3c998595c132bfcaffa;p=picodrive.git

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index 1ba4d76..86a5d8c 100644
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -74,15 +74,8 @@ void emu_stateCb(const char *str)
 
 void pemu_prep_defconfig(void)
 {
-	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;
@@ -97,7 +90,6 @@ void pemu_prep_defconfig(void)
 	defaultConfig.KeyBinds[12] = 1<<29; // vol up
 	defaultConfig.KeyBinds[11] = 1<<30; // vol down
 	defaultConfig.scaling = 0;
-	defaultConfig.turbo_rate = 15;
 }
 
 
@@ -238,10 +230,10 @@ static void vidResetMode(void)
 
 	if (PicoOpt&0x10) {
 	} else if (currentConfig.EmuOpt&0x80) {
-		PicoDrawSetColorFormat(1);
+		PicoDrawSetOutFormat(PDF_RGB555, 0);
 		PicoScanBegin = EmuScanBegin16;
 	} else {
-		PicoDrawSetColorFormat(-1);
+		PicoDrawSetOutFormat(PDF_NONE, 0);
 		PicoScanBegin = EmuScanBegin8;
 	}
 	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
@@ -302,7 +294,7 @@ static void SkipFrame(void)
 }
 
 /* forced frame to front buffer */
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int opts, int no_scale)
 {
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
@@ -314,7 +306,7 @@ void pemu_forced_frame(int opts)
 	if (giz_screen == NULL)
 		giz_screen = fb_lock(1);
 
-	PicoDrawSetColorFormat(1);
+	PicoDrawSetOutFormat(PDF_RGB555, 0);
 	PicoScanBegin = EmuScanBegin16;
 	Pico.m.dirtyPal = 1;
 	PicoFrameDrawOnly();