X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=86c473c2a831a21c43bdd230f10bb9dae0cda919;hb=6311a3baf533d4a034e51dfe38e8cb213a1bf442;hp=2844fb2590f6ec039942c6043a46ded8e640e1b2;hpb=a4edca53b489370b0814a74579acbcc183578355;p=picodrive.git

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index 2844fb2..86c473c 100644
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -26,7 +26,6 @@
 
 // main 300K gfx-related buffer. Used by menu and renderers.
 unsigned char gfx_buffer[321*240*2*2];
-unsigned char *PicoDraw2FB = gfx_buffer;  // temporary buffer for alt renderer ( (8+320)*(8+240+8) )
 
 static short *snd_cbuff = NULL;
 static int snd_cbuf_samples = 0, snd_all_samples = 0;
@@ -95,7 +94,7 @@ void pemu_prep_defconfig(void)
 
 static int EmuScanBegin16(unsigned int num)
 {
-	DrawLineDest = (unsigned short *) giz_screen + 321 * num;
+	Pico.est.DrawLineDest = (unsigned short *) giz_screen + 321 * num;
 
 	if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
 		return 1; // skip next line
@@ -106,7 +105,7 @@ static int EmuScanBegin16(unsigned int num)
 static int EmuScanBegin8(unsigned int num)
 {
 	// draw like the fast renderer
-	HighCol = gfx_buffer + 328 * num;
+	Pico.est.HighCol = gfx_buffer + 328 * num;
 
 	return 0;
 }
@@ -123,13 +122,6 @@ static void osd_text(int x, int y, const char *text)
 	emu_text_out16(x, y, text);
 }
 
-/*
-void log1(void *p1, void *p2)
-{
-	lprintf("%p %p %p\n", p1, p2, DrawLineDest);
-}
-*/
-
 static void cd_leds(void)
 {
 	static int old_reg = 0;
@@ -153,7 +145,7 @@ static void blit(const char *fps, const char *notice)
 {
 	int emu_opt = currentConfig.EmuOpt;
 
-	if (PicoOpt&0x10)
+	if (PicoIn.opt&0x10)
 	{
 		int lines_flags = 224;
 		// 8bit fast renderer
@@ -162,12 +154,12 @@ static void blit(const char *fps, const char *notice)
 			vidConvCpyRGB565(localPal, Pico.cram, 0x40);
 		}
 		// a hack for VR
-		if (PicoAHW & PAHW_SVP)
-			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
+		if (PicoIn.AHW & PAHW_SVP)
+			memset32((int *)(Pico.est.Draw2FB+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;
-		vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
+		vidCpy8to16((unsigned short *)giz_screen+321*8, Pico.est.Draw2FB+328*8, localPal, lines_flags);
 	}
 	else if (!(emu_opt&0x80))
 	{
@@ -195,7 +187,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|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;
-		vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags);
+		vidCpy8to16((unsigned short *)giz_screen+321*8, Pico.est.Draw2FB+328*8, localPal, lines_flags);
 	}
 
 	if (notice || (emu_opt & 2)) {
@@ -204,7 +196,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) && (PicoAHW & PAHW_MCD))
+	if ((emu_opt & 0x400) && (PicoIn.AHW & PAHW_MCD))
 		cd_leds();
 }
 
