X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=41187c5d708596db2745b18be6dcb2b2e10d1625;hb=9d917eea21607c7c239d4b0cd850d660c0c8e4c5;hp=f3b4c02a118673a1fc8dbb35c10b08aaea5cd06a;hpb=4696954094ca11200b8b08e8a9bfb231cf21fb86;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index f3b4c02..41187c5 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006-2007 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -18,13 +18,16 @@
 #include "gp2x.h"
 #include "usbjoy.h"
 #include "menu.h"
-#include "asmutils.h"
+#include "../common/arm_utils.h"
+#include "../common/fonts.h"
+#include "../common/emu.h"
 #include "cpuctrl.h"
 
 #include <Pico/PicoInt.h>
 #include <Pico/Patch.h>
 #include <zlib/zlib.h>
 
+//#define PFRAMES
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
@@ -32,369 +35,52 @@
 #define OSD_FPS_X 260
 #endif
 
-// PicoPad[] format: SACB RLDU
-char *actionNames[] = {
-	"UP", "DOWN", "LEFT", "RIGHT", "B", "C", "A", "START",
-	0, 0, 0, 0, 0, 0, 0, 0, // Z, Y, X, MODE (enabled only when needed), ?, ?, ?, ?
-	0, 0, 0, 0, 0, 0, 0, "ENTER MENU", // player2_flag, ?, ?, ?, ?, ?, ?, menu
-	"NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",
-	"LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
-};
 
 int engineState;
 int select_exits = 0;
-char *PicoConfigFile = "picoconfig.bin";
-currentConfig_t currentConfig;
 
 char romFileName[PATH_MAX];
-unsigned char *rom_data = NULL;
 
 extern int crashed_940;
 
 static short sndBuffer[2*44100/50];
-static char noticeMsg[64];					// notice msg to draw
 static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
 static int osd_fps_x;
 static int combo_keys = 0, combo_acts = 0;	// keys and actions which need button combos
 static int gp2x_old_gamma = 100;
-static unsigned char *movie_data = NULL;
-static int movie_size = 0;
-unsigned char *framebuff = 0;  // temporary buffer for alt renderer
-int state_slot = 0;
+char noticeMsg[64];			// notice msg to draw
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 int reset_timing = 0;
 
+static void emu_msg_cb(const char *msg);
+static void emu_msg_tray_open(void);
 
-// utilities
-static void strlwr(char* string)
-{
-	while ( (*string++ = (char)tolower(*string)) );
-}
-
-static int try_rfn_cut(void)
-{
-	FILE *tmp;
-	char *p;
-
-	p = romFileName + strlen(romFileName) - 1;
-	for (; p > romFileName; p--)
-		if (*p == '.') break;
-	*p = 0;
-
-	if((tmp = fopen(romFileName, "rb"))) {
-		fclose(tmp);
-		return 1;
-	}
-	return 0;
-}
-
-static void get_ext(char *file, char *ext)
-{
-	char *p;
-
-	p = file + strlen(file) - 4;
-	if (p < file) p = file;
-	strncpy(ext, p, 4);
-	ext[4] = 0;
-	strlwr(ext);
-}
-
-char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };
-char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };
-char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };
-
-extern char **g_argv;
 
