X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=f27b2850deaaf7fe4c5bfc39e18b2ecb2aa77050;hb=388947f33d88ce3de0d9cb3e873244fbb5162a59;hp=237105addc1dbd69f6dd154763db00b8e27dbfdf;hpb=e31266dd116b6bea59ce3f2036feeb6725c45a72;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 237105a..f27b285 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006-2007 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.
@@ -8,22 +8,17 @@
 #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 "emu.h"
-#include "gp2x.h"
-#include "menu.h"
+#include "plat_gp2x.h"
+#include "soc.h"
+#include "../common/plat.h"
+#include "../common/menu.h"
 #include "../common/arm_utils.h"
 #include "../common/fonts.h"
 #include "../common/emu.h"
 #include "../common/config.h"
-#include "../common/input.h"
 #include "../linux/sndout_oss.h"
-#include "cpuctrl.h"
 #include "version.h"
 
 #include <pico/pico_int.h>
@@ -40,14 +35,13 @@
 #endif
 
 
-int select_exits = 0;
-
 extern int crashed_940;
 
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
 static int osd_fps_x;
 static int gp2x_old_gamma = 100;
+static char noticeMsg[40];
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 int reset_timing = 0;
 
@@ -55,12 +49,17 @@ int reset_timing = 0;
 #define PICO_PEN_ADJUST_Y 2
 static int pico_pen_x = 320/2, 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), format, vl);
+	va_end(vl);
+
 	gettimeofday(&noticeMsgTime, 0);
 }
 
@@ -95,7 +94,7 @@ void emu_Init(void)
 	mkdir("cfg", 0777);
 
 	PicoInit();
-	PicoMessage = emu_msg_cb;
+	PicoMessage = plat_status_msg_busy_next;
 	PicoMCDopenTray = emu_msg_tray_open;
 	PicoMCDcloseTray = menu_loop_tray;
 }
@@ -103,12 +102,16 @@ void emu_Init(void)
 
 static void scaling_update(void)
 {
-	PicoOpt &= ~0x4100;
+	PicoOpt &= ~(POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE);
 	switch (currentConfig.scaling) {
-		default: break; // off
-		case 1:  // hw hor
-		case 2:  PicoOpt |=  0x0100; break; // hw hor+vert
-		case 3:  PicoOpt |=  0x4000; break; // sw hor
+		default:break;
+		case EOPT_SCALE_HW_H:
+		case EOPT_SCALE_HW_HV:
+			PicoOpt |= POPT_DIS_32C_BORDER;
+			break;
+		case EOPT_SCALE_SW_H:
+			PicoOpt |= POPT_EN_SOFTSCALE;
+			break;
 	}
 }
 
@@ -130,40 +133,33 @@ void emu_Deinit(void)
 
 	// restore gamma
 	if (gp2x_old_gamma != 100)
-		set_gamma(100, 0);
+		set_lcd_gamma(100, 0);
 }
 
 void emu_prepareDefaultConfig(void)
 {
+	gp2x_soc_t soc;
+
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	defaultConfig.EmuOpt    = 0x9d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds
-	defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;
+	defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS | 0x600; // | <- confirm_save, cd_leds
+	defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;
 	defaultConfig.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0; // auto
 	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
 	defaultConfig.s_PicoCDBuffers = 0;
 	defaultConfig.Frameskip = -1; // auto
-	defaultConfig.CPUclock = 200;
+	defaultConfig.CPUclock = default_cpu_clock;
 	defaultConfig.volume = 50;
-	defaultConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU
-	defaultConfig.KeyBinds[ 4] = 1<<1;
-	defaultConfig.KeyBinds[ 2] = 1<<2;
-	defaultConfig.KeyBinds[ 6] = 1<<3;
-	defaultConfig.KeyBinds[14] = 1<<4;
-	defaultConfig.KeyBinds[13] = 1<<5;
-	defaultConfig.KeyBinds[12] = 1<<6;
-	defaultConfig.KeyBinds[ 8] = 1<<7;
-	defaultConfig.KeyBinds[15] = 1<<26; // switch rend
-	defaultConfig.KeyBinds[10] = 1<<27; // save state
-	defaultConfig.KeyBinds[11] = 1<<28; // load state
-	defaultConfig.KeyBinds[23] = 1<<29; // vol up
-	defaultConfig.KeyBinds[22] = 1<<30; // vol down
 	defaultConfig.gamma = 100;
 	defaultConfig.scaling = 0;
 	defaultConfig.turbo_rate = 15;
+
+	soc = soc_detect();
+	if (soc == SOCID_MMSP2)
+		defaultConfig.s_PicoOpt |= POPT_EXT_FM;
 }
 
