X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=df9faac8d6fc8bb5f20e08e5b53c5620e256aaf2;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=ea0c67a603a00fbdcc3ebd7c41b5656ac966511e;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index ea0c67a..df9faac 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -1,21 +1,30 @@
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * (c) Copyright 2006-2010 notaz, All rights reserved.
+ *
+ * For performance reasons 3 renderers are exported for both MD and 32x modes:
+ * - 16bpp line renderer
+ * - 8bpp line renderer (slightly faster)
+ * - 8bpp tile renderer
+ * In 32x mode:
+ * - 32x layer is overlayed on top of 16bpp one
+ * - line internal one done on PicoDraw2FB, then mixed with 32x
+ * - tile internal one done on PicoDraw2FB, then mixed with 32x
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/time.h>
-#include <stdarg.h>
+#include <unistd.h>
 
 #include "plat_gp2x.h"
 #include "soc.h"
+#include "soc_pollux.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 "version.h"
 
@@ -24,8 +33,6 @@
 #include <pico/sound/mix.h>
 #include <zlib/zlib.h>
 
-//#define PFRAMES
-
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
 #else
@@ -35,270 +42,442 @@
 
 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];
+static short __attribute__((aligned(4))) sndBuffer[2*(44100+100)/50];
 static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];
 unsigned char *PicoDraw2FB = PicoDraw2FB_;
+static int osd_fps_x, osd_y, doing_bg_frame;
+const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };
+const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };
+enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };
+
+static int (*emu_scan_begin)(unsigned int num) = NULL;
+static int (*emu_scan_end)(unsigned int num) = NULL;
+
+extern void *gp2x_screens[4];
 
 
-void plat_status_msg(const char *format, ...)
+void pemu_prep_defconfig(void)
 {
-	va_list vl;
+	gp2x_soc_t soc;
 
-	va_start(vl, format);
-	vsnprintf(noticeMsg, sizeof(noticeMsg), format, vl);
-	va_end(vl);
+	defaultConfig.CPUclock = default_cpu_clock;
+	defaultConfig.renderer32x = RT_8BIT_FAST;
+	defaultConfig.analog_deadzone = 50;
 
-	gettimeofday(&noticeMsgTime, 0);
+	soc = soc_detect();
+	if (soc == SOCID_MMSP2)
+		defaultConfig.s_PicoOpt |= POPT_EXT_FM;
+	else if (soc == SOCID_POLLUX) {
+		defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX|EOPT_SHOW_RTC;
+		defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX;
+	}
 }
 
-int plat_get_root_dir(char *dst, int len)
+void pemu_validate_config(void)
 {
-	extern char **g_argv;
-	int j;
+	if (gp2x_dev_id != GP2X_DEV_GP2X)
+		PicoOpt &= ~POPT_EXT_FM;
+	if (gp2x_dev_id != GP2X_DEV_WIZ)
+		currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;
 
-	strncpy(dst, g_argv[0], len);
-	len -= 32; // reserve
-	if (len < 0) len = 0;
-	dst[len] = 0;
-	for (j = strlen(dst); j > 0; j--)
-		if (dst[j] == '/') { dst[j+1] = 0; break; }
+	if (currentConfig.gamma < 10 || currentConfig.gamma > 300)
+		currentConfig.gamma = 100;
 
-	return j + 1;
+	if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 1024)
+		currentConfig.CPUclock = default_cpu_clock;
 }
 
+static int get_renderer(void)
+{
+	if (PicoAHW & PAHW_32X)
+		return currentConfig.renderer32x;
+	else
+		return currentConfig.renderer;
+}
 
-static void scaling_update(void)
+static void change_renderer(int diff)
 {
-	PicoOpt &= ~(POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE);
-	switch (currentConfig.scaling) {
-		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;
-	}
+	int *r;
+	if (PicoAHW & PAHW_32X)
+		r = &currentConfig.renderer32x;
+	else
+		r = &currentConfig.renderer;
+	*r += diff;
+
+	// 8bpp fast is not there (yet?)
+	if ((PicoAHW & PAHW_SMS) && *r == RT_8BIT_FAST)
+		(*r)++;
+
+	if      (*r >= RT_COUNT)
+		*r = 0;
+	else if (*r < 0)
+		*r = RT_COUNT - 1;
 }
 
+#define is_16bit_mode() \
+	(get_renderer() == RT_16BIT || (PicoAHW & PAHW_32X))
 