@@ -228,7 +220,7 @@ static void vidResetMode(void)
 {
 	giz_screen = fb_lock(1);
 
-	if (PicoOpt&0x10) {
+	if (PicoIn.opt&0x10) {
 	} else if (currentConfig.EmuOpt&0x80) {
 		PicoDrawSetOutFormat(PDF_RGB555, 0);
 		PicoDrawSetCallbacks(EmuScanBegin16, NULL);
@@ -236,7 +228,7 @@ static void vidResetMode(void)
 		PicoDrawSetOutFormat(PDF_NONE, 0);
 		PicoDrawSetCallbacks(EmuScanBegin8, NULL);
 	}
-	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
+	if ((PicoIn.opt&0x10) || !(currentConfig.EmuOpt&0x80)) {
 		// setup pal for 8-bit modes
 		localPal[0xc0] = 0x0600;
 		localPal[0xd0] = 0xc000;
@@ -274,33 +266,33 @@ static void stdbg(const char *fmt, ...)
 static void updateSound(int len)
 {
 	snd_all_samples += len / 2;
-	PsndOut += len / 2;
-	if (PsndOut - snd_cbuff >= snd_cbuf_samples)
+	PicoIn.sndOut += len / 2;
+	if (PicoIn.sndOut - 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;
+		//if (PicoIn.sndOut - snd_cbuff != snd_cbuf_samples)
+		//	stdbg("snd diff is %i, not %i", PicoIn.sndOut - snd_cbuff, snd_cbuf_samples);
+		PicoIn.sndOut = snd_cbuff;
 	}
 }
 
 
 static void SkipFrame(void)
 {
-	PicoSkipFrame=1;
+	PicoIn.skipFrame=1;
 	PicoFrame();
-	PicoSkipFrame=0;
+	PicoIn.skipFrame=0;
 }
 
 /* forced frame to front buffer */
 void pemu_forced_frame(int no_scale, int do_emu)
 {
-	int po_old = PicoOpt;
+	int po_old = PicoIn.opt;
 	int eo_old = currentConfig.EmuOpt;
 
-	PicoOpt &= ~0x10;
-	PicoOpt |= POPT_ACC_SPRITES;
+	PicoIn.opt &= ~0x10;
+	PicoIn.opt |= POPT_ACC_SPRITES;
 	if (!no_scale)
-		PicoOpt |= POPT_EN_SOFTSCALE;
+		PicoIn.opt |= POPT_EN_SOFTSCALE;
 	currentConfig.EmuOpt |= 0x80;
 
 	if (giz_screen == NULL)
@@ -314,7 +306,7 @@ void pemu_forced_frame(int no_scale, int do_emu)
 	fb_unlock();
 	giz_screen = NULL;
 
-	PicoOpt = po_old;
+	PicoIn.opt = po_old;
 	currentConfig.EmuOpt = eo_old;
 }
 
@@ -325,7 +317,7 @@ static void RunEvents(unsigned int which)
 	{
 		int do_it = 1;
 
-		if (PsndOut != NULL)
+		if (PicoIn.sndOut != NULL)
 			FrameworkAudio_SetPause(1);
 		if (giz_screen == NULL)
 			giz_screen = fb_lock(1);
@@ -352,18 +344,18 @@ static void RunEvents(unsigned int which)
 			Sleep(0);
 		}
 
-		if (PsndOut != NULL)
+		if (PicoIn.sndOut != NULL)
 			FrameworkAudio_SetPause(0);
 		reset_timing = 1;
 	}
 	if (which & 0x0400) // switch renderer
 	{
-		if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |=  0x80; }
-		else              { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
+		if (PicoIn.opt&0x10) { PicoIn.opt&=~0x10; currentConfig.EmuOpt |=  0x80; }
+		else              { PicoIn.opt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
 
 		vidResetMode();
 
-		if (PicoOpt&0x10) {
+		if (PicoIn.opt&0x10) {
 			strcpy(noticeMsg, " 8bit fast renderer");
 		} else if (currentConfig.EmuOpt&0x80) {
 			strcpy(noticeMsg, "16bit accurate renderer");
@@ -400,16 +392,16 @@ static void updateKeys(void)
 
 	keys &= CONFIGURABLE_KEYS;
 
-	PicoPad[0] = allActions[0] & 0xfff;
-	PicoPad[1] = allActions[1] & 0xfff;
+	PicoIn.pad[0] = allActions[0] & 0xfff;
+	PicoIn.pad[1] = allActions[1] & 0xfff;
 
-	if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
-	if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
+	if (allActions[0] & 0x7000) emu_DoTurbo(&PicoIn.pad[0], allActions[0]);
+	if (allActions[1] & 0x7000) emu_DoTurbo(&PicoIn.pad[1], allActions[1]);
 
 	events = (allActions[0] | allActions[1]) >> 16;
 
 	// volume is treated in special way and triggered every frame
-	if ((events & 0x6000) && PsndOut != NULL)
+	if ((events & 0x6000) && PicoIn.sndOut != NULL)
 	{
 		int vol = currentConfig.volume;
 		if (events & 0x2000) {
@@ -463,8 +455,8 @@ void pemu_loop(void)
 
 	// make sure we are in correct mode
 	vidResetMode();
-	if (currentConfig.scaling) PicoOpt|=0x4000;
-	else PicoOpt&=~0x4000;
+	if (currentConfig.scaling) PicoIn.opt|=0x4000;
+	else PicoIn.opt&=~0x4000;
 	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 
@@ -474,22 +466,22 @@ void pemu_loop(void)
 	reset_timing = 1;
 
 	// prepare CD buffer
-	if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
+	if (PicoIn.AHW & PAHW_MCD) PicoCDBufferInit();
 
 	// prepare sound stuff
-	PsndOut = NULL;
+	PicoIn.sndOut = NULL;
 	if (currentConfig.EmuOpt & 4)
 	{
 		int ret, snd_excess_add, stereo;
-		if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+		if (PicoIn.sndRate != PsndRate_old || (PicoIn.opt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
 			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;
+		stereo=(PicoIn.opt&8)>>3;
+		snd_excess_add = ((PicoIn.sndRate - Pico.snd.len*target_fps)<<16) / target_fps;
+		snd_cbuf_samples = (PicoIn.sndRate<<stereo) * 16 / target_fps;
 		lprintf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
-			PsndRate, PsndLen, snd_excess_add, stereo, Pico.m.pal);
-		ret = FrameworkAudio_Init(PsndRate, snd_cbuf_samples, stereo);
+			PicoIn.sndRate, Pico.snd.len, snd_excess_add, stereo, Pico.m.pal);
+		ret = FrameworkAudio_Init(PicoIn.sndRate, snd_cbuf_samples, stereo);
 		if (ret != 0) {
 			lprintf("FrameworkAudio_Init() failed: %i\n", ret);
 			sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret);
@@ -497,12 +489,12 @@ void pemu_loop(void)
 			currentConfig.EmuOpt &= ~4;
 		} else {
 			FrameworkAudio_SetVolume(currentConfig.volume, currentConfig.volume);
-			PicoWriteSound = updateSound;
+			PicoIn.writeSound = updateSound;
 			snd_cbuff = FrameworkAudio_56448Buffer();
-			PsndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
+			PicoIn.sndOut = snd_cbuff + snd_cbuf_samples / 2; // start writing at the middle
 			snd_all_samples = 0;
-			PsndRate_old = PsndRate;
-			PicoOpt_old  = PicoOpt;
+			PsndRate_old = PicoIn.sndRate;
+			PicoOpt_old  = PicoIn.opt;
 			pal_old = Pico.m.pal;
 		}
 	}
@@ -561,15 +553,15 @@ void pemu_loop(void)
 			//tval_thissec += 1000;
 			tval_thissec += sec_ms;
 
-			if (PsndOut != NULL)
+			if (PicoIn.sndOut != NULL)
 			{
 				/* some code which tries to sync things to audio clock, the dirty way */
 				static int audio_skew_prev = 0;
 				int audio_skew, adj, co = 9, shift = 7;
 				audio_skew = snd_all_samples*2 - FrameworkAudio_BufferPos();
-				if (PsndRate == 22050) co = 10;
-				if (PsndRate  > 22050) co = 11;
-				if (PicoOpt&8) shift++;
+				if (PicoIn.sndRate == 22050) co = 10;
+				if (PicoIn.sndRate  > 22050) co = 11;
+				if (PicoIn.opt&8) shift++;
 				if (audio_skew < 0) {
 					adj = -((-audio_skew) >> shift);
 					if (audio_skew > -(6<<co)) adj>>=1;
@@ -608,7 +600,7 @@ void pemu_loop(void)
 			for (i = 0; i < currentConfig.Frameskip; i++) {
 				updateKeys();
 				SkipFrame(); frames_done++;
-				if (PsndOut) { // do framelimitting if sound is enabled
+				if (PicoIn.sndOut) { // do framelimitting if sound is enabled
 					int tval_diff;
 					tval = GetTickCount();
 					tval_diff = (int)(tval - tval_thissec) << 8;
@@ -668,7 +660,7 @@ void pemu_loop(void)
 
 		if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300<<8)) // slowdown detection
 			reset_timing = 1;
-		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
+		else if (PicoIn.sndOut != NULL || currentConfig.Frameskip < 0)
 		{
 			// sleep if we are still too fast
 			if (tval_diff < lim_time)
@@ -682,10 +674,10 @@ void pemu_loop(void)
 	}
 
 
-	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+	if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree();
 
-	if (PsndOut != NULL) {
-		PsndOut = snd_cbuff = NULL;
+	if (PicoIn.sndOut != NULL) {
+		PicoIn.sndOut = snd_cbuff = NULL;
 		FrameworkAudio_Close();
 	}