-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;
 	int *p, i, h, offs;
@@ -191,12 +187,10 @@ void osd_text(int x, int y, const char *text)
 
 static void draw_cd_leds(void)
 {
-//	static
 	int old_reg;
-//	if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems?
 	old_reg = Pico_mcd->s68k_regs[0];
 
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {
 		// 8-bit modes
 		unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
 		unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
@@ -259,7 +253,7 @@ static void blit(const char *fps, const char *notice)
 {
 	int emu_opt = currentConfig.EmuOpt;
 
-	if (PicoOpt&0x10)
+	if (PicoOpt & POPT_ALT_RENDERER)
 	{
 		// 8bit fast renderer
 		if (Pico.m.dirtyPal) {
@@ -274,7 +268,7 @@ static void blit(const char *fps, const char *notice)
 		// do actual copy
 		vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);
 	}
-	else if (!(emu_opt&0x80))
+	else if (!(emu_opt & EOPT_16BPP))
 	{
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal)
@@ -310,8 +304,10 @@ static void blit(const char *fps, const char *notice)
 
 	if (notice || (emu_opt & 2)) {
 		int h = 232;
-		if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 8;
-		if (notice) osd_text(4, h, notice);
+		if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8))
+			h -= 8;
+		if (notice)
+			osd_text(4, h, notice);
 		if (emu_opt & 2)
 			osd_text(osd_fps_x, h, fps);
 	}
@@ -320,23 +316,20 @@ static void blit(const char *fps, const char *notice)
 	if (PicoAHW & PAHW_PICO)
 		draw_pico_ptr();
 
-	//gp2x_video_wait_vsync();
 	gp2x_video_flip();
 
-	if (!(PicoOpt&0x10)) {
+	if (!(PicoOpt & POPT_ALT_RENDERER)) {
 		if (!(Pico.video.reg[1]&8)) {
-			if (currentConfig.EmuOpt&0x80) {
+			if (currentConfig.EmuOpt & EOPT_16BPP)
 				DrawLineDest = (unsigned short *) g_screen_ptr + 320*8;
-			} else {
+			else
 				DrawLineDest = (unsigned char  *) g_screen_ptr + 320*8;
-			}
 		} else {
 			DrawLineDest = g_screen_ptr;
 		}
 	}
 }
 
-
 // clears whole screen or just the notice area (in all buffers)
 static void clearArea(int full)
 {
@@ -351,12 +344,27 @@ static void clearArea(int full)
 	}
 }
 
+void plat_status_msg_busy_next(const char *msg)
+{
+	clearArea(0);
+	blit("", msg);
+
+	/* assumption: msg_busy_next gets called only when
+	 * something slow is about to happen */
+	reset_timing = 1;
+}
+
+void plat_status_msg_busy_first(const char *msg)
+{
+	gp2x_memcpy_all_buffers(g_screen_ptr, 0, 320*240*2);
+	plat_status_msg_busy_next(msg);
+}
 
 static void vidResetMode(void)
 {
-	if (PicoOpt&0x10) {
+	if (PicoOpt & POPT_ALT_RENDERER) {
 		gp2x_video_changemode(8);
-	} else if (currentConfig.EmuOpt&0x80) {
+	} else if (currentConfig.EmuOpt & EOPT_16BPP) {
 		gp2x_video_changemode(16);
 		PicoDrawSetColorFormat(1);
 		PicoScanBegin = EmuScanBegin16;
@@ -365,7 +373,7 @@ static void vidResetMode(void)
 		PicoDrawSetColorFormat(2);
 		PicoScanBegin = EmuScanBegin8;
 	}
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {
 		// setup pal for 8-bit modes
 		localPal[0xc0] = 0x0000c000; // MCD LEDs
 		localPal[0xd0] = 0x00c00000;
@@ -377,45 +385,38 @@ static void vidResetMode(void)
 	}
 	Pico.m.dirtyPal = 1;
 	// reset scaling
-	if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8))
+	if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(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);
 }
 
