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

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 92e5b74..df9faac 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -1,19 +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 <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"
 
@@ -22,8 +33,6 @@
 #include <pico/sound/mix.h>
 #include <zlib/zlib.h>
 
-//#define PFRAMES
-
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
 #else
@@ -36,67 +45,78 @@ extern int crashed_940;
 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;
+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];
 
-int plat_get_root_dir(char *dst, int len)
+
+void pemu_prep_defconfig(void)
 {
-	extern char **g_argv;
-	int j;
+	gp2x_soc_t soc;
 
-	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; }
+	defaultConfig.CPUclock = default_cpu_clock;
+	defaultConfig.renderer32x = RT_8BIT_FAST;
+	defaultConfig.analog_deadzone = 50;
 
-	return j + 1;
+	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;
+	}
 }
 
-
-static void scaling_update(void)
+void pemu_validate_config(void)
 {
-	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;
-	}
+	if (gp2x_dev_id != GP2X_DEV_GP2X)
+		PicoOpt &= ~POPT_EXT_FM;
+	if (gp2x_dev_id != GP2X_DEV_WIZ)
+		currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;
+
+	if (currentConfig.gamma < 10 || currentConfig.gamma > 300)
+		currentConfig.gamma = 100;
+
+	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;
+}
 
-void pemu_prep_defconfig(void)
+static void change_renderer(int diff)
 {
-	gp2x_soc_t soc;
+	int *r;
+	if (PicoAHW & PAHW_32X)
+		r = &currentConfig.renderer32x;
+	else
+		r = &currentConfig.renderer;
+	*r += diff;
 
-	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_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;
+	// 8bpp fast is not there (yet?)
+	if ((PicoAHW & PAHW_SMS) && *r == RT_8BIT_FAST)
+		(*r)++;
 
-	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;
+	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))
+
 static void (*osd_text)(int x, int y, const char *text);
 
 static void osd_text8(int x, int y, const char *text)
@@ -170,7 +190,7 @@ static void draw_cd_leds(void)
 		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 *px = (unsigned int *)((char *)g_screen_ptr + scr_offs);
@@ -197,7 +217,7 @@ static void draw_pico_ptr(void)
 	int x, y, pitch = 320;
 
 	// only if pen enabled and for 16bit modes
-	if (pico_inp_mode == 0 || (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))
+	if (pico_inp_mode == 0 || currentConfig.EmuOpt != RT_16BIT)
 		return;
 
 	x = pico_pen_x + PICO_PEN_ADJUST_X;
@@ -218,22 +238,6 @@ static void draw_pico_ptr(void)
 	p[pitch*2] ^= 0xffff;
 }
 
-static int EmuScanBegin16(unsigned int num)
-{
-	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num;
-
-	return 0;
-}
-
-static int EmuScanBegin8(unsigned int num)
-{
-	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned char *)  g_screen_ptr + g_screen_width * num;
-
-	return 0;
-}
-
 /* rot thing for Wiz */
 static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];
 
