X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=feab5f56e5939a84eba20101cfcd4376465ca2c6;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=91bd5634f3d47532487f264f75fea5d9b42e289b;hpb=f11bad75edc8966e9f84b040163cc86e830c46c6;p=libpicofe.git

diff --git a/psp/emu.c b/psp/emu.c
index 91bd563..feab5f5 100644
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -33,12 +33,8 @@ int sceAudio_E0727056(int volume, void *buffer);	// blocking output
 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 = PGS_Menu, engineStateSuspend;
-
-static unsigned int noticeMsgTime = 0;
-int reset_timing = 0; // do we need this?
+int engineStateSuspend;
 
 #define PICO_PEN_ADJUST_X 4
 #define PICO_PEN_ADJUST_Y 2
@@ -49,12 +45,7 @@ static void sound_deinit(void);
 static void blit2(const char *fps, const char *notice, int lagging_behind);
 static void clearArea(int full);
 
-void emu_noticeMsgUpdated(void)
-{
-	noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
-int emu_getMainDir(char *dst, int len)
+int plat_get_root_dir(char *dst, int len)
 {
 	if (len > 0) *dst = 0;
 	return 0;
@@ -72,7 +63,7 @@ static void osd_text(int x, const char *text, int is_active, int clear_all)
 		memset32_uncached(p, 0, len);
 	}
 	if (is_active) { tmp = psp_screen; psp_screen = screen; } // nasty pointer tricks
-	emu_textOut16(x, 264, text);
+	emu_text_out16(x, 264, text);
 	if (is_active) psp_screen = tmp;
 }
 
@@ -85,54 +76,21 @@ void emu_msg_cb(const char *msg)
 	reset_timing = 1;
 }
 
-static void emu_msg_tray_open(void)
-{
-	strcpy(noticeMsg, "CD tray opened");
-	noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
-
+/* FIXME: move to plat */
 void emu_Init(void)
 {
-	// make dirs for saves, cfgs, etc.
-	mkdir("mds", 0777);
-	mkdir("srm", 0777);
-	mkdir("brm", 0777);
-	mkdir("cfg", 0777);
-
 	sound_init();
-
-	PicoInit();
-	PicoMessage = emu_msg_cb;
-	PicoMCDopenTray = emu_msg_tray_open;
-	PicoMCDcloseTray = menu_loop_tray;
 }
 
 void emu_Deinit(void)
 {
-	// save SRAM
-	if ((currentConfig.EmuOpt & 1) && SRam.changed) {
-		emu_SaveLoadGame(0, 1);
-		SRam.changed = 0;
-	}
-
-	if (!(currentConfig.EmuOpt & 0x20))
-		config_writelrom(PicoConfigFile);
-
-	PicoExit();
 	sound_deinit();
 }
 
-void emu_prepareDefaultConfig(void)
+void pemu_prep_defconfig(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;
@@ -153,7 +111,6 @@ void emu_prepareDefaultConfig(void)
 	defaultConfig.scale = 1.20;    // fullscreen
 	defaultConfig.hscale40 = 1.25;
 	defaultConfig.hscale32 = 1.56;
-	defaultConfig.turbo_rate = 15;
 }
 
 
@@ -297,8 +254,6 @@ static void EmuScanPrepare(void)
 
 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;
 
@@ -307,8 +262,6 @@ static int EmuScanSlowBegin(unsigned int num)
 
 static int EmuScanSlowEnd(unsigned int num)
 {
-	if (!(Pico.video.reg[1]&8)) num += 8;
-
 	if (Pico.m.dirtyPal) {
 		if (!dynamic_palette) {
 			do_slowmode_lines(num);
@@ -432,7 +385,7 @@ static void dbg_text(void)
 		p = (int *) ((int)p & ~3); // align
 		memset32_uncached(p, 0, len);
 	}
-	emu_textOut16(2, 256, text);
+	emu_text_out16(2, 256, text);
 }
 #endif
 
@@ -512,9 +465,8 @@ static void vidResetMode(void)
 	sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16);
 
 	// slow rend.
-	PicoDrawSetColorFormat(-1);
-	PicoScanBegin = EmuScanSlowBegin;
-	PicoScanEnd = EmuScanSlowEnd;
+	PicoDrawSetOutFormat(PDF_NONE, 0);
+	PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
 
 	localPal[0xe0] = 0;
 	localPal[0xf0] = 0x001f;
@@ -526,7 +478,7 @@ static void vidResetMode(void)
 	sceGuSync(0,0);
 }
 
-void emu_platformDebugCat(char *str)
+void plat_debug_cat(char *str)
 {
 	strcat(str, blit_16bit_mode ? "soft clut\n" : "hard clut\n");
 }
@@ -609,7 +561,7 @@ static void sound_init(void)
 		lprintf("sceKernelCreateThread failed: %i\n", thid);
 }
 
