X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=b6bf5a4f83b022e9daff31b60ecd8aacd14747fc;hb=c985b45a6a2bea52534bb0f9c389f320841e3784;hp=f2867fc9b37b4dd6e767893cf223068f88d6d03e;hpb=55c7b46461759920c5429ea6d2d365e3e9acfab6;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index f2867fc..b6bf5a4 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -225,18 +225,18 @@ static void cd_leds(void)
 	}
 }
 
-static int EmuScan16(unsigned int num, void *sdata)
+static int EmuScanBegin16(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned short *) gp2x_screen + 320*(num+1);
+	DrawLineDest = (unsigned short *) gp2x_screen + 320 * num;
 
 	return 0;
 }
 
-static int EmuScan8(unsigned int num, void *sdata)
+static int EmuScanBegin8(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned char *)  gp2x_screen + 320*(num+1);
+	DrawLineDest = (unsigned char *)  gp2x_screen + 320 * num;
 
 	return 0;
 }
@@ -266,7 +266,8 @@ static void blit(const char *fps, const char *notice)
 	else if (!(emu_opt&0x80))
 	{
 		// 8bit accurate renderer
-		if (Pico.m.dirtyPal) {
+		if (Pico.m.dirtyPal)
+		{
 			Pico.m.dirtyPal = 0;
 			if(Pico.video.reg[0xC]&8) { // shadow/hilight mode
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
@@ -278,7 +279,7 @@ static void blit(const char *fps, const char *notice)
 				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
 				localPal[0xf0] = 0x00ffffff;
 				gp2x_video_setpalette(localPal, 0x100);
-			} else if (rendstatus & 0x20) { // mid-frame palette changes
+			} else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 				vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);
 				vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);
@@ -297,7 +298,7 @@ static void blit(const char *fps, const char *notice)
 		if (emu_opt & 2)
 			osd_text(osd_fps_x, h, fps);
 	}
-	if ((emu_opt & 0x400) && (PicoMCD & 1))
+	if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
 		cd_leds();
 
 	//gp2x_video_wait_vsync();
@@ -339,13 +340,11 @@ static void vidResetMode(void)
 	} else if (currentConfig.EmuOpt&0x80) {
 		gp2x_video_changemode(16);
 		PicoDrawSetColorFormat(1);
-		PicoScan = EmuScan16;
-		PicoScan(0, 0);
+		PicoScanBegin = EmuScanBegin16;
 	} else {
 		gp2x_video_changemode(8);
 		PicoDrawSetColorFormat(2);
-		PicoScan = EmuScan8;
-		PicoScan(0, 0);
+		PicoScanBegin = EmuScanBegin8;
 	}
 	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
 		// setup pal for 8-bit modes
@@ -466,9 +465,11 @@ static void RunEvents(unsigned int which)
 				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save
 			unsigned long keys;
 			blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)");
-			while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )
+			while ( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )
 				usleep(50*1024);
 			if (keys & GP2X_X) do_it = 0;
+			while ( gp2x_joystick_read(1) & (GP2X_X|GP2X_Y) ) // wait for release
+				usleep(50*1024);
 			clearArea(0);
 		}
 		if (do_it) {
@@ -625,8 +626,7 @@ void emu_forcedFrame(void)
 
 	//vidResetMode();
 	PicoDrawSetColorFormat(1);
-	PicoScan = EmuScan16;
-	PicoScan(0, 0);
+	PicoScanBegin = EmuScanBegin16;
 	Pico.m.dirtyPal = 1;
 	PicoFrameDrawOnly();
 
@@ -782,7 +782,7 @@ void emu_Loop(void)
 	}
 
 	// prepare CD buffer
-	if (PicoMCD & 1) PicoCDBufferInit();
+	if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
 
 	// calc vsync offset to sync timing code with vsync
 	if (currentConfig.EmuOpt&0x2000) {
@@ -960,7 +960,7 @@ void emu_Loop(void)
 
 	change_fast_forward(0);
 
-	if (PicoMCD & 1) PicoCDBufferFree();
+	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
@@ -977,7 +977,7 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-	PicoReset(0);
+	PicoReset();
 	reset_timing = 1;
 }