@@ -247,8 +251,6 @@ static int EmuScanEnd16_rot(unsigned int num)
 {
 	if ((num & 3) != 3)
 		return 0;
-	if (!(Pico.video.reg[1] & 8))
-		num += 8;
 	rotated_blit16(g_screen_ptr, rot_buff, num + 1,
 		!(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));
 	return 0;
@@ -264,85 +266,150 @@ static int EmuScanEnd8_rot(unsigned int num)
 {
 	if ((num & 3) != 3)
 		return 0;
-	if (!(Pico.video.reg[1] & 8))
-		num += 8;
 	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, int m32col, int with_32c_border) = NULL;
+/* line doublers */
+static unsigned int ld_counter;
+static int ld_left, ld_lines;
 
-void pemu_update_display(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(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 (is_16bit_mode())
+		stride *= 2;
+	PicoDrawSetOutBuf(g_screen_ptr, stride);
 }
 
 /* XXX */
@@ -379,7 +446,7 @@ void plat_video_wait_vsync(void)
 
 void plat_status_msg_clear(void)
 {
-	int is_8bit = (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP);
+	int is_8bit = !is_16bit_mode();
 	if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
 		/* ugh.. */
 		int i, u, *p;
@@ -408,7 +475,8 @@ void plat_status_msg_clear(void)
 void plat_status_msg_busy_next(const char *msg)
 {
 	plat_status_msg_clear();
-	pemu_update_display("", msg);
+	pemu_finalize_frame("", msg);
+	plat_video_flip();
 	emu_status_msg("");
 
 	/* assumption: msg_busy_next gets called only when
@@ -422,50 +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)
 {
-	PicoScanEnd = NULL;
+	int gp2x_mode = 16;
+	int renderer = get_renderer();
 
-	if (PicoOpt & POPT_ALT_RENDERER) {
-		if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
-			gp2x_video_changemode(-8);
-			vidcpyM2 = vidcpy_m2_rot;
-			osd_text = osd_text8_rot;
-		} else {
-			gp2x_video_changemode(8);
-			vidcpyM2 = vidcpy_m2;
-			osd_text = osd_text8;
-		}
+	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;
 	}
-	else if (currentConfig.EmuOpt & EOPT_16BPP) {
-		PicoDrawSetColorFormat(1);
-		PicoDrawSetColorFormatMode4(1);
-		if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
-			gp2x_video_changemode(-16);
-			PicoScanBegin = EmuScanBegin16_rot;
-			PicoScanEnd = EmuScanEnd16_rot;
-			osd_text = osd_text16_rot;
-		} else {
-			gp2x_video_changemode(16);
-			PicoScanBegin = EmuScanBegin16;
-			osd_text = osd_text16;
+
+	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;
 	}
-	else {
-		PicoDrawSetColorFormat(2);
-		if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
-			gp2x_video_changemode(-8);
-			PicoScanBegin = EmuScanBegin8_rot;
-			PicoScanEnd = EmuScanEnd8_rot;
-			osd_text = osd_text8_rot;
-		} else {
-			gp2x_video_changemode(8);
-			PicoScanBegin = EmuScanBegin8;
-			osd_text = osd_text8;
+
+	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;
 	}
 
-	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {
+	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;
@@ -473,46 +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(int is_next, int is_menu)
+void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 {
-	/* alt, 16bpp, 8bpp */
-	if (PicoOpt & POPT_ALT_RENDERER) {
-		PicoOpt &= ~POPT_ALT_RENDERER;
-		if (is_next)
-			currentConfig.EmuOpt |= EOPT_16BPP;
-	} else if (!(currentConfig.EmuOpt & EOPT_16BPP)) {
-		if (is_next)
-			PicoOpt |= POPT_ALT_RENDERER;
-		else
-			currentConfig.EmuOpt |= EOPT_16BPP;
-	} else {
-		currentConfig.EmuOpt &= ~EOPT_16BPP;
-		if (!is_next)
-			PicoOpt |= POPT_ALT_RENDERER;
-	}
+	int scalex = 320, scaley = 240;
+	int ln_offs = 0;
 
-	if (is_menu)
+	if (doing_bg_frame)
 		return;
 
-	vidResetMode();
+	osd_fps_x = OSD_FPS_X;
+	osd_y = 232;
 
-	if (PicoOpt & POPT_ALT_RENDERER) {
-		emu_status_msg(" 8bit fast renderer");
-	} else if (currentConfig.EmuOpt & EOPT_16BPP) {
-		emu_status_msg("16bit accurate renderer");
-	} else {
-		emu_status_msg(" 8bit accurate renderer");
+	/* 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
@@ -589,18 +712,13 @@ void plat_update_volume(int has_changed, int is_up)
 	}
 }
 
-static void updateSound(int len)
+static void oss_write_nonblocking(int len)
 {
-	len <<= 1;
-	if (PicoOpt & POPT_EN_STEREO)
-		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);
+	sndout_oss_write_nb(PsndOut, len);
 }
 
 void pemu_sound_start(void)
@@ -613,21 +731,22 @@ void pemu_sound_start(void)
 	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
 	{
 		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
-		int target_fps = Pico.m.pal ? 50 : 60;
-		int frame_samples, snd_excess_add;
 		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) {
-			/* POLLUX pain: DPLL1 / mclk_div / bitclk_div / 4 */
-			switch (PsndRate) {
-			case 44100: PsndRate = 44171; break; // 44170.673077
-			case 22050: PsndRate = 22086; break; // 22085.336538
-			case 11025: PsndRate = 11043; break; // 11042.668269
-			default: break;
-			}
-		}
+		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) ||
@@ -635,40 +754,25 @@ void pemu_sound_start(void)
 			PsndRerate(Pico.m.frame_count ? 1 : 0);
 		}
 
-		memset(sndBuffer, 0, sizeof(sndBuffer));
-		PsndOut = sndBuffer;
-		PicoWriteSound = updateSound;
 		PsndRate_old = PsndRate;
 		PicoOpt_old  = PicoOpt;
 		pal_old = Pico.m.pal;
-		plat_update_volume(0, 0);
-
-		frame_samples = PsndLen;
-		snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
-		if (snd_excess_add != 0)
-			frame_samples++;
-		if (soc == SOCID_POLLUX)
-			frame_samples *= 2;	/* force larger buffer */
-
-		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
-			PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
-		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
-		sndout_oss_start(snd_rate_oss, frame_samples, is_stereo);
-
-		/* Wiz's sound hardware needs more prebuffer */
-		if (soc == SOCID_POLLUX)
-			updateSound(frame_samples);
 	}
 }
 
