X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=46de80cd365f2341936be9ead5d3066d7f595684;hb=1ceda4176ff86029e143802e2b5999dd2d091e9c;hp=aaa5a0e00f84579181912bfbe91f0e9b3dd7dfec;hpb=63b796cabb7d484d648755810f79bebc8f0fd689;p=libpicofe.git

diff --git a/psp/emu.c b/psp/emu.c
index aaa5a0e..46de80c 100644
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -17,11 +17,13 @@
 #include "menu.h"
 #include "emu.h"
 #include "mp3.h"
+#include "asm_utils.h"
 #include "../common/emu.h"
+#include "../common/config.h"
 #include "../common/lprintf.h"
 #include "../../Pico/PicoInt.h"
 
-#define OSD_FPS_X 424
+#define OSD_FPS_X 432
 
 // additional pspaudio imports, credits to crazyc
 int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown);  // play with conversion?
@@ -32,9 +34,8 @@ int sceAudioOutput2GetRestSample();
 
 char romFileName[PATH_MAX];
 unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
-int engineState;
+int engineState = PGS_Menu;
 
-static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos
 static unsigned int noticeMsgTime = 0;
 int reset_timing = 0; // do we need this?
 
@@ -110,56 +111,53 @@ void emu_Deinit(void)
 		SRam.changed = 0;
 	}
 
-	if (!(currentConfig.EmuOpt & 0x20)) {
-		FILE *f = fopen(PicoConfigFile, "r+b");
-		if (!f) emu_WriteConfig(0);
-		else {
-			// if we already have config, reload it, except last ROM
-			fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);
-			fread(&currentConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);
-			fseek(f, 0, SEEK_SET);
-			fwrite(&currentConfig, 1, sizeof(currentConfig), f);
-			fflush(f);
-			fclose(f);
-		}
-	}
+	if (!(currentConfig.EmuOpt & 0x20))
+		config_writelrom(PicoConfigFile);
 
 	PicoExit();
 	sound_deinit();
 }
 
+void emu_prepareDefaultConfig(void)
+{
+	memset(&defaultConfig, 0, sizeof(defaultConfig));
+	defaultConfig.EmuOpt    = 0x1d | 0x680; // | <- confirm_save, cd_leds, acc rend
+	defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX;
+	defaultConfig.s_PsndRate = 22050;
+	defaultConfig.s_PicoRegion = 0; // auto
+	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
+	defaultConfig.s_PicoCDBuffers = 64;
+	defaultConfig.Frameskip = -1; // auto
+	defaultConfig.CPUclock = 333;
+	defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
+	defaultConfig.KeyBinds[ 6] = 1<<1;
+	defaultConfig.KeyBinds[ 7] = 1<<2;
+	defaultConfig.KeyBinds[ 5] = 1<<3;
+	defaultConfig.KeyBinds[14] = 1<<4;
+	defaultConfig.KeyBinds[13] = 1<<5;
+	defaultConfig.KeyBinds[15] = 1<<6;
+	defaultConfig.KeyBinds[ 3] = 1<<7;
+	defaultConfig.KeyBinds[12] = 1<<26; // switch rnd
+	defaultConfig.KeyBinds[ 8] = 1<<27; // save state
+	defaultConfig.KeyBinds[ 9] = 1<<28; // load state
+	defaultConfig.KeyBinds[28] = 1<<0; // num "buttons"
+	defaultConfig.KeyBinds[30] = 1<<1;
+	defaultConfig.KeyBinds[31] = 1<<2;
+	defaultConfig.KeyBinds[29] = 1<<3;
+	defaultConfig.scaling = 1;     // bilinear filtering for psp
+	defaultConfig.scale = 1.20;    // fullscreen
+	defaultConfig.hscale40 = 1.25;
+	defaultConfig.hscale32 = 1.56;
+}
+
 void emu_setDefaultConfig(void)
 {
-	memset(&currentConfig, 0, sizeof(currentConfig));
-	currentConfig.lastRomFile[0] = 0;
-	currentConfig.EmuOpt  = 0x1d | 0x680;  // | confirm_save, cd_leds, acc rend
-	currentConfig.PicoOpt = 0x0f | 0x1c00; // | gfx_cd, 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.CPUclock = 333;
-	currentConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
-	currentConfig.KeyBinds[ 6] = 1<<1;
-	currentConfig.KeyBinds[ 7] = 1<<2;
-	currentConfig.KeyBinds[ 5] = 1<<3;
-	currentConfig.KeyBinds[14] = 1<<4;
-	currentConfig.KeyBinds[13] = 1<<5;
-	currentConfig.KeyBinds[15] = 1<<6;
-	currentConfig.KeyBinds[ 3] = 1<<7;
-	currentConfig.KeyBinds[12] = 1<<26; // switch rnd
-	currentConfig.KeyBinds[ 8] = 1<<27; // save state
-	currentConfig.KeyBinds[ 9] = 1<<28; // load state
-	currentConfig.KeyBinds[28] = 1<<0; // num "buttons"
-	currentConfig.KeyBinds[30] = 1<<1;
-	currentConfig.KeyBinds[31] = 1<<2;
-	currentConfig.KeyBinds[29] = 1<<3;
-	currentConfig.PicoCDBuffers = 64;
-	currentConfig.scaling = 1;     // bilinear filtering for psp
-	currentConfig.scale = 1.20;    // fullscreen
-	currentConfig.hscale40 = 1.25;
-	currentConfig.hscale32 = 1.56;
+	memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
+	PicoOpt = currentConfig.s_PicoOpt;
+	PsndRate = currentConfig.s_PsndRate;
+	PicoRegionOverride = currentConfig.s_PicoRegion;
+	PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
+	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
 }
 
 