-
-static void emu_msg_cb(const char *msg)
+void plat_video_toggle_renderer(void)
 {
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		// 8-bit renderers
-		gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
-		osd_text(4, 232, msg);
-		gp2x_memcpy_all_buffers((char *)g_screen_ptr+320*232, 320*232, 320*8);
-	} else {
-		// 16bit accurate renderer
-		gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);
-		osd_text(4, 232, msg);
-		gp2x_memcpy_all_buffers((char *)g_screen_ptr+320*232*2, 320*232*2, 320*8*2);
-	}
-	gettimeofday(&noticeMsgTime, 0);
-	noticeMsgTime.tv_sec -= 2;
+	if (PicoOpt & POPT_ALT_RENDERER) {
+		PicoOpt &= ~POPT_ALT_RENDERER;
+		currentConfig.EmuOpt |= EOPT_16BPP;
+	} else if (!(currentConfig.EmuOpt & EOPT_16BPP))
+		PicoOpt |= POPT_ALT_RENDERER;
+	else
+		currentConfig.EmuOpt &= ~EOPT_16BPP;
 
-	/* assumption: emu_msg_cb gets called only when something slow is about to happen */
-	reset_timing = 1;
-}
+	vidResetMode();
 
-static void emu_state_cb(const char *str)
-{
-	clearArea(0);
-	blit("", str);
+	if (PicoOpt & POPT_ALT_RENDERER) {
+		plat_status_msg(" 8bit fast renderer");
+	} else if (currentConfig.EmuOpt & EOPT_16BPP) {
+		plat_status_msg("16bit accurate renderer");
+	} else {
+		plat_status_msg(" 8bit accurate renderer");
+	}
 }
 
 static void emu_msg_tray_open(void)
 {
-	strcpy(noticeMsg, "CD tray opened");
-	gettimeofday(&noticeMsgTime, 0);
+	plat_status_msg("CD tray opened");
 }
 
-static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
+static void RunEventsPico(unsigned int events)
 {
 	int ret, px, py, lim_x;
 	static int pdown_frames = 0;
@@ -449,11 +450,11 @@ static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
 		//	PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;
 	}
 
+	if (PicoPad[0] & 1) pico_pen_y--;
+	if (PicoPad[0] & 2) pico_pen_y++;
+	if (PicoPad[0] & 4) pico_pen_x--;
+	if (PicoPad[0] & 8) pico_pen_x++;
 	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;
@@ -467,14 +468,20 @@ static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
 	PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);
 }
 
