X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=73c01dcc4d13831d8a3a3996898117d1813b687e;hb=88b3d7c16ae976d332b8462de839b86f856a7180;hp=c26013b652fef960a387494d6dd2d2879cfd958f;hpb=a8869ad1e809e6cacd6141fa7e9c86d349b0c0be;p=picodrive.git

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index c26013b..73c01dc 100644
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -52,8 +52,8 @@ void emu_getMainDir(char *dst, int len)
 
 static void emu_msg_cb(const char *msg)
 {
-	if (giz_screen == NULL)
-		giz_screen = Framework2D_LockBuffer();
+	if (giz_screen != NULL) Framework2D_UnlockBuffer();
+	giz_screen = Framework2D_LockBuffer(1);
 
 	memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
 	emu_textOut16(4, 232, msg);
@@ -61,18 +61,23 @@ 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);
 }
 
-static void emu_state_cb(const char *str)
+void emu_stateCb(const char *str)
 {
-	if (giz_screen == NULL)
-		giz_screen = Framework2D_LockBuffer();
+	if (giz_screen != NULL) Framework2D_UnlockBuffer();
+	giz_screen = Framework2D_LockBuffer(1);
 
 	clearArea(0);
 	blit("", str);
 
 	Framework2D_UnlockBuffer();
 	giz_screen = NULL;
+
+	Sleep(0); /* yield the CPU, the system may need it */
 }
 
 static void emu_msg_tray_open(void)
@@ -99,7 +104,7 @@ void emu_Init(void)
 void emu_Deinit(void)
 {
 	// save SRAM
-	if((currentConfig.EmuOpt & 1) && SRam.changed) {
+	if ((currentConfig.EmuOpt & 1) && SRam.changed) {
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
@@ -155,7 +160,7 @@ static int EmuScan16(unsigned int num, void *sdata)
 	if (!(Pico.video.reg[1]&8)) num += 8;
 	DrawLineDest = (unsigned short *) giz_screen + 321*(num+1);
 
-	if ((currentConfig.EmuOpt&0x4000) && (num&1) == (Pico.m.frame_count&1))
+	if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
 		return 1; // skip next line
 
 	return 0;
@@ -222,7 +227,7 @@ static void blit(const char *fps, const char *notice)
 		}
 		if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
 		if (currentConfig.EmuOpt&0x4000)
-			lines_flags|=(Pico.m.frame_count&1)?0x20000:0x40000;
+			lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
 		vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
 	}
 	else if (!(emu_opt&0x80))
@@ -250,7 +255,7 @@ static void blit(const char *fps, const char *notice)
 		lines_flags = (Pico.video.reg[1]&8) ? 240 : 224;
 		if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
 		if (currentConfig.EmuOpt&0x4000)
-			lines_flags|=(Pico.m.frame_count&1)?0x20000:0x40000;
+			lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
 		vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
 	}
 
@@ -268,14 +273,21 @@ static void blit(const char *fps, const char *notice)
 static void clearArea(int full)
 {
 	if (giz_screen == NULL)
-		giz_screen = Framework2D_LockBuffer();
+		giz_screen = Framework2D_LockBuffer(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);
+		if (full) memset32(giz_screen, 0, 320*240*2/4);
+		else      memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
+	}
 }
 
 static void vidResetMode(void)
 {
-	giz_screen = Framework2D_LockBuffer();
+	giz_screen = Framework2D_LockBuffer(1);
 
 	if (PicoOpt&0x10) {
 	} else if (currentConfig.EmuOpt&0x80) {
@@ -295,11 +307,16 @@ static void vidResetMode(void)
 	Pico.m.dirtyPal = 1;
 
 	memset32(giz_screen, 0, 321*240*2/4);
+	if (currentConfig.EmuOpt&0x8000) {
+		Framework2D_UnlockBuffer();
+		giz_screen = Framework2D_LockBuffer(0);
+		memset32(giz_screen, 0, 321*240*2/4);
+	}
 	Framework2D_UnlockBuffer();
 	giz_screen = NULL;
 }
 
-
+/*
 #include <stdarg.h>
 static void stdbg(const char *fmt, ...)
 {
@@ -313,7 +330,7 @@ static void stdbg(const char *fmt, ...)
 
 	noticeMsgTime = GetTickCount();
 }
-
+*/
 
 static void updateSound(int len)
 {
@@ -323,8 +340,8 @@ static void updateSound(int len)
 	PsndOut += len;
 	if (PsndOut - snd_cbuff >= snd_cbuf_samples)
 	{
-		if (PsndOut - snd_cbuff != snd_cbuf_samples)
-			stdbg("snd diff is %i, not %i", PsndOut - snd_cbuff, snd_cbuf_samples);
+		//if (PsndOut - snd_cbuff != snd_cbuf_samples)
+		//	stdbg("snd diff is %i, not %i", PsndOut - snd_cbuff, snd_cbuf_samples);
 		PsndOut = snd_cbuff;
 	}
 }
@@ -337,6 +354,7 @@ static void SkipFrame(void)
 	PicoSkipFrame=0;
 }
 