+static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 };
+
 void pemu_sound_stop(void)
 {
-	/* get back from Wiz pain */
-	switch (PsndRate) {
-		case 44171: PsndRate = 44100; break;
-		case 22086: PsndRate = 22050; break;
-		case 11043: PsndRate = 11025; break;
-		default: break;
+	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;
+		}
 	}
 }
 
@@ -677,49 +781,22 @@ void pemu_sound_wait(void)
 	// don't need to do anything, writes will block by themselves
 }
 
-
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int no_scale, int do_emu)
 {
-	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;
-	PicoScanEnd = NULL;
+	doing_bg_frame = 1;
+	PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
+	PicoDraw32xSetFrameMode(0, 0);
+	PicoDrawSetCallbacks(NULL, NULL);
 	Pico.m.dirtyPal = 1;
-	PicoFrameDrawOnly();
 
-	PicoOpt = po_old;
-	currentConfig.EmuOpt = eo_old;
-}
+	emu_cmn_forced_frame(no_scale, do_emu);
 
-void plat_debug_cat(char *str)
-{
+	g_menubg_src_ptr = g_screen_ptr;
+	doing_bg_frame = 0;
 }
 
-void pemu_video_mode_change(int is_32col, int is_240_lines)
+void plat_debug_cat(char *str)
 {
-	int scalex = 320;
-	osd_fps_x = OSD_FPS_X;
-	if (is_32col && (PicoOpt & POPT_DIS_32C_BORDER)) {
-		scalex = 256;
-		osd_fps_x = OSD_FPS_X - 64;
-	}
-	/* want vertical scaling and game is not in 240 line mode */
-	if (currentConfig.scaling == EOPT_SCALE_HW_HV && !is_240_lines)
-		gp2x_video_RGB_setscaling(8, scalex, 224);
-	else
-		gp2x_video_RGB_setscaling(0, scalex, 240);
-
-	// clear whole screen in all buffers
-	if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))
-		gp2x_memset_all_buffers(0, 0xe0, 320*240);
-	else
-		gp2x_memset_all_buffers(0, 0, 320*240*2);
 }
 
 #if 0
@@ -787,7 +864,7 @@ void pemu_loop_prep(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;
@@ -807,6 +884,10 @@ void pemu_loop_prep(void)
 			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);
 
@@ -814,52 +895,21 @@ void pemu_loop_prep(void)
 	pal_old = Pico.m.pal;
 
 	// make sure we are in correct mode
-	vidResetMode();
-	scaling_update();
+	change_renderer(0);
+	vid_reset_mode();
+
+	// dirty buffers better go now than during gameplay
+	sync();
+	sleep(0);
 
 	pemu_sound_start();
 }
 
 void pemu_loop_end(void)
 {
-	int po_old = PicoOpt;
-	int eo_old = currentConfig.EmuOpt;
-
 	pemu_sound_stop();
 
 	/* do one more frame for menu bg */
-	PicoOpt &= ~POPT_ALT_RENDERER;
-	PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;
-	currentConfig.EmuOpt |= EOPT_16BPP;
-
-	PicoScanBegin = EmuScanBegin16;
-	PicoScanEnd = NULL;
-	PicoDrawSetColorFormat(1);
-	Pico.m.dirtyPal = 1;
-	PicoFrame();
-
-	PicoOpt = po_old;
-	currentConfig.EmuOpt = eo_old;
-}
-
-const char *plat_get_credits(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_forced_frame(0, 1);
 }
+