-int find_bios(int region, char **bios_file)
+void emu_noticeMsgUpdated(void)
 {
-	static char bios_path[1024];
-	int i, j, count;
-	char **files;
-	FILE *f = NULL;
-
-	if (region == 4) { // US
-		files = biosfiles_us;
-		count = sizeof(biosfiles_us) / sizeof(char *);
-	} else if (region == 8) { // EU
-		files = biosfiles_eu;
-		count = sizeof(biosfiles_eu) / sizeof(char *);
-	} else if (region == 1 || region == 2) {
-		files = biosfiles_jp;
-		count = sizeof(biosfiles_jp) / sizeof(char *);
-	} else {
-		return 0;
-	}
-
-	for (i = 0; i < count; i++)
-	{
-		strncpy(bios_path, g_argv[0], 1023);
-		bios_path[1024-32] = 0;
-		for (j = strlen(bios_path); j > 0; j--)
-			if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }
-		strcat(bios_path, files[i]);
-		strcat(bios_path, ".bin");
-		f = fopen(bios_path, "rb");
-		if (f) break;
-
-		bios_path[strlen(bios_path) - 4] = 0;
-		strcat(bios_path, ".zip");
-		f = fopen(bios_path, "rb");
-		if (f) break;
-	}
-
-	if (f) {
-		printf("using bios: %s\n", bios_path);
-		fclose(f);
-		if (bios_file) *bios_file = bios_path;
-		return 1;
-	} else {
-		sprintf(menuErrorMsg, "no %s BIOS files found, read docs",
-			region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-		printf("%s\n", menuErrorMsg);
-		return 0;
-	}
-}
-
-/* checks if romFileName points to valid MegaCD image
- * if so, checks for suitable BIOS */
-int emu_cd_check(char **bios_file)
-{
-	unsigned char buf[32];
-	pm_file *cd_f;
-	int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
-
-	cd_f = pm_open(romFileName);
-	if (!cd_f) return 0; // let the upper level handle this
-
-	if (pm_read(buf, 32, cd_f) != 32) {
-		pm_close(cd_f);
-		return 0;
-	}
-
-	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)
-	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)
-	if (type == 0) {
-		pm_close(cd_f);
-		return 0;
-	}
-
-	/* it seems we have a CD image here. Try to detect region now.. */
-	pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);
-	pm_read(buf, 1, cd_f);
-	pm_close(cd_f);
-
-	if (buf[0] == 0x64) region = 8; // EU
-	if (buf[0] == 0xa1) region = 1; // JAP
-
-	printf("detected %s Sega/Mega CD image with %s region\n",
-		type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-
-	if (PicoRegionOverride) {
-		region = PicoRegionOverride;
-		printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-	}
-
-	if (bios_file == NULL) return type;
-
-	if (find_bios(region, bios_file))
-		 return type;	// CD and BIOS detected
-
-	return -1;     		// CD detected but load failed
+	gettimeofday(&noticeMsgTime, 0);
 }
 