+/* forced frame to front buffer */
 void emu_forcedFrame(void)
 {
 	int po_old = PicoOpt;
@@ -347,7 +365,7 @@ void emu_forcedFrame(void)
 	currentConfig.EmuOpt |= 0x80;
 
 	if (giz_screen == NULL)
-		giz_screen = Framework2D_LockBuffer();
+		giz_screen = Framework2D_LockBuffer(1);
 
 	PicoDrawSetColorFormat(1);
 	PicoScan = EmuScan16;
@@ -365,31 +383,43 @@ void emu_forcedFrame(void)
 
 static void RunEvents(unsigned int which)
 {
-	if (which & 0x1800) { // save or load (but not both)
+	if (which & 0x1800) // save or load (but not both)
+	{
 		int do_it = 1;
+
+		if (PsndOut != NULL)
+			FrameworkAudio_SetPause(1);
+		if (giz_screen == NULL)
+			giz_screen = Framework2D_LockBuffer(1);
 		if ( emu_checkSaveFile(state_slot) &&
 				(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
 				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
 		{
 			int keys;
-			if (giz_screen == NULL)
-				giz_screen = Framework2D_LockBuffer();
 			blit("", (which & 0x1000) ? "LOAD STATE? (PLAY=yes, STOP=no)" : "OVERWRITE SAVE? (PLAY=yes, STOP=no)");
 			while( !((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) )
 				Sleep(50);
 			if (keys & BTN_STOP) do_it = 0;
+			while(  ((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) // wait for release
+				Sleep(50);
 			clearArea(0);
 		}
-		if (do_it) {
+
+		if (do_it)
+		{
 			osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
-			PicoStateProgressCB = emu_state_cb;
+			PicoStateProgressCB = emu_stateCb;
 			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
 			PicoStateProgressCB = NULL;
+			Sleep(0);
 		}
 
+		if (PsndOut != NULL)
+			FrameworkAudio_SetPause(0);
 		reset_timing = 1;
 	}
-	if (which & 0x0400) { // switch renderer
+	if (which & 0x0400) // switch renderer
+	{
 		if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |=  0x80; }
 		else              { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
 
@@ -405,7 +435,8 @@ static void RunEvents(unsigned int which)
 
 		noticeMsgTime = GetTickCount();
 	}
-	if (which & 0x0300) {
+	if (which & 0x0300)
+	{
 		if(which&0x0200) {
 			state_slot -= 1;
 			if(state_slot < 0) state_slot = 9;
@@ -472,7 +503,7 @@ static void updateKeys(void)
 			if (vol >   0) vol--;
 		}
 		FrameworkAudio_SetVolume(vol, vol);
-		sprintf(noticeMsg, "VOL: %02i", vol);
+		sprintf(noticeMsg, "VOL: %02i ", vol);
 		noticeMsgTime = GetTickCount();
 		currentConfig.volume = vol;
 	}
@@ -560,10 +591,11 @@ void emu_Loop(void)
 	PsndOut = NULL;
 	if (currentConfig.EmuOpt & 4)
 	{
-		int ret, snd_excess_add, stereo=(PicoOpt&8)>>3;
+		int ret, snd_excess_add, stereo;
 		if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
-			sound_rerate(Pico.m.frame_count ? 1 : 0);
+			PsndRerate(Pico.m.frame_count ? 1 : 0);
 		}
+		stereo=(PicoOpt&8)>>3;
 		snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
 		snd_cbuf_samples = (PsndRate<<stereo) * 16 / target_fps;
 		lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
@@ -593,7 +625,7 @@ void emu_Loop(void)
 
 		tval = GetTickCount();
 		if (reset_timing || tval < tval_prev) {
-			stdbg("timing reset");
+			//stdbg("timing reset");
 			reset_timing = 0;
 			tval_thissec = tval;
 			frames_shown = frames_done = 0;
@@ -665,7 +697,7 @@ void emu_Loop(void)
 				audio_skew_prev = audio_skew;
 				target_frametime += adj;
 				sec_ms = (target_frametime * target_fps) >> 8;
-				stdbg("%i %i %i", audio_skew, adj, sec_ms);
+				//stdbg("%i %i %i", audio_skew, adj, sec_ms);
 				frames_done = frames_shown = 0;
 			}
 			else if (currentConfig.Frameskip < 0) {
@@ -719,18 +751,17 @@ void emu_Loop(void)
 
 		updateKeys();
 
-		if (giz_screen == NULL && (currentConfig.EmuOpt&0x80))
-			giz_screen = Framework2D_LockBuffer();
+		if (currentConfig.EmuOpt&0x80)
+			/* be sure correct framebuffer is locked */
+			giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1);
+
 		if (!(PicoOpt&0x10))
 			PicoScan((unsigned) -1, NULL);
 
 		PicoFrame();
 
-		if (currentConfig.EmuOpt&0x2000)
-			Framework2D_WaitVSync();
-
 		if (giz_screen == NULL)
-			giz_screen = Framework2D_LockBuffer();
+			giz_screen = Framework2D_LockBuffer((currentConfig.EmuOpt&0x8000) ? 0 : 1);
 
 		blit(fpsbuff, notice);
 
@@ -739,6 +770,12 @@ void emu_Loop(void)
 			giz_screen = NULL;
 		}
 
+		if (currentConfig.EmuOpt&0x2000)
+			Framework2D_WaitVSync();
+
+		if (currentConfig.EmuOpt&0x8000)
+			Framework2D_Flip();
+
 		// check time
 		tval = GetTickCount();
 		tval_diff = (int)(tval - tval_thissec) << 8;
@@ -768,7 +805,7 @@ void emu_Loop(void)
 
 	// save SRAM
 	if ((currentConfig.EmuOpt & 1) && SRam.changed) {
-		emu_state_cb("Writing SRAM/BRAM..");
+		emu_stateCb("Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}