-void pemu_prep_defconfig(void)
-{
-	gp2x_soc_t soc;
+static void (*osd_text)(int x, int y, const char *text);
 
-	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	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 = default_cpu_clock;
-	defaultConfig.volume = 50;
-	defaultConfig.gamma = 100;
-	defaultConfig.scaling = 0;
-	defaultConfig.turbo_rate = 15;
+static void osd_text8(int x, int y, const char *text)
+{
+	int len = strlen(text)*8;
+	int *p, i, h, offs;
 
-	soc = soc_detect();
-	if (soc == SOCID_MMSP2)
-		defaultConfig.s_PicoOpt |= POPT_EXT_FM;
+	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_text(int x, int y, const char *text)
+static void osd_text16(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 	int *p, i, h, offs;
 
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		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_textOut8(x, y, text);
-	} else {
-		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_textOut16(x, y, text);
+	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);
+}
+
+static void osd_text8_rot(int x, int y, const char *text)
+{
+	int len = strlen(text) * 8;
+	char *p = (char *)g_screen_ptr + 240*(320-x) + y;
+
+	while (len--) {
+		memset(p, 0xe0, 8);
+		p -= 240;
+	}
+
+	emu_text_out8_rot(x, y, text);
+}
+
+static void osd_text16_rot(int x, int y, const char *text)
+{
+	int len = strlen(text) * 8;
+	short *p = (short *)g_screen_ptr + 240*(320-x) + y;
+
+	while (len--) {
+		memset(p, 0, 8*2);
+		p -= 240;
+	}
+
+	emu_text_out16_rot(x, y, text);
 }
 
 static void draw_cd_leds(void)
 {
-	int old_reg;
-	old_reg = Pico_mcd->s68k_regs[0];
+	int led_reg, pitch, scr_offs, led_offs;
+	led_reg = Pico_mcd->s68k_regs[0];
+
+	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
+		pitch = 240;
+		led_offs = -pitch * 6;
+		scr_offs = pitch * (320 - 4);
+	} else {
+		pitch = 320;
+		led_offs = 4;
+		scr_offs = pitch * 2 + 4;
+	}
 
-	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {
+	if (!is_16bit_mode()) {
+	#define p(x) px[(x) >> 2]
 		// 8-bit modes
-		unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
-		unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
-		*(unsigned int *)((char *)g_screen_ptr + 320*2+ 4) =
-		*(unsigned int *)((char *)g_screen_ptr + 320*3+ 4) =
-		*(unsigned int *)((char *)g_screen_ptr + 320*4+ 4) = col_g;
-		*(unsigned int *)((char *)g_screen_ptr + 320*2+12) =
-		*(unsigned int *)((char *)g_screen_ptr + 320*3+12) =
-		*(unsigned int *)((char *)g_screen_ptr + 320*4+12) = col_r;
+		unsigned int *px = (unsigned int *)((char *)g_screen_ptr + scr_offs);
+		unsigned int col_g = (led_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
+		unsigned int col_r = (led_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
+		p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;
+		p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;
+	#undef p
 	} else {
+	#define p(x) px[(x)*2 >> 2] = px[((x)*2 >> 2) + 1]
 		// 16-bit modes
-		unsigned int *p = (unsigned int *)((short *)g_screen_ptr + 320*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 += 320/2 - 12/2;
-		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
-		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
+		unsigned int *px = (unsigned int *)((short *)g_screen_ptr + scr_offs);
+		unsigned int col_g = (led_reg & 2) ? 0x06000600 : 0;
+		unsigned int col_r = (led_reg & 1) ? 0xc000c000 : 0;
+		p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;
+		p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;
+	#undef p
 	}
 }
 
 static void draw_pico_ptr(void)
 {
 	unsigned short *p = (unsigned short *)g_screen_ptr;
+	int x, y, pitch = 320;
 
 	// only if pen enabled and for 16bit modes
-	if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;
+	if (pico_inp_mode == 0 || currentConfig.EmuOpt != RT_16BIT)
+		return;
+
+	x = pico_pen_x + PICO_PEN_ADJUST_X;
+	y = pico_pen_y + PICO_PEN_ADJUST_Y;
+	if (!(Pico.video.reg[12]&1) && !(PicoOpt & POPT_DIS_32C_BORDER))
+		x += 32;
 
-	if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))
-		p += 32;
+	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
+		pitch = 240;
+		p += (319 - x) * pitch + y;
+	} else
+		p += x + y * pitch;
 
-	p += 320 * (pico_pen_y + PICO_PEN_ADJUST_Y);
-	p += pico_pen_x + PICO_PEN_ADJUST_X;
-	p[0]   ^= 0xffff;
-	p[319] ^= 0xffff;
-	p[320] ^= 0xffff;
-	p[321] ^= 0xffff;
-	p[640] ^= 0xffff;
+	p[0]       ^= 0xffff;
+	p[pitch-1] ^= 0xffff;
+	p[pitch]   ^= 0xffff;
+	p[pitch+1] ^= 0xffff;
+	p[pitch*2] ^= 0xffff;
 }
 
-static int EmuScanBegin16(unsigned int num)
+/* rot thing for Wiz */
+static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];
+
+static int EmuScanBegin16_rot(unsigned int num)
 {
-	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num;
+	DrawLineDest = rot_buff + (num & 3) * 320 * 2;
+	return 0;
+}
 
