X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=e0e1ca1aca7eaba67bac57c78d35c44a691636b5;hb=b5bfb86438216d502f1f9ed14b923d3b0107c07d;hp=9e299eacf8ab3d4de61ba5de15a1f31d8695256f;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git

diff --git a/psp/emu.c b/psp/emu.c
index 9e299ea..e0e1ca1 100644
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -36,8 +36,6 @@ int sceAudioOutput2GetRestSample();
 unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
 int engineStateSuspend;
 
-static unsigned int noticeMsgTime = 0;
-
 #define PICO_PEN_ADJUST_X 4
 #define PICO_PEN_ADJUST_Y 2
 static int pico_pen_x = 320/2, pico_pen_y = 240/2;
@@ -47,17 +45,6 @@ static void sound_deinit(void);
 static void blit2(const char *fps, const char *notice, int lagging_behind);
 static void clearArea(int full);
 
-void plat_status_msg(const char *format, ...)
-{
-	va_list vl;
-
-	va_start(vl, format);
-	vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);
-	va_end(vl);
-
-	noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
 int plat_get_root_dir(char *dst, int len)
 {
 	if (len > 0) *dst = 0;
@@ -76,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;
 }
 
@@ -409,7 +396,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
 
@@ -610,7 +597,7 @@ void pemu_sound_start(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);
-		plat_status_msg("sound init failed (%i), snd disabled", ret);
+		emu_status_msg("sound init failed (%i), snd disabled", ret);
 		currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
 	} else {
 		PicoWriteSound = writeSound;
@@ -748,7 +735,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
 		{
@@ -767,7 +754,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);
 		}
@@ -782,9 +769,9 @@ static void RunEvents(unsigned int which)
 		vidResetMode();
 
 		if (PicoOpt & POPT_ALT_RENDERER)
-			plat_status_msg("fast renderer");
+			emu_status_msg("fast renderer");
 		else if (currentConfig.EmuOpt&0x80)
-			plat_status_msg("accurate renderer");
+			emu_status_msg("accurate renderer");
 	}
 	if (which & 0x0300)
 	{
@@ -795,8 +782,8 @@ static void RunEvents(unsigned int which)
 			state_slot += 1;
 			if(state_slot > 9) state_slot = 0;
 		}
-		plat_status_msg("SAVE SLOT %i [%s]", state_slot,
-			emu_checkSaveFile(state_slot) ? "USED" : "FREE");
+		emu_status_msg("SAVE SLOT %i [%s]", state_slot,
+			emu_check_save_file(state_slot) ? "USED" : "FREE");
 	}
 }
 
@@ -825,7 +812,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;
 	}
 
@@ -1039,7 +1026,7 @@ void pemu_loop(void)
 	}
 
 
-	emu_changeFastForward(0);
+	emu_set_fastforward(0);
 
 	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
@@ -1051,7 +1038,7 @@ void pemu_loop(void)
 	// 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;
 	}