-int emu_ReloadRom(void)
+void emu_getMainDir(char *dst, int len)
 {
-	unsigned int rom_size = 0;
-	char *used_rom_name = romFileName;
-	char ext[5];
-	pm_file *rom;
-	int ret, cd_state;
-
-	printf("emu_ReloadRom(%s)\n", romFileName);
-
-	get_ext(romFileName, ext);
-
-	// detect wrong extensions
-	if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz
-		sprintf(menuErrorMsg, "Not a ROM selected.");
-		return 0;
-	}
-
-	PicoPatchUnload();
-
-	// check for movie file
-	if(movie_data) {
-		free(movie_data);
-		movie_data = 0;
-	}
-	if(!strcmp(ext, ".gmv")) {
-		// check for both gmv and rom
-		int dummy;
-		FILE *movie_file = fopen(romFileName, "rb");
-		if(!movie_file) {
-			sprintf(menuErrorMsg, "Failed to open movie.");
-			return 0;
-		}
-		fseek(movie_file, 0, SEEK_END);
-		movie_size = ftell(movie_file);
-		fseek(movie_file, 0, SEEK_SET);
-		if(movie_size < 64+3) {
-			sprintf(menuErrorMsg, "Invalid GMV file.");
-			fclose(movie_file);
-			return 0;
-		}
-		movie_data = malloc(movie_size);
-		if(movie_data == NULL) {
-			sprintf(menuErrorMsg, "low memory.");
-			fclose(movie_file);
-			return 0;
-		}
-		fread(movie_data, 1, movie_size, movie_file);
-		fclose(movie_file);
-		if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {
-			sprintf(menuErrorMsg, "Invalid GMV file.");
-			return 0;
-		}
-		dummy = try_rfn_cut() || try_rfn_cut();
-		if (!dummy) {
-			sprintf(menuErrorMsg, "Could't find a ROM for movie.");
-			return 0;
-		}
-		get_ext(romFileName, ext);
-	}
-	else if (!strcmp(ext, ".pat")) {
-		int dummy;
-		PicoPatchLoad(romFileName);
-		dummy = try_rfn_cut() || try_rfn_cut();
-		if (!dummy) {
-			sprintf(menuErrorMsg, "Could't find a ROM to patch.");
-			return 0;
-		}
-		get_ext(romFileName, ext);
-	}
-
-	if ((PicoMCD & 1) && Pico_mcd != NULL)
-		Stop_CD();
-
-	// check for MegaCD image
-	cd_state = emu_cd_check(&used_rom_name);
-	if (cd_state > 0) {
-		PicoMCD |= 1;
-		get_ext(used_rom_name, ext);
-	} else if (cd_state == -1) {
-		// bios_help() ?
-		return 0;
-	} else {
-		if (PicoMCD & 1) PicoExitMCD();
-		PicoMCD &= ~1;
-	}
-
-	rom = pm_open(used_rom_name);
-	if(!rom) {
-		sprintf(menuErrorMsg, "Failed to open rom.");
-		return 0;
-	}
-
-	if(rom_data) {
-		free(rom_data);
-		rom_data = 0;
-		rom_size = 0;
-	}
-
-	if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {
-		sprintf(menuErrorMsg, "PicoCartLoad() failed.");
-		printf("%s\n", menuErrorMsg);
-		pm_close(rom);
-		return 0;
-	}
-	pm_close(rom);
-
-	// detect wrong files (Pico crashes on very small files), also see if ROM EP is good
-	if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||
-	  ((*(unsigned short *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {
-		if (rom_data) free(rom_data);
-		rom_data = 0;
-		sprintf(menuErrorMsg, "Not a ROM selected.");
-		return 0;
-	}
+	extern char **g_argv;
+	int j;
 
-	// load config for this ROM (do this before insert to get correct region)
-	ret = emu_ReadConfig(1);
-	if (!ret)
-		emu_ReadConfig(0);
-
-	printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
-	if(PicoCartInsert(rom_data, rom_size)) {
-		sprintf(menuErrorMsg, "Failed to load ROM.");
-		return 0;
-	}
-
-	Pico.m.frame_count = 0;
-
-	// insert CD if it was detected
-	if (cd_state > 0) {
-		ret = Insert_CD(romFileName, cd_state == 2);
-		if (ret != 0) {
-			sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
-			printf("%s\n", menuErrorMsg);
-			return 0;
-		}
-	}
-
-	// emu_ReadConfig() might have messed currentConfig.lastRomFile
-	strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
-	currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
-
-	if (PicoPatches) {
-		PicoPatchPrepare();
-		PicoPatchApply();
-	}
-
-	// additional movie stuff
-	if(movie_data) {
-		if(movie_data[0x14] == '6')
-		     PicoOpt |=  0x20; // 6 button pad
-		else PicoOpt &= ~0x20;
-		PicoOpt |= 0x40; // accurate timing
-		if(movie_data[0xF] >= 'A') {
-			if(movie_data[0x16] & 0x80) {
-				PicoRegionOverride = 8;
-			} else {
-				PicoRegionOverride = 4;
-			}
-			PicoReset(0);
-			// TODO: bits 6 & 5
-		}
-		movie_data[0x18+30] = 0;
-		sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);
-	}
-	else
-	{
-		if(Pico.m.pal) {
-			strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");
-		} else {
-			strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");
-		}
-	}
-	gettimeofday(&noticeMsgTime, 0);
-
-	// load SRAM for this ROM
-	if(currentConfig.EmuOpt & 1)
-		emu_SaveLoadGame(1, 1);
-
-	return 1;
+	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; }
 }
 
-
-static void emu_msg_cb(const char *msg);
-static void emu_msg_tray_open(void);
-
 void emu_Init(void)
 {
 	// make temp buffer for alt renderer
-	framebuff = malloc((8+320)*(8+240+8));
-	if (!framebuff)
+	PicoDraw2FB = malloc((8+320)*(8+240+8));
+	if (!PicoDraw2FB)
 	{
-		printf("framebuff == 0\n");
+		printf("PicoDraw2FB == 0\n");
 	}
 
 	// make dirs for saves, cfgs, etc.
@@ -410,25 +96,6 @@ void emu_Init(void)
 }
 
 
