X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=5eca7896ab4e1b4b32f9f11eb4d5554bf373c419;hb=199bec61013575bcc73c75fd8338bd44d82bf65f;hp=929c608d287e3bec6915c9d1a4de0ac328dc24f5;hpb=b79118011b8b1ac835efed1ac5a9ce3bdc55c158;p=libpicofe.git

diff --git a/psp/emu.c b/psp/emu.c
index 929c608..5eca789 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;
@@ -274,8 +261,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;
 
@@ -284,8 +269,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);
@@ -610,7 +593,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;
@@ -782,9 +765,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,7 +778,7 @@ 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_status_msg("SAVE SLOT %i [%s]", state_slot,
 			emu_check_save_file(state_slot) ? "USED" : "FREE");
 	}
 }