@@ -197,7 +195,6 @@ static void set_scaling_params(void)
 	if (fbimg_width >= 480) {
 		g_vertices[0].u = (fbimg_width-480)/2;
 		g_vertices[1].u = src_width - (fbimg_width-480)/2 - 1;
-		if (fbimg_width == 480) border_hack = 1;
 		fbimg_width = 480;
 		fbimg_xoffs = 0;
 	} else {
@@ -205,6 +202,7 @@ static void set_scaling_params(void)
 		g_vertices[1].u = src_width;
 		fbimg_xoffs = 240 - fbimg_width/2;
 	}
+	if (fbimg_width > 320 && fbimg_width <= 480) border_hack = 1;
 
 	if (fbimg_height >= 272) {
 		g_vertices[0].v = (fbimg_height-272)/2;
@@ -239,25 +237,25 @@ static void set_scaling_params(void)
 
 static void do_pal_update(int allow_sh)
 {
-	unsigned int *spal=(void *)Pico.cram;
 	unsigned int *dpal=(void *)localPal;
 	int i;
 
-	for (i = 0x3f/2; i >= 0; i--)
-		dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
+	//for (i = 0x3f/2; i >= 0; i--)
+	//	dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
+	do_pal_convert(localPal, Pico.cram, currentConfig.gamma, currentConfig.gamma2);
 
 	if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
 	{
 		// shadowed pixels
 		for (i = 0x3f/2; i >= 0; i--)
-			dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e;
+			dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x7bcf7bcf;
 		// hilighted pixels
 		for (i = 0x3f; i >= 0; i--) {
-			int t=localPal[i]&0xe71c;t+=0x4208;
-			if (t&0x20) t|=0x1c;
-			if (t&0x800) t|=0x700;
-			if (t&0x10000) t|=0xe000;
-			t&=0xe71c;
+			int t=localPal[i]&0xf79e;t+=0x4208;
+			if (t&0x20) t|=0x1e;
+			if (t&0x800) t|=0x780;
+			if (t&0x10000) t|=0xf000;
+			t&=0xf79e;
 			localPal[0x80|i]=(unsigned short)t;
 		}
 		localPal[0xe0] = 0;
@@ -287,7 +285,17 @@ static void EmuScanPrepare(void)
 		do_pal_update(1);
 }
 
-static int EmuScanSlow(unsigned int num, void *sdata)
+static int EmuScanSlowBegin(unsigned int num)
+{
+	if (!(Pico.video.reg[1]&8)) num += 8;
+
+	if (!dynamic_palette)
+		HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
+
+	return 0;
+}
+
+static int EmuScanSlowEnd(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
 
@@ -303,8 +311,7 @@ static int EmuScanSlow(unsigned int num, void *sdata)
 		int line_len = (Pico.video.reg[12]&1) ? 320 : 256;
 		void *dst = (char *)VRAM_STUFF + 512*240 + 512*2*num;
 		amips_clut(dst, HighCol + 8, localPal, line_len);
-	} else
-		HighCol = (unsigned char *)VRAM_CACHED_STUFF + (num+1)*512 + 8;
+	}
 
 	return 0;
 }