-static void romfname_ext(char *dst, const char *prefix, const char *ext)
-{
-	char *p;
-	int prefix_len = 0;
-
-	// make save filename
-	for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;
-	*dst = 0;
-	if (prefix) {
-		strcpy(dst, prefix);
-		prefix_len = strlen(prefix);
-	}
-	strncpy(dst + prefix_len, p, 511-prefix_len);
-	dst[511-8] = 0;
-	if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
-	if (ext) strcat(dst, ext);
-}
-
-
 static void find_combos(void)
 {
 	int act, u;
@@ -438,7 +105,7 @@ static void find_combos(void)
 	for (act = 0; act < 32; act++)
 	{
 		int keyc = 0;
-		if (act == 16) continue; // player2 flag
+		if (act == 16 || act == 17) continue; // player2 flag
 		for (u = 0; u < 32; u++)
 		{
 			if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
@@ -459,7 +126,7 @@ static void find_combos(void)
 }
 
 
-void scaling_update(void)
+static void scaling_update(void)
 {
 	PicoOpt &= ~0x4100;
 	switch (currentConfig.scaling) {
@@ -471,117 +138,6 @@ void scaling_update(void)
 }
 
 
-int emu_ReadConfig(int game)
-{
-	FILE *f;
-	char cfg[512];
-	int bread = 0;
-
-	if (!game)
-	{
-		// set default config
-		memset(&currentConfig, 0, sizeof(currentConfig));
-		currentConfig.lastRomFile[0] = 0;
-		currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds
-		currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda
-		currentConfig.PsndRate = 22050; // 44100;
-		currentConfig.PicoRegion = 0; // auto
-		currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
-		currentConfig.Frameskip = -1; // auto
-		currentConfig.CPUclock = 200;
-		currentConfig.volume = 50;
-		currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU
-		currentConfig.KeyBinds[ 4] = 1<<1;
-		currentConfig.KeyBinds[ 2] = 1<<2;
-		currentConfig.KeyBinds[ 6] = 1<<3;
-		currentConfig.KeyBinds[14] = 1<<4;
-		currentConfig.KeyBinds[13] = 1<<5;
-		currentConfig.KeyBinds[12] = 1<<6;
-		currentConfig.KeyBinds[ 8] = 1<<7;
-		currentConfig.KeyBinds[15] = 1<<26; // switch rend
-		currentConfig.KeyBinds[10] = 1<<27; // save state
-		currentConfig.KeyBinds[11] = 1<<28; // load state
-		currentConfig.KeyBinds[23] = 1<<29; // vol up
-		currentConfig.KeyBinds[22] = 1<<30; // vol down
-		currentConfig.gamma = 100;
-		currentConfig.PicoCDBuffers = 64;
-		currentConfig.scaling = 0;
-		strncpy(cfg, PicoConfigFile, 511);
-		cfg[511] = 0;
-	} else {
-		romfname_ext(cfg, "cfg/", ".pbcfg");
-		f = fopen(cfg, "rb");
-		if (!f) romfname_ext(cfg, NULL, ".pbcfg");
-		else fclose(f);
-	}
-
-	printf("emu_ReadConfig: %s ", cfg);
-	f = fopen(cfg, "rb");
-	if (f) {
-		bread = fread(&currentConfig, 1, sizeof(currentConfig), f);
-		fclose(f);
-	}
-	printf(bread > 0 ? "(ok)\n" : "(failed)\n");
-
-	PicoOpt = currentConfig.PicoOpt;
-	PsndRate = currentConfig.PsndRate;
-	PicoRegionOverride = currentConfig.PicoRegion;
-	PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;
-	PicoCDBuffers = currentConfig.PicoCDBuffers;
-	if (PicoOpt & 0x20) {
-		actionNames[ 8] = "Z"; actionNames[ 9] = "Y";
-		actionNames[10] = "X"; actionNames[11] = "MODE";
-	}
-	scaling_update();
-	// some sanity checks
-	if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
-	if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;
-	if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;
-	// if volume keys are unbound, bind them to volume control
-	if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {
-		currentConfig.KeyBinds[23] = 1<<29; // vol up
-		currentConfig.KeyBinds[22] = 1<<30; // vol down
-	}
-
-	return (bread > 0); // == sizeof(currentConfig));
-}
-
-
-int emu_WriteConfig(int game)
-{
-	FILE *f;
-	char cfg[512];
-	int bwrite = 0;
-
-	if (!game)
-	{
-		strncpy(cfg, PicoConfigFile, 511);
-		cfg[511] = 0;
-	} else {
-		romfname_ext(cfg, "cfg/", ".pbcfg");
-	}
-
-	printf("emu_WriteConfig: %s ", cfg);
-	f = fopen(cfg, "wb");
-	if (f) {
-		currentConfig.PicoOpt = PicoOpt;
-		currentConfig.PsndRate = PsndRate;
-		currentConfig.PicoRegion = PicoRegionOverride;
-		currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;
-		currentConfig.PicoCDBuffers = PicoCDBuffers;
-		bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);
-		fflush(f);
-		fclose(f);
-#ifndef NO_SYNC
-		sync();
-#endif
-	}
-	printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
-
-	return (bwrite == sizeof(currentConfig));
-}
-
-
 void emu_Deinit(void)
 {
 	// save SRAM
@@ -607,16 +163,45 @@ void emu_Deinit(void)
 		}
 	}
 
-	free(framebuff);
+	free(PicoDraw2FB);
 
 	PicoExit();
 
 	// restore gamma
 	if (gp2x_old_gamma != 100)
-		set_gamma(100);
+		set_gamma(100, 0);
+}
+
+void emu_setDefaultConfig(void)
+{
+	memset(&currentConfig, 0, sizeof(currentConfig));
+	currentConfig.lastRomFile[0] = 0;
+	currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, cd_leds
+	currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940, cd_pcm, cd_cdda
+	currentConfig.PsndRate = 22050; // 44100;
+	currentConfig.PicoRegion = 0; // auto
+	currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
+	currentConfig.Frameskip = -1; // auto
+	currentConfig.CPUclock = 200;
+	currentConfig.volume = 50;
+	currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU
+	currentConfig.KeyBinds[ 4] = 1<<1;
+	currentConfig.KeyBinds[ 2] = 1<<2;
+	currentConfig.KeyBinds[ 6] = 1<<3;
+	currentConfig.KeyBinds[14] = 1<<4;
+	currentConfig.KeyBinds[13] = 1<<5;
+	currentConfig.KeyBinds[12] = 1<<6;
+	currentConfig.KeyBinds[ 8] = 1<<7;
+	currentConfig.KeyBinds[15] = 1<<26; // switch rend
+	currentConfig.KeyBinds[10] = 1<<27; // save state
+	currentConfig.KeyBinds[11] = 1<<28; // load state
+	currentConfig.KeyBinds[23] = 1<<29; // vol up
+	currentConfig.KeyBinds[22] = 1<<30; // vol down
+	currentConfig.gamma = 100;
+	currentConfig.PicoCDBuffers = 64;
+	currentConfig.scaling = 0;
 }
 
