X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpandora%2Femu.c;h=bb4b30a94811f3533461f6d68b8d2a0265db558f;hb=f2cf84723f891a6aa8cb39f74a0961013dc10601;hp=673c96388714f4e32c3792c1989a7cd0c4cc18b5;hpb=e2de9939cd42db1810cb523eda4bc9186d7b4ddf;p=picodrive.git

diff --git a/platform/pandora/emu.c b/platform/pandora/emu.c
index 673c963..bb4b30a 100644
--- a/platform/pandora/emu.c
+++ b/platform/pandora/emu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006-2008 notaz, All rights reserved.
+// (c) Copyright 2006-2009 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -6,22 +6,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <linux/limits.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #include <stdarg.h>
 
-#include "../gp2x/emu.h"
-#include "../gp2x/menu.h"
-#include "../gp2x/gp2x.h"
 #include "../common/arm_utils.h"
 #include "../common/fonts.h"
 #include "../common/emu.h"
+#include "../common/menu.h"
 #include "../common/config.h"
-#include "../common/common.h"
 #include "../common/input.h"
 #include "../linux/sndout_oss.h"
 #include "asm_utils.h"
@@ -42,28 +33,28 @@
 #endif
 
 
-int select_exits = 0;
-
 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
-int reset_timing = 0;
 
 #define PICO_PEN_ADJUST_X 4
 #define PICO_PEN_ADJUST_Y 2
 static int pico_pen_x = 0, pico_pen_y = 240/2;
 
-static void emu_msg_cb(const char *msg);
-static void emu_msg_tray_open(void);
 
-
-void emu_noticeMsgUpdated(void)
+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 emu_getMainDir(char *dst, int len)
+int plat_get_root_dir(char *dst, int len)
 {
 	extern char **g_argv;
 	int j;
@@ -78,49 +69,7 @@ int emu_getMainDir(char *dst, int len)
 	return j + 1;
 }
 
-void emu_Init(void)
-{
-	// make temp buffer for alt renderer
-	PicoDraw2FB = malloc((8+320)*(8+240+8));
-	if (!PicoDraw2FB)
-	{
-		printf("PicoDraw2FB == 0\n");
-	}
-
-	// make dirs for saves, cfgs, etc.
-	mkdir("mds", 0777);
-	mkdir("srm", 0777);
-	mkdir("brm", 0777);
-	mkdir("cfg", 0777);
-
-	PicoInit();
-	PicoMessage = emu_msg_cb;
-	PicoMCDopenTray = emu_msg_tray_open;
-	PicoMCDcloseTray = menu_loop_tray;
-}
-
-
-void emu_Deinit(void)
-{
-	// save SRAM
-	if((currentConfig.EmuOpt & 1) && SRam.changed) {
-		emu_SaveLoadGame(0, 1);
-		SRam.changed = 0;
-	}
-
-	if (!(currentConfig.EmuOpt & 0x20)) {
-		config_writelrom(PicoConfigFile);
-#ifndef NO_SYNC
-		sync();
-#endif
-	}
-
-	free(PicoDraw2FB);
-
-	PicoExit();
-}
-
-void emu_prepareDefaultConfig(void)
+void pemu_prep_defconfig(void)
 {
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
 	defaultConfig.EmuOpt    = 0x8f | 0x00600; // | <- confirm_save, cd_leds
@@ -173,7 +122,7 @@ static void textOut16(int x, int y, const char *text)
 }
 
 
-void osd_text(int x, int y, const char *text)
+static void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 
@@ -182,7 +131,7 @@ void osd_text(int x, int y, const char *text)
 		x &= ~3; // align x
 		len = (len+3) >> 2;
 		for (h = 0; h < 8; h++) {
-			p = (int *) ((unsigned char *) gp2x_screen+x+g_screen_width*(y+h));
+			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);
@@ -191,7 +140,7 @@ void osd_text(int x, int y, const char *text)
 		x &= ~1; // align x
 		len++;
 		for (h = 0; h < 16; h++) {
-			p = (int *) ((unsigned short *) gp2x_screen+x+g_screen_width*(y+h));
+			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);
@@ -209,15 +158,15 @@ static void draw_cd_leds(void)
 		// 8-bit modes
 		unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
 		unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