-static void update_volume(int has_changed, int is_up)
+void plat_update_volume(int has_changed, int is_up)
 {
 	static int prev_frame = 0, wait_frames = 0;
 	int vol = currentConfig.volume;
+	int need_low_volume = 0;
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	if ((PicoOpt & POPT_EN_STEREO) && soc == SOCID_MMSP2)
+		need_low_volume = 1;
 
 	if (has_changed)
 	{
-		if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)
+		if (need_low_volume && vol < 5 && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)
 			wait_frames++;
 		else {
 			if (is_up) {
@@ -486,13 +493,14 @@ static void update_volume(int has_changed, int is_up)
 			sndout_oss_setvol(vol, vol);
 			currentConfig.volume = vol;
 		}
-		sprintf(noticeMsg, "VOL: %02i", vol);
-		gettimeofday(&noticeMsgTime, 0);
+		plat_status_msg("VOL: %02i", vol);
 		prev_frame = Pico.m.frame_count;
 	}
 
-	// set the right mixer func
-	if (!(PicoOpt&8)) return; // just use defaults for mono
+	if (need_low_volume)
+		return;
+
+	/* set the right mixer func */
 	if (vol >= 5)
 		PsndMix_32_to_16l = mix_32_to_16l_stereo;
 	else {
@@ -501,141 +509,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
-			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);
-		}
-		if (do_it) {
-			osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
-			PicoStateProgressCB = emu_state_cb;
-			gp2x_memcpy_all_buffers(g_screen_ptr, 0, 320*240*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 keys, keys2, allActions[2] = { 0, 0 }, events;
-	static unsigned int prevEvents = 0;
-
-	keys = gp2x_joystick_read(0);
-	if (keys & GP2X_SELECT)
-		engineState = select_exits ? PGS_Quit : PGS_Menu;
-
-	keys &= CONFIGURABLE_KEYS;
-	keys2 = keys;
-
-#if 1
-	/* FIXME: combos, player2 */
-	allActions[0] = in_update();
-#else
-	for (i = 0; i < 32; i++)
-	{
-		if (keys2 & (1 << i))
-		{
-			int pl, acts = currentConfig.KeyBinds[i];
-			if (!acts) continue;
-			pl = (acts >> 16) & 1;
-			if (kb_combo_keys & (1 << i))
-			{
-				int u = i+1, acts_c = acts & kb_combo_acts;
-				// let's try to find the other one
-				if (acts_c) {
-					for (; u < 32; u++)
-						if ( (keys2 & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
-							allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
-							keys2 &= ~((1 << i) | (1 << u));
-							break;
-						}
-				}
-				// add non-combo actions if combo ones were not found
-				if (!acts_c || u == 32)
-					allActions[pl] |= acts & ~kb_combo_acts;
-			} else {
-				allActions[pl] |= acts;
-			}
-		}
-	}
-#endif
-
-	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)
 {
@@ -667,7 +540,7 @@ void emu_startSound(void)
 		sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
 		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
 		PicoWriteSound = updateSound;
-		update_volume(0, 0);
+		plat_update_volume(0, 0);
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
@@ -797,7 +670,7 @@ static void tga_dump(void)
 
 void emu_Loop(void)
 {
-	static int gp2x_old_clock = 200, EmuOpt_old = 0;
+	static int gp2x_old_clock = -1, EmuOpt_old = 0;
 	char fpsbuff[24]; // fps count c string
 	struct timeval tval; // timing
 	int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync
@@ -807,25 +680,38 @@ void emu_Loop(void)
 
 	printf("entered emu_Loop()\n");
 
+	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_RAM_TIMINGS) {
+		if (currentConfig.EmuOpt & EOPT_RAM_TIMINGS)
+			set_ram_timings();
+		else
+			unset_ram_timings();
+	}
+
+	if (gp2x_old_clock < 0)
+		gp2x_old_clock = default_cpu_clock;
 	if (gp2x_old_clock != currentConfig.CPUclock) {
 		printf("changing clock to %i...", currentConfig.CPUclock); fflush(stdout);
-		set_FCLK(currentConfig.CPUclock);
+		gp2x_set_cpuclk(currentConfig.CPUclock);
 		gp2x_old_clock = currentConfig.CPUclock;
 		printf(" done\n");
 	}
 
 	if (gp2x_old_gamma != currentConfig.gamma || (EmuOpt_old&0x1000) != (currentConfig.EmuOpt&0x1000)) {
-		set_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
+		set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 		gp2x_old_gamma = currentConfig.gamma;
 		printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 	}
 
-	if ((EmuOpt_old&0x2000) != (currentConfig.EmuOpt&0x2000)) {
-		if (currentConfig.EmuOpt&0x2000)
-		     set_LCD_custom_rate(Pico.m.pal ? LCDR_100 : LCDR_120);
-		else unset_LCD_custom_rate();
+	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_PSYNC) {
+		if (currentConfig.EmuOpt & EOPT_PSYNC)
+			set_lcd_custom_rate(Pico.m.pal);
+		else
+			unset_lcd_custom_rate();
 	}
 
+	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_MMUHACK)
+		gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK);
+
 	EmuOpt_old = currentConfig.EmuOpt;
 	fpsbuff[0] = 0;
 
@@ -834,7 +720,6 @@ void emu_Loop(void)
 	scaling_update();
 	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;
@@ -906,7 +791,8 @@ void emu_Loop(void)
 					vidCpyM2 = vidCpyM2_32col;
 				}
 			}
-			if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode
+			/* want vertical scaling and game is not in 240 line mode */
+			if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(modes&8))
 			     gp2x_video_RGB_setscaling(8, scalex, 224);
 			else gp2x_video_RGB_setscaling(0, scalex, 240);
 			oldmodes = modes;
@@ -946,8 +832,8 @@ void emu_Loop(void)
 			} else {
 				// 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();
+				if (PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) {
+					emu_update_input();
 					SkipFrame(1); pframes_done++;
 				}
 
@@ -962,7 +848,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);
@@ -983,12 +869,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
@@ -1022,17 +908,18 @@ void emu_Loop(void)
 
 	emu_changeFastForward(0);
 
-	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+	if (PicoAHW & PAHW_MCD)
+		PicoCDBufferFree();
 
 	// save SRAM
-	if((currentConfig.EmuOpt & 1) && SRam.changed) {
-		emu_state_cb("Writing SRAM/BRAM..");
+	if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) {
+		plat_status_msg_busy_first("Writing SRAM/BRAM...");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
 
 	// if in 8bit mode, generate 16bit image for menu background
-	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
+	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))
 		emu_forcedFrame(POPT_EN_SOFTSCALE);
 }
 
@@ -1052,7 +939,7 @@ const char *plat_get_credits(void)
 		"Reesy & FluBBa: DrZ80 core\n"
 		"MAME devs: YM2612 and SN76496 cores\n"
 		"rlyeh and others: minimal SDK\n"
-		"Squidge: squidgehack\n"
+		"Squidge: mmuhack\n"
 		"Dzz: ARM940 sample\n"
 		"GnoStiC / Puck2099: USB joy code\n"
 		"craigix: GP2X hardware\n"