X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=bdf6a6ed9451a02062d62d0c06f4f09f725bf002;hb=8a091e48251d061ad06ffd12dfe205cbb42c78df;hp=acbe643bf96beb514c7d4a3181d35fa59b805926;hpb=450dab6fe58cfb6320b3f17211919029be679fa2;p=libpicofe.git

diff --git a/psp/emu.c b/psp/emu.c
index acbe643..bdf6a6e 100644
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -19,6 +19,7 @@
 #include "mp3.h"
 #include "asm_utils.h"
 #include "../common/emu.h"
+#include "../common/config.h"
 #include "../common/lprintf.h"
 #include "../../Pico/PicoInt.h"
 
@@ -38,6 +39,9 @@ int engineState = PGS_Menu;
 static unsigned int noticeMsgTime = 0;
 int reset_timing = 0; // do we need this?
 
+#define PICO_PEN_ADJUST_X 4
+#define PICO_PEN_ADJUST_Y 2
+static int pico_pen_x = 320/2, pico_pen_y = 240/2;
 
 static void sound_init(void);
 static void sound_deinit(void);
@@ -117,42 +121,53 @@ void emu_Deinit(void)
 	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|POPT_ACC_SPRITES;
+	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;
 }
 
 
 extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
+extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
+
+static void (*amips_clut_f)(unsigned short *dst, unsigned char *src, unsigned short *pal, int count) = NULL;
 
 struct Vertex
 {
@@ -226,14 +241,17 @@ static void set_scaling_params(void)
 	*/
 }
 
-static void do_pal_update(int allow_sh)
+static void do_pal_update(int allow_sh, int allow_as)
 {
 	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);
-	do_pal_convert(localPal, Pico.cram, currentConfig.gamma);
+	do_pal_convert(localPal, Pico.cram, currentConfig.gamma, currentConfig.gamma2);
+
+	Pico.m.dirtyPal = 0;
+	need_pal_upload = 1;
 
 	if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
 	{
@@ -250,9 +268,12 @@ static void do_pal_update(int allow_sh)
 			localPal[0x80|i]=(unsigned short)t;
 		}
 		localPal[0xe0] = 0;
+		localPal[0xf0] = 0x001f;
+	}
+	else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES))
+	{
+		memcpy32((int *)(void *)(localPal+0x80), (void *)localPal, 0x40/2);
 	}
-	Pico.m.dirtyPal = 0;
-	need_pal_upload = 1;
 }
 
 static void do_slowmode_lines(int line_to)
@@ -263,7 +284,7 @@ static void do_slowmode_lines(int line_to)
 	if (!(Pico.video.reg[1]&8)) { line = 8; dst += 512*8; src += 512*8; }
 
 	for (; line < line_to; line++, dst+=512, src+=512)
-		amips_clut(dst, src, localPal, line_len);
+		amips_clut_f(dst, src, localPal, line_len);
 }
 
 static void EmuScanPrepare(void)
@@ -273,10 +294,23 @@ static void EmuScanPrepare(void)
 
 	dynamic_palette = 0;
 	if (Pico.m.dirtyPal)
-		do_pal_update(1);
+		do_pal_update(1, 1);
+	if ((rendstatus & PDRAW_ACC_SPRITES) && !(Pico.video.reg[0xC]&8))
+	     amips_clut_f = amips_clut_6bit;
+	else amips_clut_f = amips_clut;
 }
 
-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;
 
@@ -285,15 +319,14 @@ static int EmuScanSlow(unsigned int num, void *sdata)
 			do_slowmode_lines(num);
 			dynamic_palette = 1;
 		}
-		do_pal_update(1);
+		do_pal_update(1, 0);
 	}
 
 	if (dynamic_palette) {
 		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;
+		amips_clut_f(dst, HighCol + 8, localPal, line_len);
+	}
 
 	return 0;
 }
@@ -309,7 +342,7 @@ static void blitscreen_clut(void)
 
 	if (dynamic_palette)
 	{
-		if (!blit_16bit_mode) {
+		if (!blit_16bit_mode) { // the current mode is not 16bit
 			sceGuTexMode(GU_PSM_5650, 0, 0, 0);
 			sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 512*240);
 
@@ -326,7 +359,7 @@ static void blitscreen_clut(void)
 		}
 
 		if ((PicoOpt&0x10) && Pico.m.dirtyPal)
-			do_pal_update(0);
+			do_pal_update(0, 0);
 
 		sceKernelDcacheWritebackAll();
 
@@ -376,6 +409,21 @@ static void cd_leds(void)
 	*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
 }
 
+static void draw_pico_ptr(void)
+{
+	unsigned char *p = (unsigned char *)VRAM_STUFF + 16;
+
+	// only if pen enabled and for 8bit mode
+	if (pico_inp_mode == 0 || blit_16bit_mode) return;
+
+	p += 512 * (pico_pen_y + PICO_PEN_ADJUST_Y);
+	p += pico_pen_x + PICO_PEN_ADJUST_X;
+	p[  -1] = 0xe0; p[   0] = 0xf0; p[   1] = 0xe0;
+	p[ 511] = 0xf0; p[ 512] = 0xf0; p[ 513] = 0xf0;
+	p[1023] = 0xe0; p[1024] = 0xf0; p[1025] = 0xe0;
+}
+
+
 #if 0
 static void dbg_text(void)
 {
@@ -407,6 +455,9 @@ void blit1(void)
 			memset32((int *)pd, 0xe0e0e0e0, 320/4);
 	}
 