-		*(unsigned int *)((char *)gp2x_screen + g_screen_width*2+ 4) =
-		*(unsigned int *)((char *)gp2x_screen + g_screen_width*3+ 4) =
-		*(unsigned int *)((char *)gp2x_screen + g_screen_width*4+ 4) = col_g;
-		*(unsigned int *)((char *)gp2x_screen + g_screen_width*2+12) =
-		*(unsigned int *)((char *)gp2x_screen + g_screen_width*3+12) =
-		*(unsigned int *)((char *)gp2x_screen + g_screen_width*4+12) = col_r;
+		*(unsigned int *)((char *)g_screen_ptr + g_screen_width*2+ 4) =
+		*(unsigned int *)((char *)g_screen_ptr + g_screen_width*3+ 4) =
+		*(unsigned int *)((char *)g_screen_ptr + g_screen_width*4+ 4) = col_g;
+		*(unsigned int *)((char *)g_screen_ptr + g_screen_width*2+12) =
+		*(unsigned int *)((char *)g_screen_ptr + g_screen_width*3+12) =
+		*(unsigned int *)((char *)g_screen_ptr + g_screen_width*4+12) = col_r;
 	} else {
 		// 16-bit modes
-		unsigned int *p = (unsigned int *)((short *)gp2x_screen + g_screen_width*2+4);
+		unsigned int *p = (unsigned int *)((short *)g_screen_ptr + g_screen_width*2+4);
 		unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;
 		unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;
 		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += g_screen_width/2 - 12/2;
@@ -228,7 +177,7 @@ static void draw_cd_leds(void)
 
 static void draw_pico_ptr(void)
 {
-	unsigned short *p = (unsigned short *)gp2x_screen;
+	unsigned short *p = (unsigned short *)g_screen_ptr;
 
 	// only if pen enabled and for 16bit modes
 	if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;
@@ -250,9 +199,9 @@ static void draw_pico_ptr(void)
 static int EmuScanBegin16(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned short *)gp2x_screen + num*800 + 800/2 - 320/2;
+	DrawLineDest = (unsigned short *)g_screen_ptr + num*800 + 800/2 - 320/2;
 	//int w = (Pico.video.reg[12]&1) ? 320 : 256;
-	//DrawLineDest = (unsigned short *)gp2x_screen + num*w;
+	//DrawLineDest = (unsigned short *)g_screen_ptr + num*w;
 
 	return 0;
 }
@@ -268,7 +217,7 @@ static int EmuScanEnd16(unsigned int num)
 	int len, mask = 0xff;
 
 	if (!(Pico.video.reg[1]&8)) num += 8;
-	pd=(unsigned short *)gp2x_screen + num*800*2 + 800/2 - 320*2/2;
+	pd=(unsigned short *)g_screen_ptr + num*800*2 + 800/2 - 320*2/2;
 
 	if (Pico.m.dirtyPal)
 		PicoDoHighPal555(sh);
@@ -301,14 +250,6 @@ static int EmuScanEnd16(unsigned int num)
 
 #endif // USE_320_SCREEN
 
-static int EmuScanBegin8(unsigned int num)
-{
-	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned char *)  gp2x_screen + g_screen_width * num;
-
-	return 0;
-}
-
 int localPal[0x100];
 static void (*vidCpyM2)(void *dest, void *src) = NULL;
 
@@ -323,13 +264,13 @@ static void blit(const char *fps, const char *notice)
 			Pico.m.dirtyPal = 0;
 			vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 			// feed new palette to our device
-			gp2x_video_setpalette(localPal, 0x40);
+			// gp2x_video_setpalette(localPal, 0x40);
 		}
 		// a hack for VR
 		if (PicoRead16Hook == PicoSVPRead16)
 			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
 		// do actual copy
-		vidCpyM2((unsigned char *)gp2x_screen+g_screen_width*8, PicoDraw2FB+328*8);
+		vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);
 	}
 	else if (!(emu_opt&0x80))
 	{
@@ -362,7 +303,7 @@ static void blit(const char *fps, const char *notice)
 				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
 				localPal[0xf0] = 0x00ffffff;
 			}
-			gp2x_video_setpalette(localPal, pallen);
+			// gp2x_video_setpalette(localPal, pallen);
 		}
 	}
 
@@ -377,33 +318,24 @@ static void blit(const char *fps, const char *notice)
 		draw_cd_leds();
 	if (PicoAHW & PAHW_PICO)
 		draw_pico_ptr();
-{
-//static int u=0;
-//memset((char *)gp2x_screen+800*471*2, (u++)>>1, 800*9*2);
-}
 
 	//gp2x_video_wait_vsync();