+static int EmuScanEnd16_rot(unsigned int num)
+{
+	if ((num & 3) != 3)
+		return 0;
+	rotated_blit16(g_screen_ptr, rot_buff, num + 1,
+		!(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));
 	return 0;
 }
 
-static int EmuScanBegin8(unsigned int num)
+static int EmuScanBegin8_rot(unsigned int num)
 {
-	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned char *)  g_screen_ptr + g_screen_width * num;
+	DrawLineDest = rot_buff + (num & 3) * 320;
+	return 0;
+}
 
+static int EmuScanEnd8_rot(unsigned int num)
+{
+	if ((num & 3) != 3)
+		return 0;
+	rotated_blit8(g_screen_ptr, rot_buff, num + 1,
+		!(Pico.video.reg[12] & 1));
 	return 0;
 }
 
-int localPal[0x100];
-static void (*vidCpyM2)(void *dest, void *src) = NULL;
+/* line doublers */
+static unsigned int ld_counter;
+static int ld_left, ld_lines;
 
-static void blit(const char *fps, const char *notice)
+static int EmuScanBegin16_ld(unsigned int num)
+{
+	if ((signed int)(ld_counter - num) > 100)
+		ld_counter = 0;
+
+	if (emu_scan_begin)
+		return emu_scan_begin(ld_counter);
+	else
+		DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;
+
+	return 0;
+}
+
+static int EmuScanEnd16_ld(unsigned int num)
+{
+	void *oldline = DrawLineDest;
+
+	if (emu_scan_end)
+		emu_scan_end(ld_counter);
+
+	ld_counter++;
+	ld_left--;
+	if (ld_left <= 0) {
+		ld_left = ld_lines;
+
+		EmuScanBegin16_ld(num);
+		memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);
+		if (emu_scan_end)
+			emu_scan_end(ld_counter);
+
+		ld_counter++;
+	}
+
+	return 0;
+}
+
+static int localPal[0x100];
+static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border);
+static int (*make_local_pal)(int fast_mode);
+
+static int make_local_pal_md(int fast_mode)
+{
+	int pallen = 0xc0;
+
+	bgr444_to_rgb32(localPal, Pico.cram);
+	if (fast_mode)
+		return 0x40;
+
+	if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode
+		bgr444_to_rgb32_sh(localPal, Pico.cram);
+		localPal[0xc0] = 0x0000c000;
+		localPal[0xd0] = 0x00c00000;
+		localPal[0xe0] = 0x00000000; // reserved pixels for OSD
+		localPal[0xf0] = 0x00ffffff;
+		pallen = 0x100;
+	}
+	else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
+		bgr444_to_rgb32(localPal+0x40, HighPal);
+		bgr444_to_rgb32(localPal+0x80, HighPal+0x40);
+	}
+	else
+		memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess
+
+	return pallen;
+}
+
+static int make_local_pal_sms(int fast_mode)
+{
+	unsigned short *spal = Pico.cram;
+	unsigned int *dpal = (void *)localPal;
+	unsigned int i, t;
+
+	for (i = 0x40; i > 0; i--) {
+		t = *spal++;
+		t = ((t & 0x0003) << 22) | ((t & 0x000c) << 12) | ((t & 0x0030) << 2);
+		t |= t >> 2;
+		t |= t >> 4;
+		*dpal++ = t;
+	}
+
+	return 0x40;
+}
+
+void pemu_finalize_frame(const char *fps, const char *notice)
 {
 	int emu_opt = currentConfig.EmuOpt;
+	int ret;
 
-	if (PicoOpt & POPT_ALT_RENDERER)
+	if (PicoAHW & PAHW_32X)
+		; // nothing to do
+	else if (get_renderer() == RT_8BIT_FAST)
 	{
 		// 8bit fast renderer
 		if (Pico.m.dirtyPal) {
 			Pico.m.dirtyPal = 0;
-			vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+			ret = make_local_pal(1);
 			// feed new palette to our device
-			gp2x_video_setpalette(localPal, 0x40);
+			gp2x_video_setpalette(localPal, ret);
 		}
 		// 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+320*8, PicoDraw2FB+328*8);
+		vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,
+			!(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));
 	}
-	else if (!(emu_opt & EOPT_16BPP))
+	else if (get_renderer() == RT_8BIT_ACC)
 	{
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal)
 		{
-			int pallen = 0xc0;
 			Pico.m.dirtyPal = 0;
-			if (Pico.video.reg[0xC]&8) // shadow/hilight mode
-			{
-				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-				vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
-				vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);
-				memcpy32(localPal+0xc0, localPal+0x40, 0x40);
-				pallen = 0x100;
-			}
-			else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
-				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-				vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);
-				vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);
-			}
-			else {
-				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-				memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess
-			}
-			if (pallen > 0xc0) {
-				localPal[0xc0] = 0x0000c000;
-				localPal[0xd0] = 0x00c00000;
-				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
-				localPal[0xf0] = 0x00ffffff;
-			}
-			gp2x_video_setpalette(localPal, pallen);
+			ret = make_local_pal(0);
+			gp2x_video_setpalette(localPal, ret);
 		}
 	}
 