@@ -433,7 +440,7 @@ static void blit2(const char *fps, const char *notice, int lagging_behind)
 
 	//dbg_text();
 
-	if ((emu_opt & 0x400) && (PicoMCD & 1))
+	if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
 		cd_leds();
 
 	if (currentConfig.EmuOpt & 0x2000) { // want vsync
@@ -478,7 +485,8 @@ static void vidResetMode(void)
 
 	// slow rend.
 	PicoDrawSetColorFormat(-1);
-	PicoScan = EmuScanSlow;
+	PicoScanBegin = EmuScanSlowBegin;
+	PicoScanEnd = EmuScanSlowEnd;
 
 	localPal[0xe0] = 0;
 	Pico.m.dirtyPal = 1;
@@ -534,7 +542,7 @@ static int sound_thread(SceSize args, void *argp)
 
 		// shouln't happen, but just in case
 		if (samples_made - samples_done >= samples_block*3) {
-			lprintf("sthr: block skip (%i)\n", samples_made - samples_done);
+			//lprintf("sthr: block skip (%i)\n", samples_made - samples_done);
 			samples_done += samples_block; // skip
 			snd_playptr  += samples_block;
 		}
@@ -681,7 +689,8 @@ void emu_forcedFrame(void)
 	memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
 
 	PicoDrawSetColorFormat(-1);
-	PicoScan = EmuScanSlow;
+	PicoScanBegin = EmuScanSlowBegin;
+	PicoScanEnd = EmuScanSlowEnd;
 	EmuScanPrepare();
 	PicoFrameDrawOnly();
 	blit1();
@@ -774,20 +783,21 @@ static void updateKeys(void)
 			int pl, acts = currentConfig.KeyBinds[i];
 			if (!acts) continue;
 			pl = (acts >> 16) & 1;
-			if (combo_keys & (1 << i))
+			if (kb_combo_keys & (1 << i))
 			{
-				int u = i+1, acts_c = acts & combo_acts;
+				int u = i+1, acts_c = acts & kb_combo_acts;
 				// let's try to find the other one
-				if (acts_c)
+				if (acts_c) {
 					for (; u < 32; u++)
-						if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) {
-							allActions[pl] |= acts_c;
+						if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
+							allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
 							keys &= ~((1 << i) | (1 << u));
 							break;
 						}
+				}
 				// add non-combo actions if combo ones were not found
 				if (!acts_c || u == 32)
-					allActions[pl] |= acts & ~combo_acts;
+					allActions[pl] |= acts & ~kb_combo_acts;
 			} else {
 				allActions[pl] |= acts;
 			}
@@ -799,21 +809,6 @@ static void updateKeys(void)
 
 	events = (allActions[0] | allActions[1]) >> 16;
 
-	// volume is treated in special way and triggered every frame
-	if ((events & 0x6000) && PsndOut != NULL)
-	{
-		int vol = currentConfig.volume;
-		if (events & 0x2000) {
-			if (vol < 100) vol++;
-		} else {
-			if (vol >   0) vol--;
-		}
-		// FrameworkAudio_SetVolume(vol, vol); // TODO
-		sprintf(noticeMsg, "VOL: %02i ", vol);
-		noticeMsgTime = sceKernelGetSystemTimeLow();
-		currentConfig.volume = vol;
-	}
-
 	events &= ~prevEvents;
 	if (events) RunEvents(events);
 	if (movie_data) emu_updateMovie();