-
 void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
@@ -629,7 +214,7 @@ void osd_text(int x, int y, const char *text)
 			p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));
 			for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
 		}
-		gp2x_text_out8_2(x, y, text, 0xf0);
+		emu_textOut8(x, y, text);
 	} else {
 		int *p, i, h;
 		x &= ~1; // align x
@@ -638,16 +223,15 @@ void osd_text(int x, int y, const char *text)
 			p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));
 			for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;
 		}
-		gp2x_text_out15(x, y, text);
+		emu_textOut16(x, y, text);
 	}
 }
 
 static void cd_leds(void)
 {
-	// mmu problems?
 //	static
 	int old_reg;
-//	if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change
+//	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)) {
@@ -667,7 +251,7 @@ static void cd_leds(void)
 		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; p += 320/2 - 12/2;
+		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
 	}
 }
 
@@ -702,7 +286,7 @@ static void blit(const char *fps, const char *notice)
 			// feed new palette to our device
 			gp2x_video_setpalette(localPal, 0x40);
 		}
-		vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+		vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
 	} else if (!(emu_opt&0x80)) {
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal) {
@@ -776,7 +360,7 @@ static void vidResetMode(void)
 	if (PicoOpt&0x10) {
 		gp2x_video_changemode(8);
 	} else if (currentConfig.EmuOpt&0x80) {
-		gp2x_video_changemode(15);
+		gp2x_video_changemode(16);
 		PicoDrawSetColorFormat(1);
 		PicoScan = EmuScan16;
 		PicoScan(0, 0);
@@ -840,7 +424,7 @@ static void RunEvents(unsigned int which)
 {
 	if(which & 0x1800) { // save or load (but not both)
 		int do_it = 1;
-		if ( emu_check_save_file(state_slot) &&
+		if ( emu_checkSaveFile(state_slot) &&
 				(( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load
 				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save
 			unsigned long keys;
@@ -885,7 +469,7 @@ static void RunEvents(unsigned int which)
 			state_slot += 1;
 			if(state_slot > 9) state_slot = 0;
 		}
-		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");
+		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
 		gettimeofday(&noticeMsgTime, 0);
 	}
 	if(which & 0x0080) {
@@ -894,35 +478,6 @@ static void RunEvents(unsigned int which)
 }
 
 
-static void updateMovie(void)
-{
-	int offs = Pico.m.frame_count*3 + 0x40;
-	if (offs+3 > movie_size) {
-		free(movie_data);
-		movie_data = 0;
-		strcpy(noticeMsg, "END OF MOVIE.");
-		printf("END OF MOVIE.\n");
-		gettimeofday(&noticeMsgTime, 0);
-	} else {
-		// MXYZ SACB RLDU
-		PicoPad[0] = ~movie_data[offs]   & 0x8f; // ! SCBA RLDU
-		if(!(movie_data[offs]   & 0x10)) PicoPad[0] |= 0x40; // A
-		if(!(movie_data[offs]   & 0x20)) PicoPad[0] |= 0x10; // B
-		if(!(movie_data[offs]   & 0x40)) PicoPad[0] |= 0x20; // A
-		PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU
-		if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A
-		if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B
-		if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A
-		PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX
-		if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X
-		if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z
-		PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX
-		if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X
-		if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z
-	}
-}
-
-
 static void updateKeys(void)
 {
 	unsigned long keys, allActions[2] = { 0, 0 }, events;
@@ -1000,7 +555,7 @@ static void updateKeys(void)
 
 	events &= ~prevEvents;
 	if (events) RunEvents(events);
-	if (movie_data) updateMovie();
+	if (movie_data) emu_updateMovie();
 
 	prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
@@ -1024,23 +579,34 @@ static void SkipFrame(int do_audio)
 }
 
 
-void emu_forced_frame(void)
+void emu_forcedFrame(void)
 {
 	int po_old = PicoOpt;
+	int eo_old = currentConfig.EmuOpt;
 
-	PicoOpt |= 0x10;
-	PicoFrameFull();
+	PicoOpt &= ~0x0010;
+	PicoOpt |=  0x4080; // soft_scale | acc_sprites
+	currentConfig.EmuOpt |= 0x80;
+
+	//vidResetMode();
+	PicoDrawSetColorFormat(1);
+	PicoScan = EmuScan16;
+	PicoScan(0, 0);
+	Pico.m.dirtyPal = 1;
+	PicoFrameDrawOnly();
 
+/*
 	if (!(Pico.video.reg[12]&1)) {
 		vidCpyM2 = vidCpyM2_32col;
 		clearArea(1);
 	} else	vidCpyM2 = vidCpyM2_40col;
 
-	vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+	vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
 	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 	gp2x_video_setpalette(localPal, 0x40);
-
+*/
 	PicoOpt = po_old;
+	currentConfig.EmuOpt = eo_old;
 }
 
 static void simpleWait(int thissec, int lim_time)
@@ -1063,11 +629,11 @@ static void simpleWait(int thissec, int lim_time)
 void emu_Loop(void)
 {
 	static int gp2x_old_clock = 200;
-	static int PsndRate_old = 0, PicoOpt_old = 0, PsndLen_real = 0, pal_old = 0;
+	static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;
 	char fpsbuff[24]; // fps count c string
 	struct timeval tval; // timing
 	int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0;
-	int target_fps, target_frametime, lim_time, i;
+	int target_fps, target_frametime, lim_time, vsync_offset, i;
 	char *notice = 0;
 
 	printf("entered emu_Loop()\n");
@@ -1079,16 +645,24 @@ void emu_Loop(void)
 		printf(" done\n");
 	}
 
-	if (gp2x_old_gamma != currentConfig.gamma) {
-		set_gamma(currentConfig.gamma);
+	if (gp2x_old_gamma != currentConfig.gamma || (EmuOpt_old&0x1000) != (currentConfig.EmuOpt&0x1000)) {
+		set_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 		gp2x_old_gamma = currentConfig.gamma;
-		printf("updated gamma to %i\n", 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();
 	}
 
+	EmuOpt_old = currentConfig.EmuOpt;
 	fpsbuff[0] = 0;
 
 	// make sure we are in correct mode
 	vidResetMode();
+	scaling_update();
 	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 	find_combos();
@@ -1101,24 +675,24 @@ void emu_Loop(void)
 	// 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 || crashed_940) {
+		if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||
+				((PicoOpt&0x200) && crashed_940)) {
 			/* if 940 is turned off, we need it to be put back to sleep */
 			if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {
 				Reset940(1, 2);
 				Pause940(1);
 			}
-			sound_rerate(1);
+			PsndRerate(Pico.m.frame_count ? 1 : 0);
 		}
-		//excess_samples = PsndRate - PsndLen*target_fps;
 		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);
+		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;
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
-		PsndLen_real = PsndLen;
 		PicoOpt_old  = PicoOpt;
 		pal_old = Pico.m.pal;
 	} else {
@@ -1128,6 +702,19 @@ void emu_Loop(void)
 	// prepare CD buffer
 	if (PicoMCD & 1) 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;
+
 	// loop?
 	while (engineState == PGS_Running)
 	{
@@ -1210,10 +797,11 @@ void emu_Loop(void)
 				if (frames_shown > frames_done) frames_shown = frames_done;
 			}
 		}
-#if 0
-		sprintf(fpsbuff, "%05i", Pico.m.frame_count);
+#ifdef PFRAMES
+		sprintf(fpsbuff, "%i", Pico.m.frame_count);
 #endif
-		lim_time = (frames_done+1) * target_frametime;
+
+		lim_time = (frames_done+1) * target_frametime + vsync_offset;
 		if(currentConfig.Frameskip >= 0) { // frameskip enabled
 			for(i = 0; i < currentConfig.Frameskip; i++) {
 				updateKeys();
@@ -1229,7 +817,7 @@ void emu_Loop(void)
 			}
 		} else if(tval.tv_usec > lim_time) { // auto frameskip
 			// no time left for this frame - skip
-			if (tval.tv_usec - lim_time >= 0x300000) {
+			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;
@@ -1305,16 +893,22 @@ if (Pico.m.frame_count == 31563) {
 		gettimeofday(&tval, 0);
 		if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
 
-		if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 0x300000) // slowdown detection
+		if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection
 			reset_timing = 1;
 		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
 		{
-			// sleep if we are still too fast
+			// sleep or vsync if we are still too fast
 			// usleep sleeps for ~20ms minimum, so it is not a solution here
 			if(tval.tv_usec < lim_time)
 			{
 				// we are too fast
-				simpleWait(thissec, lim_time);
+				if (vsync_offset) {
+					if (lim_time - tval.tv_usec > target_frametime/2)
+						simpleWait(thissec, lim_time - target_frametime/4);
+					gp2x_video_wait_vsync();
+				} else {
+					simpleWait(thissec, lim_time);
+				}
 			}
 		}
 
@@ -1328,17 +922,14 @@ if (Pico.m.frame_count == 31563) {
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
-		osd_text(4, 232, "Writing SRAM/BRAM..");
+		emu_state_cb("Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
 
-	// if in 16bit mode, generate 8it image for menu background
-	if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80))
-		emu_forced_frame();
-
-	// for menu bg
-	gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);
+	// if in 8bit mode, generate 16bit image for menu background
+	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
+		emu_forcedFrame();
 }
 
 
@@ -1349,183 +940,3 @@ void emu_ResetGame(void)
 }
 
 
-size_t gzRead2(void *p, size_t _size, size_t _n, void *file)
-{
-	return gzread(file, p, _n);
-}
-
-
-size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)
-{
-	return gzwrite(file, p, _n);
-}
-
-static int try_ropen_file(const char *fname)
-{
-	FILE *f;
-
-	f = fopen(fname, "rb");
-	if (f) {
-		fclose(f);
-		return 1;
-	}
-	return 0;
-}
-
-char *emu_GetSaveFName(int load, int is_sram, int slot)
-{
-	static char saveFname[512];
-	char ext[16];
-
-	if (is_sram)
-	{
-		romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");
-		if (load) {
-			if (try_ropen_file(saveFname)) return saveFname;
-			// try in current dir..
-			romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");
-			if (try_ropen_file(saveFname)) return saveFname;
-			return NULL; // give up
-		}
-	}
-	else
-	{
-		ext[0] = 0;
-		if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);
-		strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");
-
-		romfname_ext(saveFname, "mds/", ext);
-		if (load) {
-			if (try_ropen_file(saveFname)) return saveFname;
-			romfname_ext(saveFname, NULL, ext);
-			if (try_ropen_file(saveFname)) return saveFname;
-			if (currentConfig.EmuOpt & 8) {
-				ext[0] = 0;
-				if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);
-				strcat(ext, ".mds");
-
-				romfname_ext(saveFname, "mds/", ext);
-				if (try_ropen_file(saveFname)) return saveFname;
-				romfname_ext(saveFname, NULL, ext);
-				if (try_ropen_file(saveFname)) return saveFname;
-			}
-			return NULL;
-		}
-	}
-
-	return saveFname;
-}
-
-int emu_check_save_file(int slot)
-{
-	return emu_GetSaveFName(1, 0, slot) ? 1 : 0;
-}
-
-void emu_set_save_cbs(int gz)
-{
-	if (gz) {
-		areaRead  = gzRead2;
-		areaWrite = gzWrite2;
-		areaEof   = (areaeof *) gzeof;
-		areaSeek  = (areaseek *) gzseek;
-		areaClose = (areaclose *) gzclose;
-	} else {
-		areaRead  = (arearw *) fread;
-		areaWrite = (arearw *) fwrite;
-		areaEof   = (areaeof *) feof;
-		areaSeek  = (areaseek *) fseek;
-		areaClose = (areaclose *) fclose;
-	}
-}
-
-int emu_SaveLoadGame(int load, int sram)
-{
-	int ret = 0;
-	char *saveFname;
-
-	// make save filename
-	saveFname = emu_GetSaveFName(load, sram, state_slot);
-	if (saveFname == NULL) {
-		if (!sram) {
-			strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");
-			gettimeofday(&noticeMsgTime, 0);
-		}
-		return -1;
-	}
-
-	printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);
-
-	if(sram) {
-		FILE *sramFile;
-		int sram_size;
-		unsigned char *sram_data;
-		if (PicoMCD&1) {
-			sram_size = 0x2000;
-			sram_data = Pico_mcd->bram;
-		} else {
-			sram_size = SRam.end-SRam.start+1;
-			if(SRam.reg_back & 4) sram_size=0x2000;
-			sram_data = SRam.data;
-		}
-		if(!sram_data) return 0; // SRam forcefully disabled for this game
-
-		if(load) {
-			sramFile = fopen(saveFname, "rb");
-			if(!sramFile) return -1;
-			fread(sram_data, 1, sram_size, sramFile);
-			fclose(sramFile);
-		} else {
-			// sram save needs some special processing
-			// see if we have anything to save
-			for(; sram_size > 0; sram_size--)
-				if(sram_data[sram_size-1]) break;
-
-			if(sram_size) {
-				sramFile = fopen(saveFname, "wb");
-				ret = fwrite(sram_data, 1, sram_size, sramFile);
-				ret = (ret != sram_size) ? -1 : 0;
-				fclose(sramFile);
-#ifndef NO_SYNC
-				sync();
-#endif
-			}
-		}
-		return ret;
-	}
-	else
-	{
-		void *PmovFile = NULL;
-		if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {
-			if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {
-				emu_set_save_cbs(1);
-				if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
-			}
-		}
-		else
-		{
-			if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {
-				emu_set_save_cbs(0);
-			}
-		}
-		if(PmovFile) {
-			ret = PmovState(load ? 6 : 5, PmovFile);
-			areaClose(PmovFile);
-			PmovFile = 0;
-			if (load) Pico.m.dirtyPal=1;
-#ifndef NO_SYNC
-			else sync();
-#endif
-		}
-		else	ret = -1;
-		if (!ret)
-			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
-		else
-		{
-			strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");
-			ret = -1;
-		}
-
-		gettimeofday(&noticeMsgTime, 0);
-		return ret;
-	}
-}