-	if (notice || (emu_opt & 2)) {
-		int h = 232;
-		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);
-	}
-	if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+	if (notice)
+		osd_text(4, osd_y, notice);
+	if (emu_opt & EOPT_SHOW_FPS)
+		osd_text(osd_fps_x, osd_y, fps);
+	if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))
 		draw_cd_leds();
 	if (PicoAHW & PAHW_PICO)
 		draw_pico_ptr();
+}
 
+void plat_video_flip(void)
+{
+	int stride = g_screen_width;
 	gp2x_video_flip();
 
-	if (!(PicoOpt & POPT_ALT_RENDERER)) {
-		if (!(Pico.video.reg[1]&8)) {
-			if (currentConfig.EmuOpt & EOPT_16BPP)
-				DrawLineDest = (unsigned short *) g_screen_ptr + 320*8;
-			else
-				DrawLineDest = (unsigned char  *) g_screen_ptr + 320*8;
-		} else {
-			DrawLineDest = g_screen_ptr;
-		}
+	if (is_16bit_mode())
+		stride *= 2;
+	PicoDrawSetOutBuf(g_screen_ptr, stride);
+}
+
+/* XXX */
+#ifdef __GP2X__
+unsigned int plat_get_ticks_ms(void)
+{
+	return gp2x_get_ticks_ms();
+}
+
+unsigned int plat_get_ticks_us(void)
+{
+	return gp2x_get_ticks_us();
+}
+#endif
+
+void plat_wait_till_us(unsigned int us_to)
+{
+	unsigned int now;
+
+	spend_cycles(1024);
+	now = plat_get_ticks_us();
+
+	while ((signed int)(us_to - now) > 512)
+	{
+		spend_cycles(1024);
+		now = plat_get_ticks_us();
 	}
 }
 
-// clears whole screen or just the notice area (in all buffers)
-static void clearArea(int full)
+void plat_video_wait_vsync(void)
 {
-	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		// 8-bit renderers
-		if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);
-		else      gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
-	} else {
-		// 16bit accurate renderer
-		if (full) gp2x_memset_all_buffers(0, 0, 320*240*2);
-		else      gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);
+	gp2x_video_wait_vsync();
+}
+
+void plat_status_msg_clear(void)
+{
+	int is_8bit = !is_16bit_mode();
+	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
+		/* ugh.. */
+		int i, u, *p;
+		if (is_8bit) {
+			for (i = 0; i < 4; i++) {
+				p = (int *)gp2x_screens[i] + (240-8) / 4;
+				for (u = 320; u > 0; u--, p += 240/4)
+					p[0] = p[1] = 0xe0e0e0e0;
+			}
+		} else {
+			for (i = 0; i < 4; i++) {
+				p = (int *)gp2x_screens[i] + (240-8)*2 / 4;
+				for (u = 320; u > 0; u--, p += 240*2/4)
+					p[0] = p[1] = p[2] = p[3] = 0;
+			}
+		}
+		return;
 	}
+
+	if (is_8bit)
+		gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
+	else
+		gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);
 }
 
 void plat_status_msg_busy_next(const char *msg)
 {
-	clearArea(0);
-	blit("", msg);
+	plat_status_msg_clear();
+	pemu_finalize_frame("", msg);
+	plat_video_flip();
+	emu_status_msg("");
 
 	/* assumption: msg_busy_next gets called only when
 	 * something slow is about to happen */
@@ -311,20 +490,72 @@ void plat_status_msg_busy_first(const char *msg)
 	plat_status_msg_busy_next(msg);
 }
 