@@ -821,44 +816,6 @@ static void updateKeys(void)
 	prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
 
-static void find_combos(void)
-{
-	int act, u;
-
-	// find out which keys and actions are combos
-	combo_keys = combo_acts = 0;
-	for (act = 0; act < 32; act++)
-	{
-		int keyc = 0, keyc2 = 0;
-		if (act == 16 || act == 17) continue; // player2 flag
-		if (act > 17)
-		{
-			for (u = 0; u < 28; u++) // 28 because nub can't produce combos
-				if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
-		}
-		else
-		{
-			for (u = 0; u < 28; u++)
-				if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
-					(currentConfig.KeyBinds[u] & (1 << act))) keyc++;
-			for (u = 0; u < 28; u++)
-				if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
-					(currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
-		}
-		if (keyc > 1 || keyc2 > 1)
-		{
-			// loop again and mark those keys and actions as combo
-			for (u = 0; u < 28; u++)
-			{
-				if (currentConfig.KeyBinds[u] & (1 << act)) {
-					combo_keys |= 1 << u;
-					combo_acts |= 1 << act;
-				}
-			}
-		}
-	}
-}
-
 
 static void simpleWait(unsigned int until)
 {
@@ -875,9 +832,10 @@ void emu_Loop(void)
 {
 	static int mp3_init_done = 0;
 	char fpsbuff[24]; // fps count c string
-	unsigned int tval, tval_prev = 0, tval_thissec = 0; // timing
-	int frames_done = 0, frames_shown = 0, oldmodes = 0;
-	int target_fps, target_frametime, lim_time, tval_diff, i;
+	unsigned int tval, tval_thissec = 0; // timing
+	int target_fps, target_frametime, lim_time, tval_diff, i, oldmodes = 0;
+	int pframes_done, pframes_shown; // "period" frames, used for sync
+	int  frames_done,  frames_shown, tval_fpsc = 0; // actual frames
 	char *notice = NULL;
 
 	lprintf("entered emu_Loop()\n");
@@ -896,14 +854,14 @@ void emu_Loop(void)
 	clearArea(1);
 	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-	find_combos();
+	emu_findKeyBindCombos();
 
 	// pal/ntsc might have changed, reset related stuff
 	target_fps = Pico.m.pal ? 50 : 60;
 	target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
 	reset_timing = 1;
 
-	if (PicoMCD & 1) {
+	if (PicoAHW & PAHW_MCD) {
 		// prepare CD buffer
 		PicoCDBufferInit();
 		// mp3...
@@ -922,6 +880,10 @@ void emu_Loop(void)
 	}
 
 	sceDisplayWaitVblankStart();
+	pframes_shown = pframes_done =
+	 frames_shown =  frames_done = 0;
+
+	tval_fpsc = sceKernelGetSystemTimeLow();
 
 	// loop?
 	while (engineState == PGS_Running)
@@ -929,11 +891,11 @@ void emu_Loop(void)
 		int modes;
 
 		tval = sceKernelGetSystemTimeLow();
-		if (reset_timing || tval < tval_prev) {
+		if (reset_timing || tval < tval_fpsc) {
 			//stdbg("timing reset");
 			reset_timing = 0;
 			tval_thissec = tval;
-			frames_shown = frames_done = 0;
+			pframes_shown = pframes_done = 0;
 		}
 
 		// show notice message?
@@ -959,38 +921,42 @@ void emu_Loop(void)
 		}
 
 		// second passed?
+		if (tval - tval_fpsc >= 1000000)
+		{
+			if (currentConfig.EmuOpt & 2)
+				sprintf(fpsbuff, "%02i/%02i  ", frames_shown, frames_done);
+			frames_done = frames_shown = 0;
+			tval_fpsc += 1000000;
+		}
+
 		if (tval - tval_thissec >= 1000000)
 		{
 			// missing 1 frame?
-			if (currentConfig.Frameskip < 0 && frames_done < target_fps) {
-				SkipFrame(); frames_done++;
+			if (currentConfig.Frameskip < 0 && pframes_done < target_fps) {
+				SkipFrame(); pframes_done++; frames_done++;
 			}
 
-			if (currentConfig.EmuOpt & 2)
-				sprintf(fpsbuff, "%02i/%02i  ", frames_shown, frames_done);
-
 			tval_thissec += 1000000;
 
 			if (currentConfig.Frameskip < 0) {
-				frames_done  -= target_fps; if (frames_done  < 0) frames_done  = 0;
-				frames_shown -= target_fps; if (frames_shown < 0) frames_shown = 0;
-				if (frames_shown > frames_done) frames_shown = frames_done;
+				pframes_done  -= target_fps; if (pframes_done  < 0) pframes_done  = 0;
+				pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0;
+				if (pframes_shown > pframes_done) pframes_shown = pframes_done;
 			} else {
-				frames_done = frames_shown = 0;
+				pframes_done = pframes_shown = 0;
 			}
 		}
 #ifdef PFRAMES
 		sprintf(fpsbuff, "%i", Pico.m.frame_count);
 #endif
 
-		tval_prev = tval;
-		lim_time = (frames_done+1) * target_frametime;
+		lim_time = (pframes_done+1) * target_frametime;
 		if (currentConfig.Frameskip >= 0) // frameskip enabled
 		{
 			for (i = 0; i < currentConfig.Frameskip; i++) {
 				updateKeys();
-				SkipFrame(); frames_done++;
-				if (PsndOut) { // do framelimitting if sound is enabled
+				SkipFrame(); pframes_done++; frames_done++;
+				if (!(currentConfig.EmuOpt&0x40000)) { // do framelimitting if needed
 					int tval_diff;
 					tval = sceKernelGetSystemTimeLow();
 					tval_diff = (int)(tval - tval_thissec) << 8;
@@ -1005,7 +971,7 @@ void emu_Loop(void)
 			int tval_diff;
 			tval = sceKernelGetSystemTimeLow();
 			tval_diff = (int)(tval - tval_thissec) << 8;
-			if (tval_diff > lim_time && (frames_done/16 < frames_shown))
+			if (tval_diff > lim_time && (pframes_done/16 < pframes_shown))
 			{
 				// no time left for this frame - skip
 				if (tval_diff - lim_time >= (300000<<8)) {
@@ -1013,7 +979,7 @@ void emu_Loop(void)
 					continue;
 				}
 				updateKeys();
-				SkipFrame(); frames_done++;
+				SkipFrame(); pframes_done++; frames_done++;
 				continue;
 			}
 		}
@@ -1033,9 +999,10 @@ void emu_Loop(void)
 
 		blit2(fpsbuff, notice, tval_diff > lim_time);
 
-		if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
+		if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) { // slowdown detection
 			reset_timing = 1;
-		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
+		}
+		else if (!(currentConfig.EmuOpt&0x40000) || currentConfig.Frameskip < 0)
 		{
 			// sleep if we are still too fast
 			if (tval_diff < lim_time)
@@ -1045,11 +1012,12 @@ void emu_Loop(void)
 			}
 		}
 
-		frames_done++; frames_shown++;
+		pframes_done++; pframes_shown++;
+		 frames_done++;  frames_shown++;
 	}
 
 
-	if (PicoMCD & 1) PicoCDBufferFree();
+	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
 	if (PsndOut != NULL) {
 		PsndOut = NULL;
@@ -1070,7 +1038,23 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-	PicoReset(0);
+	PicoReset();
 	reset_timing = 1;
 }
 
+void emu_HandleResume(void)
+{
+	if (!(PicoAHW & PAHW_MCD)) return;
+
+	// reopen files..
+	if (Pico_mcd->TOC.Tracks[0].F != NULL)
+	{
+		lprintf("emu_HandleResume: reopen %s\n", romFileName);
+		pm_close(Pico_mcd->TOC.Tracks[0].F);
+		Pico_mcd->TOC.Tracks[0].F = pm_open(romFileName);
+		lprintf("reopen %s\n", Pico_mcd->TOC.Tracks[0].F != NULL ? "ok" : "failed");
+	}
+
+	mp3_reopen_file();
+}
+