X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flinux%2Femu.c;h=ddde8dab35fda230ec3e0e74a83de884b1f1c7aa;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=b99c4a6e9989d53b0d9b4789f8a4c1bd7bbc8307;hpb=41946d7023cded9999495eb8916eeb5ab0480a1f;p=picodrive.git

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index b99c4a6..ddde8da 100644
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -29,44 +29,9 @@ void pemu_prep_defconfig(void)
 
 void pemu_validate_config(void)
 {
-	extern int PicoOpt;
-//	PicoOpt &= ~POPT_EXT_FM;
-	PicoOpt &= ~POPT_EN_SVP_DRC;
-}
-
-// FIXME: dupes from GP2X, need cleanup
-static void (*osd_text)(int x, int y, const char *text);
-
-/*
-static void osd_text8(int x, int y, const char *text)
-{
-	int len = strlen(text)*8;
-	int *p, i, h, offs;
-
-	len = (len+3) >> 2;
-	for (h = 0; h < 8; h++) {
-		offs = (x + g_screen_width * (y+h)) & ~3;
-		p = (int *) ((char *)g_screen_ptr + offs);
-		for (i = len; i; i--, p++)
-			*p = 0xe0e0e0e0;
-	}
-	emu_text_out8(x, y, text);
-}
-*/
-
-static void osd_text16(int x, int y, const char *text)
-{
-	int len = strlen(text)*8;
-	int *p, i, h, offs;
-
-	len = (len+1) >> 1;
-	for (h = 0; h < 8; h++) {
-		offs = (x + g_screen_width * (y+h)) & ~1;
-		p = (int *) ((short *)g_screen_ptr + offs);
-		for (i = len; i; i--, p++)
-			*p = (*p >> 2) & 0x39e7;
-	}
-	emu_text_out16(x, y, text);
+#ifndef __arm__
+	PicoIn.opt &= ~POPT_EN_DRC;
+#endif
 }
 
 static void draw_cd_leds(void)
@@ -101,10 +66,10 @@ static void draw_cd_leds(void)
 
 void pemu_finalize_frame(const char *fps, const char *notice)
 {
-	if (currentConfig.renderer != RT_16BIT && !(PicoAHW & PAHW_32X)) {
+	if (currentConfig.renderer != RT_16BIT && !(PicoIn.AHW & PAHW_32X)) {
 		unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;
-		unsigned char *ps = PicoDraw2FB + 328*8 + 8;
-		unsigned short *pal = HighPal;
+		unsigned char *ps = Pico.est.Draw2FB + 328*8 + 8;
+		unsigned short *pal = Pico.est.HighPal;
 		int i, x;
 		if (Pico.m.dirtyPal)
 			PicoDrawUpdateHighPal();
@@ -115,11 +80,11 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 
 	if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {
 		if (notice)
-			osd_text(4, g_screen_height - 8, notice);
+			emu_osd_text16(4, g_screen_height - 8, notice);
 		if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
-			osd_text(g_screen_width - 60, g_screen_height - 8, fps);
+			emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);
 	}
-	if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
+	if ((PicoIn.AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
 		draw_cd_leds();
 }
 
@@ -127,22 +92,22 @@ static void apply_renderer(void)
 {
 	switch (currentConfig.renderer) {
 	case RT_16BIT:
-		PicoOpt &= ~POPT_ALT_RENDERER;
+		PicoIn.opt &= ~POPT_ALT_RENDERER;
 		PicoDrawSetOutFormat(PDF_RGB555, 0);
 		PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
 		break;
 	case RT_8BIT_ACC:
-		PicoOpt &= ~POPT_ALT_RENDERER;
+		PicoIn.opt &= ~POPT_ALT_RENDERER;
 		PicoDrawSetOutFormat(PDF_8BIT, 0);
-		PicoDrawSetOutBuf(PicoDraw2FB + 8, 328);
+		PicoDrawSetOutBuf(Pico.est.Draw2FB + 8, 328);
 		break;
 	case RT_8BIT_FAST:
-		PicoOpt |=  POPT_ALT_RENDERER;
+		PicoIn.opt |=  POPT_ALT_RENDERER;
 		PicoDrawSetOutFormat(PDF_NONE, 0);
 		break;
 	}
 
-	if (PicoAHW & PAHW_32X)
+	if (PicoIn.AHW & PAHW_32X)
 		PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
 }
 
@@ -215,7 +180,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 void pemu_loop_prep(void)
 {
 	apply_renderer();
-	osd_text = osd_text16;
 }
 
 void pemu_loop_end(void)
@@ -237,3 +201,7 @@ void plat_wait_till_us(unsigned int us_to)
 	}
 }
 
+void *plat_mem_get_for_drc(size_t size)
+{
+	return NULL;
+}