-static void vidResetMode(void)
+static void vid_reset_mode(void)
 {
-	if (PicoOpt & POPT_ALT_RENDERER) {
-		gp2x_video_changemode(8);
-	} else if (currentConfig.EmuOpt & EOPT_16BPP) {
-		gp2x_video_changemode(16);
-		PicoDrawSetColorFormat(1);
-		PicoScanBegin = EmuScanBegin16;
-	} else {
-		gp2x_video_changemode(8);
-		PicoDrawSetColorFormat(2);
-		PicoScanBegin = EmuScanBegin8;
+	int gp2x_mode = 16;
+	int renderer = get_renderer();
+
+	PicoOpt &= ~POPT_ALT_RENDERER;
+	emu_scan_begin = NULL;
+	emu_scan_end = NULL;
+
+	switch (renderer) {
+	case RT_16BIT:
+		PicoDrawSetOutFormat(PDF_RGB555, 0);
+		PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
+		break;
+	case RT_8BIT_ACC:
+		PicoDrawSetOutFormat(PDF_8BIT, 0);
+		PicoDrawSetOutBuf(g_screen_ptr, g_screen_width);
+		gp2x_mode = 8;
+		break;
+	case RT_8BIT_FAST:
+		PicoOpt |= POPT_ALT_RENDERER;
+		PicoDrawSetOutFormat(PDF_NONE, 0);
+		vidcpyM2 = vidcpy_m2;
+		gp2x_mode = 8;
+		break;
+	default:
+		printf("bad renderer\n");
+		break;
+	}
+
+	if (PicoAHW & PAHW_32X) {
+		// Wiz 16bit is an exception, uses line rendering due to rotation mess
+		if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {
+			PicoDrawSetOutFormat(PDF_RGB555, 1);
+			PicoDraw32xSetFrameMode(0, 0);
+		}
+		else {
+			PicoDrawSetOutFormat(PDF_NONE, 0);
+			PicoDraw32xSetFrameMode(1, 0);
+		}
+		PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
+		gp2x_mode = 16;
 	}
-	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {
+
+	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
+		if ((PicoAHW & PAHW_32X) || renderer == RT_16BIT) {
+			emu_scan_begin = EmuScanBegin16_rot;
+			emu_scan_end = EmuScanEnd16_rot;
+		}
+		else if (renderer == RT_8BIT_ACC) {
+			emu_scan_begin = EmuScanBegin8_rot;
+			emu_scan_end = EmuScanEnd8_rot;
+		}
+		else if (renderer == RT_8BIT_FAST)
+			vidcpyM2 = vidcpy_m2_rot;
+	}
+
+	PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);
+
+	if (is_16bit_mode())
+		osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;
+	else
+		osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;
+
+	gp2x_video_wait_vsync();
+	if (!is_16bit_mode()) {
 		// setup pal for 8-bit modes
 		localPal[0xc0] = 0x0000c000; // MCD LEDs
 		localPal[0xd0] = 0x00c00000;
@@ -332,34 +563,79 @@ static void vidResetMode(void)
 		localPal[0xf0] = 0x00ffffff;
 		gp2x_video_setpalette(localPal, 0x100);
 		gp2x_memset_all_buffers(0, 0xe0, 320*240);
-		gp2x_video_flip();
 	}
+	else
+		gp2x_memset_all_buffers(0, 0, 320*240*2);
+
+	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)
+		gp2x_mode = -gp2x_mode;
+
+	gp2x_video_changemode(gp2x_mode);
+
 	Pico.m.dirtyPal = 1;
-	// reset scaling
-	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);
+
+	PicoOpt &= ~POPT_EN_SOFTSCALE;
+	if (currentConfig.scaling == EOPT_SCALE_SW)
+		PicoOpt |= POPT_EN_SOFTSCALE;
+
+	// palette converters for 8bit modes
+	make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;
 }
 
-void plat_video_toggle_renderer(void)
+void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 {
-	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;
+	int scalex = 320, scaley = 240;
+	int ln_offs = 0;
 
-	vidResetMode();
+	if (doing_bg_frame)
+		return;
 
-	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");
+	osd_fps_x = OSD_FPS_X;
+	osd_y = 232;
+
+	/* set up hwscaling here */
+	PicoOpt &= ~POPT_DIS_32C_BORDER;
+	if (is_32cols && currentConfig.scaling == EOPT_SCALE_HW) {
+		scalex = 256;
+		PicoOpt |= POPT_DIS_32C_BORDER;
+		osd_fps_x = OSD_FPS_X - 64;
+	}
+
+	if (currentConfig.vscaling == EOPT_SCALE_HW) {
+		ln_offs = start_line;
+		scaley = line_count;
+		osd_y = start_line + line_count - 8;
 	}
+
+	gp2x_video_RGB_setscaling(ln_offs, scalex, scaley);
+
+	/* line doubling */
+	if (currentConfig.vscaling == EOPT_SCALE_SW && line_count < 240) {
+		ld_lines = ld_left = line_count / (240 - line_count);
+		PicoDrawSetCallbacks(EmuScanBegin16_ld, EmuScanEnd16_ld);
+	}
+
+	// clear whole screen in all buffers
+	if (!is_16bit_mode())
+		gp2x_memset_all_buffers(0, 0xe0, 320*240);
+	else
+		gp2x_memset_all_buffers(0, 0, 320*240*2);
+}
+
+void plat_video_toggle_renderer(int change, int is_menu_call)
+{
+	change_renderer(change);
+
+	if (is_menu_call)
+		return;
+
+	vid_reset_mode();
+	rendstatus_old = -1;
+
+	if (PicoAHW & PAHW_32X)
+		emu_status_msg(renderer_names32x[get_renderer()]);
+	else
+		emu_status_msg(renderer_names[get_renderer()]);
 }
 
 #if 0 // TODO
