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

diff --git a/gp2x/emu.c b/gp2x/emu.c
index e329b5a..237105a 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -16,17 +16,19 @@
 
 #include "emu.h"
 #include "gp2x.h"
-#include "usbjoy.h"
 #include "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/PicoInt.h>
-#include <Pico/Patch.h>
-#include <Pico/sound/mix.h>
+#include <pico/pico_int.h>
+#include <pico/patch.h>
+#include <pico/sound/mix.h>
 #include <zlib/zlib.h>
 
 //#define PFRAMES
@@ -38,21 +40,21 @@
 #endif
 
 
-int engineState;
 int select_exits = 0;
 
-char romFileName[PATH_MAX];
-
 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;
-char noticeMsg[64];			// notice msg to draw
 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 = 320/2, pico_pen_y = 240/2;
+
 static void emu_msg_cb(const char *msg);
 static void emu_msg_tray_open(void);
 
@@ -62,7 +64,7 @@ void emu_noticeMsgUpdated(void)
 	gettimeofday(&noticeMsgTime, 0);
 }
 
-void emu_getMainDir(char *dst, int len)
+int emu_getMainDir(char *dst, int len)
 {
 	extern char **g_argv;
 	int j;
@@ -73,6 +75,8 @@ void emu_getMainDir(char *dst, int len)
 	dst[len] = 0;
 	for (j = strlen(dst); j > 0; j--)
 		if (dst[j] == '/') { dst[j+1] = 0; break; }
+
+	return j + 1;
 }
 
 void emu_Init(void)
@@ -117,12 +121,8 @@ void emu_Deinit(void)
 		SRam.changed = 0;
 	}
 
-	if (!(currentConfig.EmuOpt & 0x20)) {
-		config_writelrom(PicoConfigFile);
-#ifndef NO_SYNC
-		sync();
-#endif
-	}
+	if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG))
+		emu_writelrom();
 
 	free(PicoDraw2FB);
 
@@ -136,8 +136,8 @@ void emu_Deinit(void)
 void emu_prepareDefaultConfig(void)
 {
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	defaultConfig.EmuOpt    = 0x1d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds
-	defaultConfig.s_PicoOpt = 0x0f | 0x20e00; // | <- use_940, cd_pcm, cd_cdda, svp drc
+	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.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0; // auto
 	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
@@ -160,44 +160,36 @@ void emu_prepareDefaultConfig(void)
 	defaultConfig.KeyBinds[22] = 1<<30; // vol down
 	defaultConfig.gamma = 100;
 	defaultConfig.scaling = 0;
-}
-
-void emu_setDefaultConfig(void)
-{
-	memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
-	PicoOpt = currentConfig.s_PicoOpt;
-	PsndRate = currentConfig.s_PsndRate;
-	PicoRegionOverride = currentConfig.s_PicoRegion;
-	PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
-	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+	defaultConfig.turbo_rate = 15;
 }
 
 void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
+	int *p, i, h, offs;
 
 	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		int *p, i, h;
-		x &= ~3; // align x
 		len = (len+3) >> 2;
 		for (h = 0; h < 8; h++) {
-			p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));
-			for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
+			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 {
-		int *p, i, h;
-		x &= ~1; // align x
 		len = (len+1) >> 1;
 		for (h = 0; h < 8; h++) {
-			p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));
-			for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;
+			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);
 	}
 }
 
-static void cd_leds(void)
+static void draw_cd_leds(void)
 {
 //	static
 	int old_reg;
@@ -208,15 +200,15 @@ static void 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 + 320*2+ 4) =
-		*(unsigned int *)((char *)gp2x_screen + 320*3+ 4) =
-		*(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g;
-		*(unsigned int *)((char *)gp2x_screen + 320*2+12) =
-		*(unsigned int *)((char *)gp2x_screen + 320*3+12) =
-		*(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r;
+		*(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;
 	} else {
 		// 16-bit modes
-		unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4);
+		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;
@@ -225,18 +217,37 @@ static void cd_leds(void)
 	}
 }
 
-static int EmuScan16(unsigned int num, void *sdata)
+static void draw_pico_ptr(void)
+{
+	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;
+
+	if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))
+		p += 32;
+
+	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;
+}
+
+static int EmuScanBegin16(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned short *) gp2x_screen + 320*(num+1);
+	DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num;
 
 	return 0;
 }
 
-static int EmuScan8(unsigned int num, void *sdata)
+static int EmuScanBegin8(unsigned int num)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
-	DrawLineDest = (unsigned char *)  gp2x_screen + 320*(num+1);
+	DrawLineDest = (unsigned char *)  g_screen_ptr + g_screen_width * num;
 
 	return 0;
 }