+	if (PicoAHW & PAHW_PICO)
+		draw_pico_ptr();
+
 	blitscreen_clut();
 }
 
@@ -422,7 +473,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
@@ -467,9 +518,11 @@ static void vidResetMode(void)
 
 	// slow rend.
 	PicoDrawSetColorFormat(-1);
-	PicoScan = EmuScanSlow;
+	PicoScanBegin = EmuScanSlowBegin;
+	PicoScanEnd = EmuScanSlowEnd;
 
 	localPal[0xe0] = 0;
+	localPal[0xf0] = 0x001f;
 	Pico.m.dirtyPal = 1;
 	blit_16bit_mode = dynamic_palette = 0;
 
@@ -655,13 +708,13 @@ static void SkipFrame(void)
 	PicoSkipFrame=0;
 }
 
-void emu_forcedFrame(void)
+void emu_forcedFrame(int opts)
 {
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
 
-	PicoOpt &= ~0x0010;
-	PicoOpt |=  0x4080; // soft_scale | acc_sprites
+	PicoOpt &= ~0x10;
+	PicoOpt |= opts|POPT_ACC_SPRITES;
 	currentConfig.EmuOpt |= 0x80;
 
 	vidResetMode();
@@ -670,7 +723,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();
@@ -681,6 +735,29 @@ void emu_forcedFrame(void)
 }
 
 
+static void RunEventsPico(unsigned int events, unsigned int keys)
+{
+	emu_RunEventsPico(events);
+
+	if (pico_inp_mode != 0)
+	{
+		PicoPad[0] &= ~0x0f; // release UDLR
+		if (keys & BTN_UP)   { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
+		if (keys & BTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
+		if (keys & BTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
+		if (keys & BTN_RIGHT) {
+			int lim = (Pico.video.reg[12]&1) ? 319 : 255;
+			pico_pen_x++;
+			if (pico_pen_x > lim-PICO_PEN_ADJUST_X)
+				pico_pen_x = lim-PICO_PEN_ADJUST_X;
+		}
+		PicoPicohw.pen_pos[0] = pico_pen_x;
+		if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;
+		PicoPicohw.pen_pos[0] += 0x3c;
+		PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
+	}
+}
+
 static void RunEvents(unsigned int which)
 {
 	if (which & 0x1800) // save or load (but not both)
@@ -789,22 +866,15 @@ 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;
+	if ((events ^ prevEvents) & 0x40) {
+		emu_changeFastForward(events & 0x40);
+		reset_timing = 1;
 	}
 
 	events &= ~prevEvents;
+
+	if (PicoAHW == PAHW_PICO)
+		RunEventsPico(events, keys);
 	if (events) RunEvents(events);
 	if (movie_data) emu_updateMovie();
 
@@ -827,9 +897,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");
@@ -855,7 +926,7 @@ void emu_Loop(void)
 	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...
@@ -874,6 +945,10 @@ void emu_Loop(void)
 	}
 
 	sceDisplayWaitVblankStart();
+	pframes_shown = pframes_done =
+	 frames_shown =  frames_done = 0;
+
+	tval_fpsc = sceKernelGetSystemTimeLow();
 
 	// loop?
 	while (engineState == PGS_Running)
@@ -881,11 +956,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?
@@ -911,37 +986,41 @@ 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++;
+				SkipFrame(); pframes_done++; frames_done++;
 				if (!(currentConfig.EmuOpt&0x40000)) { // do framelimitting if needed
 					int tval_diff;
 					tval = sceKernelGetSystemTimeLow();
@@ -957,7 +1036,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)) {
@@ -965,7 +1044,7 @@ void emu_Loop(void)
 					continue;
 				}
 				updateKeys();
-				SkipFrame(); frames_done++;
+				SkipFrame(); pframes_done++; frames_done++;
 				continue;
 			}
 		}
@@ -985,8 +1064,9 @@ 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 (!(currentConfig.EmuOpt&0x40000) || currentConfig.Frameskip < 0)
 		{
 			// sleep if we are still too fast
@@ -997,11 +1077,14 @@ void emu_Loop(void)
 			}
 		}
 
-		frames_done++; frames_shown++;
+		pframes_done++; pframes_shown++;
+		 frames_done++;  frames_shown++;
 	}
 
 
-	if (PicoMCD & 1) PicoCDBufferFree();
+	emu_changeFastForward(0);
+
+	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
 	if (PsndOut != NULL) {
 		PsndOut = NULL;
@@ -1022,13 +1105,13 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-	PicoReset(0);
+	PicoReset();
 	reset_timing = 1;
 }
 
 void emu_HandleResume(void)
 {
-	if (!(PicoMCD & 1)) return;
+	if (!(PicoAHW & PAHW_MCD)) return;
 
 	// reopen files..
 	if (Pico_mcd->TOC.Tracks[0].F != NULL)