X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2Femu.c;h=af3474a6e623afc092a909575cfe4f3f7124fa3d;hb=a4bd56c62dec6b85df7111e99db3ade4334ea97d;hp=0425075020d35e44d8dfdc4fddd4da780c673cb8;hpb=ee0f881e9f135db6ed9337b99f611b3cae955f8c;p=libpicofe.git

diff --git a/pandora/emu.c b/pandora/emu.c
index 0425075..af3474a 100644
--- a/pandora/emu.c
+++ b/pandora/emu.c
@@ -34,7 +34,6 @@
 
 
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
-static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
 static int osd_fps_x;
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 
@@ -43,17 +42,6 @@ unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 static int pico_pen_x = 0, pico_pen_y = 240/2;
 
 
-void plat_status_msg(const char *format, ...)
-{
-	va_list vl;
-
-	va_start(vl, format);
-	vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);
-	va_end(vl);
-
-	gettimeofday(&noticeMsgTime, 0);
-}
-
 int plat_get_root_dir(char *dst, int len)
 {
 	extern char **g_argv;
@@ -134,7 +122,7 @@ static void osd_text(int x, int y, const char *text)
 			p = (int *) ((unsigned char *) g_screen_ptr+x+g_screen_width*(y+h));
 			for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
 		}
-		emu_textOut8(x, y, text);
+		emu_text_out8(x, y, text);
 	} else {
 		int *p, i, h;
 		x &= ~1; // align x
@@ -143,7 +131,7 @@ static void osd_text(int x, int y, const char *text)
 			p = (int *) ((unsigned short *) g_screen_ptr+x+g_screen_width*(y+h));
 			for (i = len; i; i--, p++) *p = 0;//(*p>>2)&0x39e7;
 		}
-		textOut16(x, y, text);
+		text_out16(x, y, text);
 	}
 }
 
@@ -198,7 +186,6 @@ static void draw_pico_ptr(void)
 
 static int EmuScanBegin16(unsigned int num)
 {
-	if (!(Pico.video.reg[1]&8)) num += 8;
 	DrawLineDest = (unsigned short *)g_screen_ptr + num*800 + 800/2 - 320/2;
 	//int w = (Pico.video.reg[12]&1) ? 320 : 256;
 	//DrawLineDest = (unsigned short *)g_screen_ptr + num*w;
@@ -216,7 +203,6 @@ static int EmuScanEnd16(unsigned int num)
 	int sh = Pico.video.reg[0xC]&8;
 	int len, mask = 0xff;
 
-	if (!(Pico.video.reg[1]&8)) num += 8;
 	pd=(unsigned short *)g_screen_ptr + num*800*2 + 800/2 - 320*2/2;
 
 	if (Pico.m.dirtyPal)
@@ -267,7 +253,7 @@ static void blit(const char *fps, const char *notice)
 			// gp2x_video_setpalette(localPal, 0x40);
 		}
 		// a hack for VR
-		if (PicoRead16Hook == PicoSVPRead16)
+		if (PicoAHW & PAHW_SVP)
 			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
 		// do actual copy
 		vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);