-	gp2x_video_flip();
+	// gp2x_video_flip();
 }
 
 
 // clears whole screen or just the notice area (in all buffers)
 static void clearArea(int full)
 {
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		// 8-bit renderers
-		if (full) gp2x_memset_all_buffers(0, 0xe0, g_screen_width*240);
-		else      gp2x_memset_all_buffers(g_screen_width*232, 0xe0, g_screen_width*8);
-	} else {
-		// 16bit accurate renderer
-		if (full) gp2x_memset_all_buffers(0, 0, g_screen_width*g_screen_height*2);
-		else      gp2x_memset_all_buffers(g_screen_width*(g_screen_height-16)*2, 0, g_screen_width*16*2);
-	}
+	if (full) memset(g_screen_ptr, 0, g_screen_width*g_screen_height*2);
+	else      memset((short *)g_screen_ptr + g_screen_width * (g_screen_height - 16), 0,
+			g_screen_width * 16 * 2);
 }
 
 
 static void vidResetMode(void)
 {
+#if 0
 	if (PicoOpt&0x10) {
 		gp2x_video_changemode(8);
 	} else if (currentConfig.EmuOpt&0x80) {
@@ -435,97 +367,18 @@ static void vidResetMode(void)
 	if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8))
 	     gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);
 	else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);
+#else
+#ifdef USE_320_SCREEN
+	PicoDrawSetColorFormat(1);
+	PicoScanBegin = EmuScanBegin16;
+#else
+	PicoDrawSetColorFormat(-1);
+	PicoScanEnd = EmuScanEnd16;
+#endif
+#endif
 }
 
 
-static void emu_msg_cb(const char *msg)
-{
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		// 8-bit renderers
-		gp2x_memset_all_buffers(g_screen_width*(g_screen_height-16), 0xe0, g_screen_width*16);
-		osd_text(4, g_screen_height-16, msg);
-		gp2x_memcpy_all_buffers((char *)gp2x_screen+g_screen_width*(g_screen_height-16),
-			g_screen_width*(g_screen_height-16), g_screen_width*16);
-	} else {
-		// 16bit accurate renderer
-		gp2x_memset_all_buffers(g_screen_width*(g_screen_height-16)*2, 0, g_screen_width*16*2);
-		osd_text(4, g_screen_height-16, msg);
-		gp2x_memcpy_all_buffers((char *)gp2x_screen+g_screen_width*(g_screen_height-16)*2,
-			g_screen_width*(g_screen_height-16)*2, g_screen_width*16*2);
-	}
-	gettimeofday(&noticeMsgTime, 0);
-	noticeMsgTime.tv_sec -= 2;
-
-	/* assumption: emu_msg_cb gets called only when something slow is about to happen */
-	reset_timing = 1;
-}
-
-static void emu_state_cb(const char *str)
-{
-	clearArea(0);
-	blit("", str);
-}
-
-static void emu_msg_tray_open(void)
-{
-	strcpy(noticeMsg, "CD tray opened");
-	gettimeofday(&noticeMsgTime, 0);
-}
-
-#if 0
-static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
-{
-	int ret, px, py, lim_x;
-	static int pdown_frames = 0;
-
-	emu_RunEventsPico(events);
-
-	if (pico_inp_mode == 0) return;
-
-	// for F200
-	ret = gp2x_touchpad_read(&px, &py);
-	if (ret >= 0)
-	{
-		if (ret > 35000)
-		{
-			if (pdown_frames++ > 5)
-				PicoPad[0] |= 0x20;
-
-			pico_pen_x = px;
-			pico_pen_y = py;
-			if (!(Pico.video.reg[12]&1)) {
-				pico_pen_x -= 32;
-				if (pico_pen_x <   0) pico_pen_x = 0;
-				if (pico_pen_x > 248) pico_pen_x = 248;
-			}
-			if (pico_pen_y > 224) pico_pen_y = 224;
-		}
-		else
-			pdown_frames = 0;
-
-		//if (ret == 0)
-		//	PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;
-	}
-
-	PicoPad[0] &= ~0x0f; // release UDLR
-	if (gp2x_keys & GP2X_UP)    pico_pen_y--;
-	if (gp2x_keys & GP2X_DOWN)  pico_pen_y++;
-	if (gp2x_keys & GP2X_LEFT)  pico_pen_x--;
-	if (gp2x_keys & GP2X_RIGHT) pico_pen_x++;
-
-	lim_x = (Pico.video.reg[12]&1) ? 319 : 255;
-	if (pico_pen_y < 8) pico_pen_y = 8;
-	if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y;
-	if (pico_pen_x < 0) pico_pen_x = 0;
-	if (pico_pen_x > lim_x-PICO_PEN_ADJUST_X) pico_pen_x = lim_x-PICO_PEN_ADJUST_X;
-
-	PicoPicohw.pen_pos[0] = pico_pen_x;
-	if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;
-	PicoPicohw.pen_pos[0] += 0x3c;
-	PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
-}
-#endif
-
 static void update_volume(int has_changed, int is_up)
 {
 	static int prev_frame = 0, wait_frames = 0;
@@ -560,108 +413,6 @@ static void update_volume(int has_changed, int is_up)
 	}
 }
 
