X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpandora%2Fplat.c;h=9cd5fc5b5a5dec02ae8274fbac1a0bb0472df91e;hb=9db6a54485501b56b0f2f5db4d093c38fe495bda;hp=f82d70271e3dade4070669d6c3dd71e2251175f7;hpb=4e3551a5f617a424143aca227a2ce89cfb7d8640;p=picodrive.git

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index f82d702..9cd5fc5 100644
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -74,6 +74,7 @@ static struct in_default_bind in_evdev_defbinds[] =
 	{ KEY_S,	IN_BINDTYPE_PLAYER12, GBTN_B },
 	{ KEY_D,	IN_BINDTYPE_PLAYER12, GBTN_C },
 	{ KEY_ENTER,	IN_BINDTYPE_PLAYER12, GBTN_START },
+	{ KEY_R,	IN_BINDTYPE_EMU, PEVB_RESET },
 	{ KEY_F,	IN_BINDTYPE_EMU, PEVB_FF },
 	{ KEY_BACKSPACE,IN_BINDTYPE_EMU, PEVB_FF },
 	{ KEY_BACKSLASH,IN_BINDTYPE_EMU, PEVB_MENU },
@@ -135,24 +136,6 @@ void pemu_validate_config(void)
 	currentConfig.CPUclock = plat_target_cpu_clock_get();
 }
 
-static void osd_text(int x, int y, const char *text)
-{
-	int len = strlen(text)*8;
-	int i, h;
-
-	len++;
-	if (x + len > g_screen_width)
-		len = g_screen_width - x;
-
-	for (h = 0; h < 8; h++) {
-		unsigned short *p;
-		p = (unsigned short *)g_screen_ptr + x + g_screen_width*(y + h);
-		for (i = len; i > 0; i--, p++)
-			*p = (*p>>2) & 0x39e7;
-	}
-	emu_text_out16(x, y, text);
-}
-
 static void draw_cd_leds(void)
 {
 	int old_reg;
@@ -182,9 +165,9 @@ static void draw_cd_leds(void)
 void pemu_finalize_frame(const char *fps, const char *notice)
 {
 	if (notice && notice[0])
-		osd_text(2, g_osd_y, notice);
+		emu_osd_text16(2, g_osd_y, notice);
 	if (fps && fps[0] && (currentConfig.EmuOpt & EOPT_SHOW_FPS))
-		osd_text(g_osd_fps_x, g_osd_y, fps);
+		emu_osd_text16(g_osd_fps_x, g_osd_y, fps);
 	if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
 		draw_cd_leds();
 }