@@ -261,32 +272,39 @@ static void blit(const char *fps, const char *notice)
 		if (PicoRead16Hook == PicoSVPRead16)
 			memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
 		// do actual copy
-		vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
+		vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);
 	}
 	else if (!(emu_opt&0x80))
 	{
 		// 8bit accurate renderer
-		if (Pico.m.dirtyPal) {
+		if (Pico.m.dirtyPal)
+		{
+			int pallen = 0xc0;
 			Pico.m.dirtyPal = 0;
-			if(Pico.video.reg[0xC]&8) { // shadow/hilight mode
+			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);
-				localPal[0xc0] = 0x0000c000;
-				localPal[0xd0] = 0x00c00000;
-				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
-				localPal[0xf0] = 0x00ffffff;
-				gp2x_video_setpalette(localPal, 0x100);
-			} else if (rendstatus & 0x20) { // mid-frame palette changes
+				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);
-				gp2x_video_setpalette(localPal, 0xc0);
-			} else {
+			}
+			else {
 				vidConvCpyRGB32(localPal, Pico.cram, 0x40);
-				gp2x_video_setpalette(localPal, 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);
 		}
 	}
 
@@ -297,8 +315,10 @@ static void blit(const char *fps, const char *notice)
 		if (emu_opt & 2)
 			osd_text(osd_fps_x, h, fps);
 	}
-	if ((emu_opt & 0x400) && (PicoMCD & 1))
-		cd_leds();
+	if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+		draw_cd_leds();
+	if (PicoAHW & PAHW_PICO)
+		draw_pico_ptr();
 
 	//gp2x_video_wait_vsync();
 	gp2x_video_flip();
@@ -306,12 +326,12 @@ static void blit(const char *fps, const char *notice)
 	if (!(PicoOpt&0x10)) {
 		if (!(Pico.video.reg[1]&8)) {
 			if (currentConfig.EmuOpt&0x80) {
-				DrawLineDest = (unsigned short *) gp2x_screen + 320*8;
+				DrawLineDest = (unsigned short *) g_screen_ptr + 320*8;
 			} else {
-				DrawLineDest = (unsigned char  *) gp2x_screen + 320*8;
+				DrawLineDest = (unsigned char  *) g_screen_ptr + 320*8;
 			}
 		} else {
-			DrawLineDest = gp2x_screen;
+			DrawLineDest = g_screen_ptr;
 		}
 	}
 }
@@ -339,13 +359,11 @@ static void vidResetMode(void)
 	} else if (currentConfig.EmuOpt&0x80) {
 		gp2x_video_changemode(16);
 		PicoDrawSetColorFormat(1);
-		PicoScan = EmuScan16;
-		PicoScan(0, 0);
+		PicoScanBegin = EmuScanBegin16;
 	} else {
 		gp2x_video_changemode(8);
 		PicoDrawSetColorFormat(2);
-		PicoScan = EmuScan8;
-		PicoScan(0, 0);
+		PicoScanBegin = EmuScanBegin8;
 	}
 	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
 		// setup pal for 8-bit modes
@@ -371,12 +389,12 @@ static void emu_msg_cb(const char *msg)
 		// 8-bit renderers
 		gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
 		osd_text(4, 232, msg);
-		gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232, 320*232, 320*8);
+		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 *)gp2x_screen+320*232*2, 320*232*2, 320*8*2);
+		gp2x_memcpy_all_buffers((char *)g_screen_ptr+320*232*2, 320*232*2, 320*8*2);
 	}
 	gettimeofday(&noticeMsgTime, 0);
 	noticeMsgTime.tv_sec -= 2;
@@ -397,6 +415,58 @@ static void emu_msg_tray_open(void)
 	gettimeofday(&noticeMsgTime, 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);
+}
+
 static void update_volume(int has_changed, int is_up)
 {
 	static int prev_frame = 0, wait_frames = 0;
@@ -413,7 +483,7 @@ static void update_volume(int has_changed, int is_up)
 				if (vol >  0) vol--;
 			}
 			wait_frames = 0;
-			gp2x_sound_volume(vol, vol);
+			sndout_oss_setvol(vol, vol);
 			currentConfig.volume = vol;
 		}
 		sprintf(noticeMsg, "VOL: %02i", vol);
@@ -431,31 +501,6 @@ static void update_volume(int has_changed, int is_up)
 	}
 }
 