-static void RunEvents(unsigned int which)
-{
-	if (which & 0x1800) // save or load (but not both)
-	{
-		int do_it = 1;
-		if ( emu_checkSaveFile(state_slot) &&
-				(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load
-				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save
-#if 0
-			unsigned long keys;
-			blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)");
-			while ( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )
-				usleep(50*1024);
-			if (keys & GP2X_X) do_it = 0;
-			while ( gp2x_joystick_read(1) & (GP2X_X|GP2X_Y) ) // wait for release
-				usleep(50*1024);
-			clearArea(0);
-#endif
-		}
-		if (do_it) {
-			osd_text(4, g_screen_height-16, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
-			PicoStateProgressCB = emu_state_cb;
-			gp2x_memcpy_all_buffers(gp2x_screen, 0, g_screen_width*g_screen_height*2);
-			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
-			PicoStateProgressCB = NULL;
-		}
-
-		reset_timing = 1;
-	}
-	if (which & 0x0400) // switch renderer
-	{
-		if      (  PicoOpt&0x10)             { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }
-		else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10;
-		else   currentConfig.EmuOpt &= ~0x80;
-
-		vidResetMode();
-
-		if (PicoOpt&0x10) {
-			strcpy(noticeMsg, " 8bit fast renderer");
-		} else if (currentConfig.EmuOpt&0x80) {
-			strcpy(noticeMsg, "16bit accurate renderer");
-		} else {
-			strcpy(noticeMsg, " 8bit accurate renderer");
-		}
-
-		gettimeofday(&noticeMsgTime, 0);
-	}
-	if (which & 0x0300)
-	{
-		if(which&0x0200) {
-			state_slot -= 1;
-			if(state_slot < 0) state_slot = 9;
-		} else {
-			state_slot += 1;
-			if(state_slot > 9) state_slot = 0;
-		}
-		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
-		gettimeofday(&noticeMsgTime, 0);
-	}
-	if (which & 0x0080) {
-		engineState = PGS_Menu;
-	}
-}
-
-static void updateKeys(void)
-{
-	unsigned int allActions[2] = { 0, 0 }, events;
-	static unsigned int prevEvents = 0;
-
-	/* FIXME: combos, player2 */
-	allActions[0] = in_update();
-
-	PicoPad[0] = allActions[0] & 0xfff;
-	PicoPad[1] = allActions[1] & 0xfff;
-
-	if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
-	if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
-
-	events = (allActions[0] | allActions[1]) >> 16;
-
-	// volume is treated in special way and triggered every frame
-	if (events & 0x6000)
-		update_volume(1, events & 0x2000);
-
-	if ((events ^ prevEvents) & 0x40) {
-		emu_changeFastForward(events & 0x40);
-		update_volume(0, 0);
-		reset_timing = 1;
-	}
-
-	events &= ~prevEvents;
-
-/*
-	if (PicoAHW == PAHW_PICO)
-		RunEventsPico(events, keys);
-*/
-	if (events) RunEvents(events);
-	if (movie_data) emu_updateMovie();
-
-	prevEvents = (allActions[0] | allActions[1]) >> 16;
-}
-
 
 static void updateSound(int len)
 {
@@ -681,7 +432,7 @@ static void SkipFrame(int do_audio)
 }
 
 
-void emu_forcedFrame(int opts)
+void pemu_forced_frame(int opts)
 {
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
@@ -707,7 +458,7 @@ void emu_forcedFrame(int opts)
 		clearArea(1);
 	} else	vidCpyM2 = vidCpyM2_40col;
 
-	vidCpyM2((unsigned char *)gp2x_screen+g_screen_width*8, PicoDraw2FB+328*8);
+	vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);
 	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 	gp2x_video_setpalette(localPal, 0x40);
 */
