X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Femu.c;h=8f77f395a3c33c3fb5e1934857fb32f4a3d0fb52;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=500f219edcccad65653adc6ca7837ea53697c0ed;hpb=9025b93159042e856af2fb1a1e7e5017f9fee99c;p=picodrive.git

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 500f219..8f77f39 100644
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -1,7 +1,10 @@
-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2007,2008
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -33,12 +36,9 @@ int sceAudio_E0727056(int volume, void *buffer);	// blocking output
 int sceAudioOutput2GetRestSample();
 
 
-unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
+//unsigned char *Draw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
 int engineStateSuspend;
 
-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;
@@ -48,12 +48,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;
@@ -71,7 +66,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;
 }
 
@@ -84,54 +79,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;
@@ -152,7 +114,6 @@ void emu_prepareDefaultConfig(void)
 	defaultConfig.scale = 1.20;    // fullscreen
 	defaultConfig.hscale40 = 1.25;
 	defaultConfig.hscale32 = 1.56;
-	defaultConfig.turbo_rate = 15;
 }
 
 
@@ -262,9 +223,9 @@ static void do_pal_update(int allow_sh, int allow_as)
 		localPal[0xe0] = 0;
 		localPal[0xf0] = 0x001f;
 	}
-	else if (allow_as && (rendstatus & PDRAW_SPR_LO_ON_HI))
+	else if (allow_as && (Pico.est.rendstatus & PDRAW_SPR_LO_ON_HI))
 	{
-		memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
+		memcpy(dpal + 0x80/2, localPal, 0x40*2);
 	}
 }
 
@@ -281,33 +242,29 @@ static void do_slowmode_lines(int line_to)
 
 static void EmuScanPrepare(void)
 {
-	HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
-	if (!(Pico.video.reg[1]&8)) HighCol += 8*512;
+	Pico.est.HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
+	if (!(Pico.video.reg[1]&8)) Pico.est.HighCol += 8*512;
 
 	if (dynamic_palette > 0)
 		dynamic_palette--;
 
 	if (Pico.m.dirtyPal)
 		do_pal_update(1, 1);
-	if ((rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
+	if ((Pico.est.rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
 	     amips_clut_f = amips_clut_6bit;
 	else amips_clut_f = amips_clut;
 }
 
 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;
+		Pico.est.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;
-
 	if (Pico.m.dirtyPal) {
 		if (!dynamic_palette) {
 			do_slowmode_lines(num);
@@ -319,7 +276,7 @@ static int EmuScanSlowEnd(unsigned int num)
 	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_f(dst, HighCol + 8, localPal, line_len);
+		amips_clut_f(dst, Pico.est.HighCol + 8, localPal, line_len);
 	}
 
 	return 0;
@@ -352,7 +309,7 @@ static void blitscreen_clut(void)
 			blit_16bit_mode = 0;
 		}
 
-		if ((PicoOpt&0x10) && Pico.m.dirtyPal)
+		if ((PicoIn.opt&0x10) && Pico.m.dirtyPal)
 			do_pal_update(0, 0);
 
 		sceKernelDcacheWritebackAll();
@@ -431,25 +388,25 @@ 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
 
 /* called after rendering is done, but frame emulation is not finished */
 void blit1(void)
 {
-	if (PicoOpt&0x10)
+	if (PicoIn.opt&0x10)
 	{
 		int i;
 		unsigned char *pd;
 		// clear top and bottom trash
-		for (pd = PicoDraw2FB+8, i = 8; i > 0; i--, pd += 512)
+		for (pd = Pico.est.Draw2FB+8, i = 8; i > 0; i--, pd += 512)
 			memset32((int *)pd, 0xe0e0e0e0, 320/4);
-		for (pd = PicoDraw2FB+512*232+8, i = 8; i > 0; i--, pd += 512)
+		for (pd = Pico.est.Draw2FB+512*232+8, i = 8; i > 0; i--, pd += 512)
 			memset32((int *)pd, 0xe0e0e0e0, 320/4);
 	}
 
-	if (PicoAHW & PAHW_PICO)
+	if (PicoIn.AHW & PAHW_PICO)
 		draw_pico_ptr();
 
 	blitscreen_clut();
@@ -467,7 +424,7 @@ static void blit2(const char *fps, const char *notice, int lagging_behind)
 
 	//dbg_text();
 
-	if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+	if ((emu_opt & 0x400) && (PicoIn.AHW & PAHW_MCD))
 		cd_leds();
 
 	if (currentConfig.EmuOpt & 0x2000) { // want vsync
@@ -511,9 +468,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;
@@ -525,7 +481,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");
 }
@@ -608,17 +564,17 @@ static void sound_init(void)
 		lprintf("sceKernelCreateThread failed: %i\n", thid);
 }
 
-void emu_startSound(void)
+void pemu_sound_start(void)
 {
 	static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
 	int ret, stereo;
 
 	samples_made = samples_done = 0;
 
-	if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+	if (PsndRate != PsndRate_old || (PicoIn.opt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
 		PsndRerate(Pico.m.frame_count ? 1 : 0);
 	}
-	stereo=(PicoOpt&8)>>3;
+	stereo=(PicoIn.opt&8)>>3;
 
 	samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
 	if (PsndRate <= 22050) samples_block /= 2;
@@ -632,9 +588,8 @@ void emu_startSound(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);
@@ -642,12 +597,12 @@ void emu_startSound(void)
 		samples_made = samples_block; // send 1 empty block first..
 		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
-		PicoOpt_old  = PicoOpt;
+		PicoOpt_old  = PicoIn.opt;
 		pal_old = Pico.m.pal;
 	}
 }
 
-void emu_endSound(void)
+void pemu_sound_stop(void)
 {
 	int i;
 	if (samples_done == 0)
@@ -667,7 +622,7 @@ void emu_endSound(void)
 }
 
 /* wait until we can write more sound */
-void emu_waitSound(void)
+void pemu_sound_wait(void)
 {
 	// TODO: test this
 	while (!sound_thread_exit && samples_made - samples_done > samples_block * 4)
@@ -685,9 +640,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];
@@ -699,7 +653,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);
@@ -710,18 +664,20 @@ static void writeSound(int len)
 
 static void SkipFrame(void)
 {
-	PicoSkipFrame=1;
+	PicoIn.skipFrame=1;
 	PicoFrame();
-	PicoSkipFrame=0;
+	PicoIn.skipFrame=0;
 }
 
-void emu_forcedFrame(int opts)
+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 |= opts|POPT_ACC_SPRITES;
+	PicoIn.opt &= ~POPT_ALT_RENDERER;
+	PicoIn.opt |= POPT_ACC_SPRITES;
+	if (!no_scale)
+		PicoIn.opt |= POPT_EN_SOFTSCALE;
 	currentConfig.EmuOpt |= 0x80;
 
 	vidResetMode();
@@ -729,15 +685,14 @@ 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();
 	sceGuSync(0,0);
 
-	PicoOpt = po_old;
+	PicoIn.opt = po_old;
 	currentConfig.EmuOpt = eo_old;
 }
 
@@ -748,7 +703,7 @@ static void RunEventsPico(unsigned int events, unsigned int keys)
 
 	if (pico_inp_mode != 0)
 	{
-		PicoPad[0] &= ~0x0f; // release UDLR
+		PicoIn.pad[0] &= ~0x0f; // release UDLR
 		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; }
@@ -771,7 +726,7 @@ 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
 		{
@@ -790,7 +745,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);
 		}
@@ -799,17 +754,15 @@ static void RunEvents(unsigned int which)
 	}
 	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)