-static void sound_prepare(void)
+void pemu_sound_start(void)
 {
 	static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
 	int ret, stereo;
@@ -633,9 +585,8 @@ static void sound_prepare(void)
 	ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
 	if (ret < 0) {
 		lprintf("sceAudio_38553111() failed: %i\n", ret);
-		sprintf(noticeMsg, "sound init failed (%i), snd disabled", ret);
-		noticeMsgTime = sceKernelGetSystemTimeLow();
-		currentConfig.EmuOpt &= ~4;
+		emu_status_msg("sound init failed (%i), snd disabled", ret);
+		currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
 	} else {
 		PicoWriteSound = writeSound;
 		memset32((int *)(void *)sndBuffer, 0, sizeof(sndBuffer)/4);
@@ -648,7 +599,7 @@ static void sound_prepare(void)
 	}
 }
 
-static void sound_end(void)
+void pemu_sound_stop(void)
 {
 	int i;
 	if (samples_done == 0)
@@ -667,6 +618,14 @@ static void sound_end(void)
 	sceAudio_5C37C0AE();
 }
 
+/* wait until we can write more sound */
+void pemu_sound_wait(void)
+{
+	// TODO: test this
+	while (!sound_thread_exit && samples_made - samples_done > samples_block * 4)
+		psp_msleep(10);
+}
+
 static void sound_deinit(void)
 {
 	sound_thread_exit = 1;
@@ -678,9 +637,8 @@ static void sound_deinit(void)
 static void writeSound(int len)
 {
 	int ret;
-	if (PicoOpt&8) len<<=1;
 
-	PsndOut += len;
+	PsndOut += len / 2;
 	/*if (PsndOut > sndBuffer_endptr) {
 		memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
 		PsndOut = &sndBuffer[PsndOut - endptr];
@@ -692,7 +650,7 @@ static void writeSound(int len)
 		PsndOut = sndBuffer;
 
 	// signal the snd thread
-	samples_made += len;
+	samples_made += len / 2;
 	if (samples_made - samples_done > samples_block*2) {
 		// lprintf("signal, %i/%i\n", samples_done, samples_made);
 		ret = sceKernelSignalSema(sound_sem, 1);
@@ -708,13 +666,15 @@ static void SkipFrame(void)
 	PicoSkipFrame=0;
 }
 
-void emu_forcedFrame(int opts)
+void pemu_forced_frame(int no_scale, int do_emu)
 {
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
 
-	PicoOpt &= ~0x10;
-	PicoOpt |= opts|POPT_ACC_SPRITES;
+	PicoOpt &= ~POPT_ALT_RENDERER;
+	PicoOpt |= POPT_ACC_SPRITES;
+	if (!no_scale)
+		PicoOpt |= POPT_EN_SOFTSCALE;
 	currentConfig.EmuOpt |= 0x80;
 
 	vidResetMode();
@@ -722,9 +682,8 @@ void emu_forcedFrame(int opts)
 	memset32((int *)VRAM_CACHED_STUFF + 512*232/4, 0xe0e0e0e0, 512*8/4);
 	memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
 
-	PicoDrawSetColorFormat(-1);
-	PicoScanBegin = EmuScanSlowBegin;
-	PicoScanEnd = EmuScanSlowEnd;
+	PicoDrawSetOutFormat(PDF_NONE, 0);
+	PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
 	EmuScanPrepare();
 	PicoFrameDrawOnly();
 	blit1();
@@ -742,10 +701,10 @@ static void RunEventsPico(unsigned int events, unsigned int keys)
 	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) {
+		if (keys & PBTN_UP)   { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
+		if (keys & PBTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
+		if (keys & PBTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
+		if (keys & PBTN_RIGHT) {
 			int lim = (Pico.video.reg[12]&1) ? 319 : 255;
 			pico_pen_x++;
 			if (pico_pen_x > lim-PICO_PEN_ADJUST_X)
@@ -764,17 +723,17 @@ static void RunEvents(unsigned int which)
 	{
 		int do_it = 1;
 
-		if ( emu_checkSaveFile(state_slot) &&
+		if ( emu_check_save_file(state_slot) &&
 				(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
 				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
 		{
 			int keys;
 			sceGuSync(0,0);
 			blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)", 0);
-			while( !((keys = psp_pad_read(1)) & (BTN_X|BTN_CIRCLE)) )
+			while( !((keys = psp_pad_read(1)) & (PBTN_X|PBTN_CIRCLE)) )
 				psp_msleep(50);
-			if (keys & BTN_CIRCLE) do_it = 0;
-			while(  ((keys = psp_pad_read(1)) & (BTN_X|BTN_CIRCLE)) ) // wait for release
+			if (keys & PBTN_CIRCLE) do_it = 0;
+			while(  ((keys = psp_pad_read(1)) & (PBTN_X|PBTN_CIRCLE)) ) // wait for release
 				psp_msleep(50);
 			clearArea(0);
 		}
@@ -783,7 +742,7 @@ static void RunEvents(unsigned int which)
 		{
 			osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0);
 			PicoStateProgressCB = emu_msg_cb;
-			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+			emu_save_load_game((which & 0x1000) >> 12, 0);
 			PicoStateProgressCB = NULL;
 			psp_msleep(0);
 		}
@@ -797,12 +756,10 @@ static void RunEvents(unsigned int which)
 
 		vidResetMode();
 
-		if (PicoOpt&0x10)
-			strcpy(noticeMsg, "fast renderer");
+		if (PicoOpt & POPT_ALT_RENDERER)
+			emu_status_msg("fast renderer");
 		else if (currentConfig.EmuOpt&0x80)
-			strcpy(noticeMsg, "accurate renderer");
-
-		noticeMsgTime = sceKernelGetSystemTimeLow();
+			emu_status_msg("accurate renderer");
 	}
 	if (which & 0x0300)
 	{
@@ -813,8 +770,8 @@ static void RunEvents(unsigned int which)
 			state_slot += 1;
 			if(state_slot > 9) state_slot = 0;
 		}
-		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
-		noticeMsgTime = sceKernelGetSystemTimeLow();
+		emu_status_msg("SAVE SLOT %i [%s]", state_slot,
+			emu_check_save_file(state_slot) ? "USED" : "FREE");
 	}
 }
 
@@ -824,43 +781,16 @@ static void updateKeys(void)
 	static unsigned int prevEvents = 0;
 	int i;
 
+	/* FIXME: port to input fw, merge with emu.c:emu_update_input() */
 	keys = psp_pad_read(0);
 	if (keys & PSP_CTRL_HOME)
 		sceDisplayWaitVblankStart();
 
-	if (keys & BTN_SELECT)
+	if (keys & PBTN_SELECT)
 		engineState = PGS_Menu;
 
 	keys &= CONFIGURABLE_KEYS;
 
-	for (i = 0; i < 32; i++)
-	{
-		if (keys & (1 << i))
-		{
-			int pl, acts = currentConfig.KeyBinds[i];
-			if (!acts) continue;
-			pl = (acts >> 16) & 1;
-			if (kb_combo_keys & (1 << i))
-			{
-				int u = i+1, acts_c = acts & kb_combo_acts;
-				// let's try to find the other one
-				if (acts_c) {
-					for (; u < 32; u++)
-						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 & ~kb_combo_acts;
-			} else {
-				allActions[pl] |= acts;
-			}
-		}
-	}
-
 	PicoPad[0] = allActions[0] & 0xfff;
 	PicoPad[1] = allActions[1] & 0xfff;
 
@@ -870,7 +800,7 @@ static void updateKeys(void)
 	events = (allActions[0] | allActions[1]) >> 16;
 
 	if ((events ^ prevEvents) & 0x40) {
-		emu_changeFastForward(events & 0x40);
+		emu_set_fastforward(events & 0x40);
 		reset_timing = 1;
 	}
 
@@ -896,7 +826,7 @@ static void simpleWait(unsigned int until)
 		sceKernelDelayThread(diff);
 }
 
-void emu_Loop(void)
+void pemu_loop(void)
 {
 	static int mp3_init_done = 0;
 	char fpsbuff[24]; // fps count c string
@@ -922,7 +852,6 @@ void emu_Loop(void)
 	clearArea(1);
 	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-	emu_findKeyBindCombos();
 
 	// pal/ntsc might have changed, reset related stuff
 	target_fps = Pico.m.pal ? 50 : 60;
@@ -942,9 +871,9 @@ void emu_Loop(void)
 
 	// prepare sound stuff
 	PsndOut = NULL;
-	if (currentConfig.EmuOpt & 4)
+	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
 	{
-		sound_prepare();
+		pemu_sound_start();
 	}
 
 	sceDisplayWaitVblankStart();
@@ -1085,19 +1014,19 @@ void emu_Loop(void)
 	}
 
 
-	emu_changeFastForward(0);
+	emu_set_fastforward(0);
 
 	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
 	if (PsndOut != NULL) {
+		pemu_sound_stop();
 		PsndOut = NULL;
-		sound_end();
 	}
 
 	// save SRAM
 	if ((currentConfig.EmuOpt & 1) && SRam.changed) {
 		emu_msg_cb("Writing SRAM/BRAM..");
-		emu_SaveLoadGame(0, 1);
+		emu_save_load_game(0, 1);
 		SRam.changed = 0;
 	}
 
@@ -1105,13 +1034,6 @@ void emu_Loop(void)
 	memset32_uncached((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4);
 }
 
-
-void emu_ResetGame(void)
-{
-	PicoReset();
-	reset_timing = 1;
-}
-
 void emu_HandleResume(void)
 {
 	if (!(PicoAHW & PAHW_MCD)) return;
@@ -1119,13 +1041,13 @@ void emu_HandleResume(void)
 	// reopen first CD track
 	if (Pico_mcd->TOC.Tracks[0].F != NULL)
 	{
-		char *fname = romFileName;
-		int len = strlen(romFileName);
+		char *fname = rom_fname_reload;
+		int len = strlen(rom_fname_reload);
 		cue_data_t *cue_data = NULL;
 
 		if (len > 4 && strcasecmp(fname + len - 4,  ".cue") == 0)
 		{
-			cue_data = cue_parse(romFileName);
+			cue_data = cue_parse(rom_fname_reload);
 			if (cue_data != NULL)
 				fname = cue_data->tracks[1].fname;
 		}