@@ -715,9 +466,8 @@ void emu_forcedFrame(int opts)
 	currentConfig.EmuOpt = eo_old;
 }
 
-void emu_platformDebugCat(char *str)
+void plat_debug_cat(char *str)
 {
-	// nothing
 }
 
 static void simpleWait(int thissec, int lim_time)
@@ -736,7 +486,7 @@ static void simpleWait(int thissec, int lim_time)
 	}
 }
 
-void emu_startSound(void)
+void pemu_sound_start(void)
 {
 	static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
 	int target_fps = Pico.m.pal ? 50 : 60;
@@ -764,17 +514,16 @@ void emu_startSound(void)
 	}
 }
 
-void emu_endSound(void)
+void pemu_sound_stop(void)
 {
 }
 
-/* wait until we can write more sound */
-void emu_waitSound(void)
+void pemu_sound_wait(void)
 {
 	// don't need to do anything, writes will block by themselves
 }
 
-void emu_Loop(void)
+void pemu_loop(void)
 {
 	char fpsbuff[24]; // fps count c string
 	struct timeval tval; // timing
@@ -791,14 +540,13 @@ void emu_Loop(void)
 	vidResetMode();
 	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-	emu_findKeyBindCombos();
 
 	// pal/ntsc might have changed, reset related stuff
 	target_fps = Pico.m.pal ? 50 : 60;
 	target_frametime = 1000000/target_fps;
 	reset_timing = 1;
 
-	emu_startSound();
+	pemu_sound_start();
 
 	// prepare CD buffer
 	if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
@@ -806,7 +554,7 @@ void emu_Loop(void)
 	// calc vsync offset to sync timing code with vsync
 	if (currentConfig.EmuOpt&0x2000) {
 		gettimeofday(&tval, 0);
-		gp2x_video_wait_vsync();
+		//gp2x_video_wait_vsync();
 		gettimeofday(&tval, 0);
 		vsync_offset = tval.tv_usec;
 		while (vsync_offset >= target_frametime)
@@ -863,9 +611,9 @@ void emu_Loop(void)
 					vidCpyM2 = vidCpyM2_32col;
 				}
 			}
-			if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode
-			     gp2x_video_RGB_setscaling(8, scalex, 224);
-			else gp2x_video_RGB_setscaling(0, scalex, 240);
+			//if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode
+			//      gp2x_video_RGB_setscaling(8, scalex, 224);
+			// else gp2x_video_RGB_setscaling(0, scalex, 240);
 			oldmodes = modes;
 			clearArea(1);
 		}
@@ -905,7 +653,7 @@ void emu_Loop(void)
 				// it is quite common for this implementation to leave 1 fame unfinished
 				// when second changes, but we don't want buffer to starve.
 				if(PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) {
-					updateKeys();
+					emu_update_input();
 					SkipFrame(1); pframes_done++;
 				}
 
@@ -920,7 +668,7 @@ void emu_Loop(void)
 		if (currentConfig.Frameskip >= 0) // frameskip enabled
 		{
 			for(i = 0; i < currentConfig.Frameskip; i++) {
-				updateKeys();
+				emu_update_input();
 				SkipFrame(1); pframes_done++; frames_done++;
 				if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled
 					gettimeofday(&tval, 0);
@@ -941,12 +689,12 @@ void emu_Loop(void)
 				reset_timing = 1;
 				continue;
 			}
-			updateKeys();
+			emu_update_input();
 			SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++;
 			continue;
 		}
 
-		updateKeys();
+		emu_update_input();
 		PicoFrame();
 
 		// check time
@@ -966,7 +714,7 @@ void emu_Loop(void)
 				if (vsync_offset) {
 					if (lim_time - tval.tv_usec > target_frametime/2)
 						simpleWait(pthissec, lim_time - target_frametime/4);
-					gp2x_video_wait_vsync();
+					// gp2x_video_wait_vsync();
 				} else {
 					simpleWait(pthissec, lim_time);
 				}
@@ -985,6 +733,7 @@ void emu_Loop(void)
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
+		/* FIXME: plat_status_msg_busy_first */
 		emu_state_cb("Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
@@ -992,13 +741,6 @@ void emu_Loop(void)
 
 	// if in 8bit mode, generate 16bit image for menu background
 	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
-		emu_forcedFrame(POPT_EN_SOFTSCALE);
-}
-
-
-void emu_ResetGame(void)
-{
-	PicoReset();
-	reset_timing = 1;
+		pemu_forced_frame(POPT_EN_SOFTSCALE);
 }