-			strcpy(noticeMsg, "fast renderer");
+		if (PicoIn.opt & 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)
 	{
@@ -820,8 +773,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");
 	}
 }
 
@@ -831,7 +784,7 @@ static void updateKeys(void)
 	static unsigned int prevEvents = 0;
 	int i;
 
-	/* FIXME: port to input fw */
+	/* FIXME: port to input fw, merge with emu.c:emu_update_input() */
 	keys = psp_pad_read(0);
 	if (keys & PSP_CTRL_HOME)
 		sceDisplayWaitVblankStart();
@@ -841,22 +794,22 @@ 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;
 
 	if ((events ^ prevEvents) & 0x40) {
-		emu_changeFastForward(events & 0x40);
+		emu_set_fastforward(events & 0x40);
 		reset_timing = 1;
 	}
 
 	events &= ~prevEvents;
 
-	if (PicoAHW == PAHW_PICO)
+	if (PicoIn.AHW == PAHW_PICO)
 		RunEventsPico(events, keys);
 	if (events) RunEvents(events);
 	if (movie_data) emu_updateMovie();
@@ -876,7 +829,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
@@ -908,7 +861,7 @@ void emu_Loop(void)
 	target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
 	reset_timing = 1;
 
-	if (PicoAHW & PAHW_MCD) {
+	if (PicoIn.AHW & PAHW_MCD) {
 		// prepare CD buffer
 		PicoCDBufferInit();
 		// mp3...
@@ -921,9 +874,9 @@ void emu_Loop(void)
 
 	// prepare sound stuff
 	PsndOut = NULL;
-	if (currentConfig.EmuOpt & 4)
+	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
 	{
-		emu_startSound();
+		pemu_sound_start();
 	}
 
 	sceDisplayWaitVblankStart();
@@ -1033,7 +986,7 @@ void emu_Loop(void)
 
 		updateKeys();
 
-		if (!(PicoOpt&0x10))
+		if (!(PicoIn.opt&0x10))
 			EmuScanPrepare();
 
 		PicoFrame();
@@ -1064,19 +1017,19 @@ void emu_Loop(void)
 	}
 
 
-	emu_changeFastForward(0);
+	emu_set_fastforward(0);
 
-	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+	if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree();
 
 	if (PsndOut != NULL) {
-		emu_endSound();
+		pemu_sound_stop();
 		PsndOut = NULL;
 	}
 
 	// 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;
 	}
 
@@ -1084,16 +1037,9 @@ 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;
+	if (!(PicoIn.AHW & PAHW_MCD)) return;
 
 	// reopen first CD track
 	if (Pico_mcd->TOC.Tracks[0].F != NULL)