@@ -420,11 +696,11 @@ void plat_update_volume(int has_changed, int is_up)
 			sndout_oss_setvol(vol, vol);
 			currentConfig.volume = vol;
 		}
-		plat_status_msg("VOL: %02i", vol);
+		emu_status_msg("VOL: %02i", vol);
 		prev_frame = Pico.m.frame_count;
 	}
 
-	if (need_low_volume)
+	if (!need_low_volume)
 		return;
 
 	/* set the right mixer func */
@@ -436,48 +712,68 @@ void plat_update_volume(int has_changed, int is_up)
 	}
 }
 
-
-static void updateSound(int len)
+static void oss_write_nonblocking(int len)
 {
-	if (PicoOpt&8) len<<=1;
+	// sndout_oss_can_write() is not reliable, only use with no_frmlimit
+	if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))
+		return;
 
-	/* avoid writing audio when lagging behind to prevent audio lag */
-	if (PicoSkipFrame != 2)
-		sndout_oss_write(PsndOut, len<<1);
+	sndout_oss_write_nb(PsndOut, len);
 }
 
 void pemu_sound_start(void)
 {
 	static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
-	int target_fps = Pico.m.pal ? 50 : 60;
 
 	PsndOut = NULL;
 
 	// prepare sound stuff
-	if (currentConfig.EmuOpt & 4)
+	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
 	{
-		int snd_excess_add;
-		if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||
-				((PicoOpt&0x200) && crashed_940)) {
-			PsndRerate(Pico.m.frame_count ? 1 : 0);
-		}
-		snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
-		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
-			PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
-		sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
-		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
-		PicoWriteSound = updateSound;
-		plat_update_volume(0, 0);
+		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
+		int snd_rate_oss = PsndRate;
+		gp2x_soc_t soc;
+
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
+		PicoWriteSound = oss_write_nonblocking;
+		plat_update_volume(0, 0);
+
+		printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
+			PsndRate, PsndLen, is_stereo, Pico.m.pal);
+		sndout_oss_start(snd_rate_oss, is_stereo, 1);
+		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
+
+		soc = soc_detect();
+		if (soc == SOCID_POLLUX)
+			PsndRate = pollux_get_real_snd_rate(PsndRate);
+
+		#define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)
+		if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||
+				((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {
+			PsndRerate(Pico.m.frame_count ? 1 : 0);
+		}
+
 		PsndRate_old = PsndRate;
 		PicoOpt_old  = PicoOpt;
 		pal_old = Pico.m.pal;
 	}
 }
 
+static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 };
+
 void pemu_sound_stop(void)
 {
+	int i;
+
+	/* get back from Pollux pain */
+	PsndRate += 1000;
+	for (i = 0; i < ARRAY_SIZE(sound_rates); i++) {
+		if (PsndRate >= sound_rates[i]) {
+			PsndRate = sound_rates[i];
+			break;
+		}
+	}
 }
 
 void pemu_sound_wait(void)
@@ -485,64 +781,24 @@ void pemu_sound_wait(void)
 	// don't need to do anything, writes will block by themselves
 }
 
-
-static void SkipFrame(int do_audio)
+void pemu_forced_frame(int no_scale, int do_emu)
 {
-	PicoSkipFrame=do_audio ? 1 : 2;
-	PicoFrame();
-	PicoSkipFrame=0;
-}
-
-
-void pemu_forced_frame(int opts)
-{
-	int po_old = PicoOpt;
-	int eo_old = currentConfig.EmuOpt;
-
-	PicoOpt &= ~POPT_ALT_RENDERER;
-	PicoOpt |= opts|POPT_ACC_SPRITES;
-	currentConfig.EmuOpt |= EOPT_16BPP;
-
-	PicoDrawSetColorFormat(1);
-	PicoScanBegin = EmuScanBegin16;
+	doing_bg_frame = 1;
+	PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
+	PicoDraw32xSetFrameMode(0, 0);
+	PicoDrawSetCallbacks(NULL, NULL);
 	Pico.m.dirtyPal = 1;
-	PicoFrameDrawOnly();
 
-/*
-	if (!(Pico.video.reg[12]&1)) {
-		vidCpyM2 = vidCpyM2_32col;
-		clearArea(1);
-	} else	vidCpyM2 = vidCpyM2_40col;
+	emu_cmn_forced_frame(no_scale, do_emu);
 
-	vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);
-	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-	gp2x_video_setpalette(localPal, 0x40);
-*/
-	PicoOpt = po_old;
-	currentConfig.EmuOpt = eo_old;
+	g_menubg_src_ptr = g_screen_ptr;
+	doing_bg_frame = 0;
 }
 
 void plat_debug_cat(char *str)
 {
 }
 