-static void change_fast_forward(int set_on)
-{
-	static void *set_PsndOut = NULL;
-	static int set_Frameskip, set_EmuOpt, is_on = 0;
-
-	if (set_on && !is_on) {
-		set_PsndOut = PsndOut;
-		set_Frameskip = currentConfig.Frameskip;
-		set_EmuOpt = currentConfig.EmuOpt;
-		PsndOut = NULL;
-		currentConfig.Frameskip = 8;
-		currentConfig.EmuOpt &= ~4;
-		is_on = 1;
-	}
-	else if (!set_on && is_on) {
-		PsndOut = set_PsndOut;
-		currentConfig.Frameskip = set_Frameskip;
-		currentConfig.EmuOpt = set_EmuOpt;
-		PsndRerate(1);
-		update_volume(0, 0);
-		reset_timing = 1;
-		is_on = 0;
-	}
-}
-
 static void RunEvents(unsigned int which)
 {
 	if (which & 0x1800) // save or load (but not both)
@@ -466,15 +511,17 @@ static void RunEvents(unsigned int which)
 				 (!(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)) )
+			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(gp2x_screen, 0, 320*240*2);
+			gp2x_memcpy_all_buffers(g_screen_ptr, 0, 320*240*2);
 			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
 			PicoStateProgressCB = NULL;
 		}
@@ -516,25 +563,25 @@ static void RunEvents(unsigned int which)
 	}
 }
 
-
 static void updateKeys(void)
 {
-	unsigned long keys, allActions[2] = { 0, 0 }, events;
-	static unsigned long prevEvents = 0;
-	int joy, i;
+	unsigned int keys, keys2, allActions[2] = { 0, 0 }, events;
+	static unsigned int prevEvents = 0;
 
 	keys = gp2x_joystick_read(0);
-	if (keys & GP2X_SELECT) {
+	if (keys & GP2X_SELECT)
 		engineState = select_exits ? PGS_Quit : PGS_Menu;
-		// wait until select is released, so menu would not resume game
-		while (gp2x_joystick_read(1) & GP2X_SELECT) usleep(50*1000);
-	}
 
 	keys &= CONFIGURABLE_KEYS;
+	keys2 = keys;
 
+#if 1
+	/* FIXME: combos, player2 */
+	allActions[0] = in_update();
+#else
 	for (i = 0; i < 32; i++)
 	{
-		if (keys & (1 << i))
+		if (keys2 & (1 << i))
 		{
 			int pl, acts = currentConfig.KeyBinds[i];
 			if (!acts) continue;
@@ -545,9 +592,9 @@ static void updateKeys(void)
 				// let's try to find the other one
 				if (acts_c) {
 					for (; u < 32; u++)
-						if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
+						if ( (keys2 & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
 							allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
-							keys &= ~((1 << i) | (1 << u));
+							keys2 &= ~((1 << i) | (1 << u));
 							break;
 						}
 				}
@@ -559,25 +606,13 @@ static void updateKeys(void)
 			}
 		}
 	}
+#endif
 
-	// add joy inputs
-	if (num_of_joys > 0)
-	{
-		gp2x_usbjoy_update();
-		for (joy = 0; joy < num_of_joys; joy++) {
-			int keys = gp2x_usbjoy_check2(joy);
-			for (i = 0; i < 32; i++) {
-				if (keys & (1 << i)) {
-					int acts = currentConfig.JoyBinds[joy][i];
-					int pl = (acts >> 16) & 1;
-					allActions[pl] |= acts;
-				}
-			}
-		}
-	}
+	PicoPad[0] = allActions[0] & 0xfff;
+	PicoPad[1] = allActions[1] & 0xfff;
 
-	PicoPad[0] = (unsigned short) allActions[0];
-	PicoPad[1] = (unsigned short) allActions[1];
+	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;
 
@@ -585,10 +620,16 @@ static void updateKeys(void)
 	if (events & 0x6000)
 		update_volume(1, events & 0x2000);
 
-	if ((events ^ prevEvents) & 0x40)
-		change_fast_forward(events & 0x40);
+	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();
 
@@ -602,7 +643,47 @@ static void updateSound(int len)
 
 	/* avoid writing audio when lagging behind to prevent audio lag */
 	if (PicoSkipFrame != 2)
-		gp2x_sound_write(PsndOut, len<<1);
+		sndout_oss_write(PsndOut, len<<1);
+}
+
+void emu_startSound(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)
+	{
+		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;
+		update_volume(0, 0);
+		memset(sndBuffer, 0, sizeof(sndBuffer));
+		PsndOut = sndBuffer;
+		PsndRate_old = PsndRate;
+		PicoOpt_old  = PicoOpt;
+		pal_old = Pico.m.pal;
+	}
+}
+
+void emu_endSound(void)
+{
+}
+
+/* wait until we can write more sound */
+void emu_waitSound(void)
+{
+	// don't need to do anything, writes will block by themselves
 }
 
 