-static void simpleWait(int thissec, int lim_time)
-{
-	struct timeval tval;
-
-	spend_cycles(1024);
-	gettimeofday(&tval, 0);
-	if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
-
-	while (tval.tv_usec < lim_time)
-	{
-		spend_cycles(1024);
-		gettimeofday(&tval, 0);
-		if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
-	}
-}
-
-
 #if 0
 static void tga_dump(void)
 {
@@ -591,18 +847,13 @@ static void tga_dump(void)
 }
 #endif
 
-
-void pemu_loop(void)
+void pemu_loop_prep(void)
 {
-	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
-	int  frames_done,  frames_shown,  thissec; // actual frames
-	int oldmodes = 0, target_fps, target_frametime, lim_time, vsync_offset, i;
-	char *notice = 0;
+	static int gp2x_old_clock = -1, EmuOpt_old = 0, pal_old = 0;
+	static int gp2x_old_gamma = 100;
+	gp2x_soc_t soc;
 
-	printf("entered emu_Loop()\n");
+	soc = soc_detect();
 
 	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_RAM_TIMINGS) {
 		if (currentConfig.EmuOpt & EOPT_RAM_TIMINGS)
@@ -613,258 +864,52 @@ void pemu_loop(void)
 
 	if (gp2x_old_clock < 0)
 		gp2x_old_clock = default_cpu_clock;
-	if (gp2x_old_clock != currentConfig.CPUclock) {
+	if (gp2x_old_clock != currentConfig.CPUclock && gp2x_set_cpuclk != NULL) {
 		printf("changing clock to %i...", currentConfig.CPUclock); fflush(stdout);
 		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_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
+	if (gp2x_old_gamma != currentConfig.gamma || ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_A_SN_GAMMA)) {
+		set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt & EOPT_A_SN_GAMMA));
 		gp2x_old_gamma = currentConfig.gamma;
 		printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 	}
 
-	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_PSYNC) {
-		if (currentConfig.EmuOpt & EOPT_PSYNC)
+	if (((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_VSYNC) || Pico.m.pal != pal_old) {
+		if ((currentConfig.EmuOpt & EOPT_VSYNC) || soc == SOCID_POLLUX)
 			set_lcd_custom_rate(Pico.m.pal);
-		else
+		else if (EmuOpt_old & EOPT_VSYNC)
 			unset_lcd_custom_rate();
 	}
 
+	if (gp2x_dev_id == GP2X_DEV_CAANOO)
+		in_set_config_int(in_name_to_id("evdev:pollux-analog"), IN_CFG_ABS_DEAD_ZONE,
+				currentConfig.analog_deadzone);
+
 	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_MMUHACK)
 		gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK);
 
 	EmuOpt_old = currentConfig.EmuOpt;
-	fpsbuff[0] = 0;
+	pal_old = Pico.m.pal;
 
 	// make sure we are in correct mode
-	vidResetMode();
-	scaling_update();
-	Pico.m.dirtyPal = 1;
-	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
+	change_renderer(0);
+	vid_reset_mode();
 
-	// pal/ntsc might have changed, reset related stuff
-	target_fps = Pico.m.pal ? 50 : 60;
-	target_frametime = 1000000/target_fps;
-	reset_timing = 1;
+	// dirty buffers better go now than during gameplay
+	sync();
+	sleep(0);
 
 	pemu_sound_start();
-
-	// prepare CD buffer
-	if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
-
-	// calc vsync offset to sync timing code with vsync
-	if (currentConfig.EmuOpt&0x2000) {
-		gettimeofday(&tval, 0);
-		gp2x_video_wait_vsync();
-		gettimeofday(&tval, 0);
-		vsync_offset = tval.tv_usec;
-		while (vsync_offset >= target_frametime)
-			vsync_offset -= target_frametime;
-		if (!vsync_offset) vsync_offset++;
-		printf("vsync_offset: %i\n", vsync_offset);
-	} else
-		vsync_offset = 0;
-
-	frames_done = frames_shown = thissec =
-	pframes_done = pframes_shown = pthissec = 0;
-
-	// loop
-	while (engineState == PGS_Running)
-	{
-		int modes;
-
-		gettimeofday(&tval, 0);
-		if (reset_timing) {
-			reset_timing = 0;
-			pthissec = tval.tv_sec;
-			pframes_shown = pframes_done = tval.tv_usec/target_frametime;
-		}
-
-		// show notice message?
-		if (noticeMsgTime.tv_sec)
-		{
-			static int noticeMsgSum;
-			if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec
-				noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;
-				clearArea(0);
-				notice = 0;
-			} else {
-				int sum = noticeMsg[0]+noticeMsg[1]+noticeMsg[2];
-				if (sum != noticeMsgSum) { clearArea(0); noticeMsgSum = sum; }
-				notice = noticeMsg;
-			}
-		}
-
-		// check for mode changes
-		modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);
-		if (modes != oldmodes)
-		{
-			int scalex = 320;
-			osd_fps_x = OSD_FPS_X;
-			if (modes & 4) {
-				vidCpyM2 = vidCpyM2_40col;
-			} else {
-				if (PicoOpt & 0x100) {
-					vidCpyM2 = vidCpyM2_32col_nobord;
-					scalex = 256;
-					osd_fps_x = OSD_FPS_X - 64;
-				} else {
-					vidCpyM2 = vidCpyM2_32col;
-				}
-			}
-			/* 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;
-			clearArea(1);
-		}
-
-		// second changed?
-		if (thissec != tval.tv_sec)
-		{
-#ifdef BENCHMARK
-			static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
-			if (++bench == 10) {
-				bench = 0;
-				bench_fps_s = bench_fps;
-				bf[bfp++ & 3] = bench_fps;
-				bench_fps = 0;
-			}
-			bench_fps += frames_shown;
-			sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
-#else
-			if (currentConfig.EmuOpt & 2) {
-				sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
-				if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
-			}
-#endif
-			frames_shown = frames_done = 0;
-			thissec = tval.tv_sec;
-		}
-#ifdef PFRAMES
-		sprintf(fpsbuff, "%i", Pico.m.frame_count);
-#endif
-
-		if (pthissec != tval.tv_sec)
-		{
-			if (PsndOut == 0 && currentConfig.Frameskip >= 0) {
-				pframes_done = pframes_shown = 0;
-			} 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) {
-					emu_update_input();
-					SkipFrame(1); pframes_done++;
-				}
-
-				pframes_done  -= target_fps; if (pframes_done  < 0) pframes_done  = 0;
-				pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0;
-				if (pframes_shown > pframes_done) pframes_shown = pframes_done;
-			}
-			pthissec = tval.tv_sec;
-		}
-
-		lim_time = (pframes_done+1) * target_frametime + vsync_offset;
-		if (currentConfig.Frameskip >= 0) // frameskip enabled
-		{
-			for(i = 0; i < currentConfig.Frameskip; i++) {
-				emu_update_input();
-				SkipFrame(1); pframes_done++; frames_done++;
-				if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled
-					gettimeofday(&tval, 0);
-					if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;
-					if (tval.tv_usec < lim_time) { // we are too fast
-						simpleWait(pthissec, lim_time);
-					}
-				}
-				lim_time += target_frametime;
-			}
-		}
-		else if (tval.tv_usec > lim_time) // auto frameskip
-		{
-			// no time left for this frame - skip
-			if (tval.tv_usec - lim_time >= 300000) {
-				/* something caused a slowdown for us (disk access? cache flush?)
-				 * try to recover by resetting timing... */
-				reset_timing = 1;
-				continue;
-			}
-			emu_update_input();
-			SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++;
-			continue;
-		}
-
-		emu_update_input();
-		PicoFrame();
-
-		// check time
-		gettimeofday(&tval, 0);
-		if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;
-
-		if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection
-			reset_timing = 1;
-		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
-		{
-			// sleep or vsync if we are still too fast
-			// usleep sleeps for ~20ms minimum, so it is not a solution here
-			if (!reset_timing && tval.tv_usec < lim_time)
-			{
-				// we are too fast
-				if (vsync_offset) {
-					if (lim_time - tval.tv_usec > target_frametime/2)
-						simpleWait(pthissec, lim_time - target_frametime/4);
-					gp2x_video_wait_vsync();
-				} else {
-					simpleWait(pthissec, lim_time);
-				}
-			}
-		}
-
-		blit(fpsbuff, notice);
-
-		pframes_done++; pframes_shown++;
-		 frames_done++;  frames_shown++;
-	}
-
-	emu_changeFastForward(0);
-
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferFree();
-
-	// save SRAM
-	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 & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))
-		pemu_forced_frame(POPT_EN_SOFTSCALE);
 }
 
-const char *plat_get_credits(void)
+void pemu_loop_end(void)
 {
-	return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"
-		"Credits:\n"
-		"fDave: Cyclone 68000 core,\n"
-		"      base code of PicoDrive\n"
-		"Reesy & FluBBa: DrZ80 core\n"
-		"MAME devs: YM2612 and SN76496 cores\n"
-		"rlyeh and others: minimal SDK\n"
-		"Squidge: mmuhack\n"
-		"Dzz: ARM940 sample\n"
-		"GnoStiC / Puck2099: USB joy code\n"
-		"craigix: GP2X hardware\n"
-		"ketchupgun: skin design\n"
-		"\n"
-		"special thanks (for docs, ideas):\n"
-		" Charles MacDonald, Haze,\n"
-		" Stephane Dallongeville,\n"
-		" Lordus, Exophase, Rokas,\n"
-		" Nemesis, Tasco Deluxe";
+	pemu_sound_stop();
+
+	/* do one more frame for menu bg */
+	pemu_forced_frame(0, 1);
 }
+