@@ -614,19 +695,18 @@ static void SkipFrame(int do_audio)
 }
 
 
-void emu_forcedFrame(void)
+void emu_forcedFrame(int opts)
 {
 	int po_old = PicoOpt;
 	int eo_old = currentConfig.EmuOpt;
 
-	PicoOpt &= ~0x0010;
-	PicoOpt |=  0x4080; // soft_scale | acc_sprites
+	PicoOpt &= ~0x10;
+	PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites
 	currentConfig.EmuOpt |= 0x80;
 
 	//vidResetMode();
 	PicoDrawSetColorFormat(1);
-	PicoScan = EmuScan16;
-	PicoScan(0, 0);
+	PicoScanBegin = EmuScanBegin16;
 	Pico.m.dirtyPal = 1;
 	PicoFrameDrawOnly();
 
@@ -636,7 +716,7 @@ void emu_forcedFrame(void)
 		clearArea(1);
 	} else	vidCpyM2 = vidCpyM2_40col;
 
-	vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
+	vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);
 	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 	gp2x_video_setpalette(localPal, 0x40);
 */
@@ -644,6 +724,11 @@ void emu_forcedFrame(void)
 	currentConfig.EmuOpt = eo_old;
 }
 
+void emu_platformDebugCat(char *str)
+{
+	// nothing
+}
+
 static void simpleWait(int thissec, int lim_time)
 {
 	struct timeval tval;
@@ -694,11 +779,11 @@ static void tga_dump(void)
 #define CONV(X) (((X>>1)&0x7fe0)|(X&0x1f)) // 555?
 
 	for (i = 0; i < 320*240; i++)
-		if(oldscr[i] != CONV(((unsigned short *)gp2x_screen)[i])) break;
+		if(oldscr[i] != CONV(((unsigned short *)g_screen_ptr)[i])) break;
 	if (i < 320*240)
 	{
 		for (i = 0; i < 320*240; i++)
-			oldscr[i] = CONV(((unsigned short *)gp2x_screen)[i]);
+			oldscr[i] = CONV(((unsigned short *)g_screen_ptr)[i]);
 		sprintf(name, "%05i.tga", Pico.m.frame_count);
 		f = fopen(name, "wb");
 		if (!f) { printf("!f\n"); exit(1); }
@@ -712,8 +797,7 @@ static void tga_dump(void)
 
 void emu_Loop(void)
 {
-	static int gp2x_old_clock = 200;
-	static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;
+	static int gp2x_old_clock = 200, 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
@@ -757,32 +841,10 @@ void emu_Loop(void)
 	target_frametime = 1000000/target_fps;
 	reset_timing = 1;
 
-	// prepare sound stuff
-	if (currentConfig.EmuOpt & 4)
-	{
-		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);
-		gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
-		gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
-		PicoWriteSound = updateSound;
-		update_volume(0, 0);
-		memset(sndBuffer, 0, sizeof(sndBuffer));
-		PsndOut = sndBuffer;
-		PsndRate_old = PsndRate;
-		PicoOpt_old  = PicoOpt;
-		pal_old = Pico.m.pal;
-	} else {
-		PsndOut = NULL;
-	}
+	emu_startSound();
 
 	// prepare CD buffer
-	if (PicoMCD & 1) PicoCDBufferInit();
+	if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
 
 	// calc vsync offset to sync timing code with vsync
 	if (currentConfig.EmuOpt&0x2000) {
@@ -865,9 +927,10 @@ void emu_Loop(void)
 			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)
+			if (currentConfig.EmuOpt & 2) {
 				sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
-			if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
+				if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
+			}
 #endif
 			frames_shown = frames_done = 0;
 			thissec = tval.tv_sec;
@@ -957,9 +1020,9 @@ void emu_Loop(void)
 		 frames_done++;  frames_shown++;
 	}
 
-	change_fast_forward(0);
+	emu_changeFastForward(0);
 
-	if (PicoMCD & 1) PicoCDBufferFree();
+	if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
@@ -970,13 +1033,34 @@ void emu_Loop(void)
 
 	// if in 8bit mode, generate 16bit image for menu background
 	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
-		emu_forcedFrame();
+		emu_forcedFrame(POPT_EN_SOFTSCALE);
 }
 
 
 void emu_ResetGame(void)
 {
-	PicoReset(0);
+	PicoReset();
 	reset_timing = 1;
 }
 
+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: squidgehack\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";
+}