-// (c) Copyright 2006-2007 notaz, All rights reserved.\r
+// (c) Copyright 2006-2009 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
#include <pico/cd/cue.h>\r
-#include <zlib/zlib.h>\r
\r
\r
#define STATUS_MSG_TIMEOUT 2000\r
int pico_inp_mode = 0;\r
int engineState = PGS_Menu;\r
\r
+/* tmp buff to reduce stack usage for plats with small stack */\r
+static char static_buff[512];\r
/* TODO: len checking */\r
-char rom_fname_reload[512] = { 0, };\r
-char rom_fname_loaded[512] = { 0, };\r
+char rom_fname_reload[512];\r
+char rom_fname_loaded[512];\r
int rom_loaded = 0;\r
int reset_timing = 0;\r
static unsigned int notice_msg_time; /* when started showing */\r
\r
static int find_bios(int region, char **bios_file)\r
{\r
- static char bios_path[1024];\r
int i, count;\r
const char * const *files;\r
FILE *f = NULL;\r
\r
for (i = 0; i < count; i++)\r
{\r
- emu_make_path(bios_path, files[i], sizeof(bios_path) - 4);\r
- strcat(bios_path, ".bin");\r
- f = fopen(bios_path, "rb");\r
+ emu_make_path(static_buff, files[i], sizeof(static_buff) - 4);\r
+ strcat(static_buff, ".bin");\r
+ f = fopen(static_buff, "rb");\r
if (f) break;\r
\r
- bios_path[strlen(bios_path) - 4] = 0;\r
- strcat(bios_path, ".zip");\r
- f = fopen(bios_path, "rb");\r
+ static_buff[strlen(static_buff) - 4] = 0;\r
+ strcat(static_buff, ".zip");\r
+ f = fopen(static_buff, "rb");\r
if (f) break;\r
}\r
\r
if (f) {\r
- lprintf("using bios: %s\n", bios_path);\r
+ lprintf("using bios: %s\n", static_buff);\r
fclose(f);\r
- if (bios_file) *bios_file = bios_path;\r
+ if (bios_file)\r
+ *bios_file = static_buff;\r
return 1;\r
} else {\r
- sprintf(bios_path, "no %s BIOS files found, read docs",\r
+ sprintf(static_buff, "no %s BIOS files found, read docs",\r
region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
- me_update_msg(bios_path);\r
+ me_update_msg(static_buff);\r
return 0;\r
}\r
}\r
\r
static unsigned char id_header[0x100];\r
\r
-/* checks if fname points to valid MegaCD image\r
- * if so, checks for suitable BIOS */\r
+/* checks if fname points to valid MegaCD image */\r
static int emu_cd_check(int *pregion, const char *fname_in)\r
{\r
const char *fname = fname_in;\r
return type;\r
}\r
\r
+static int detect_media(const char *fname)\r
+{\r
+ static const short sms_offsets[] = { 0x7ff0, 0x3ff0, 0x1ff0 };\r
+ static const char *sms_exts[] = { "sms", "gg", "sg" };\r
+ static const char *md_exts[] = { "gen", "bin", "smd" };\r
+ char buff0[32], buff[32];\r
+ unsigned short *d16;\r
+ pm_file *pmf;\r
+ char ext[5];\r
+ int i;\r
+\r
+ get_ext(fname, ext);\r
+\r
+ // detect wrong extensions\r
+ if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) // s.gz ~ .mds.gz\r
+ return PM_BAD;\r
+\r
+ /* don't believe in extensions, except .cue */\r
+ if (strcasecmp(ext, ".cue") == 0)\r
+ return PM_CD;\r
+\r
+ pmf = pm_open(fname);\r
+ if (pmf == NULL)\r
+ return PM_BAD;\r
+\r
+ if (pm_read(buff0, 32, pmf) != 32) {\r
+ pm_close(pmf);\r
+ return PM_BAD;\r
+ }\r
+\r
+ if (strncasecmp("SEGADISCSYSTEM", buff0 + 0x00, 14) == 0 ||\r
+ strncasecmp("SEGADISCSYSTEM", buff0 + 0x10, 14) == 0) {\r
+ pm_close(pmf);\r
+ return PM_CD;\r
+ }\r
+\r
+ /* check for SMD evil */\r
+ if (pmf->size >= 0x4200 && (pmf->size & 0x3fff) == 0x200) {\r
+ if (pm_seek(pmf, sms_offsets[0] + 0x200, SEEK_SET) == sms_offsets[0] + 0x200 &&\r
+ pm_read(buff, 16, pmf) == 16 &&\r
+ strncmp("TMR SEGA", buff, 8) == 0)\r
+ goto looks_like_sms;\r
+\r
+ /* could parse further but don't bother */\r
+ goto extension_check;\r
+ }\r
+\r
+ /* MD header? Act as TMSS BIOS here */\r
+ if (pm_seek(pmf, 0x100, SEEK_SET) == 0x100 && pm_read(buff, 16, pmf) == 16) {\r
+ if (strncmp(buff, "SEGA", 4) == 0 || strncmp(buff, " SEG", 4) == 0)\r
+ goto looks_like_md;\r
+ }\r
+\r
+ for (i = 0; i < array_size(sms_offsets); i++) {\r
+ if (pm_seek(pmf, sms_offsets[i], SEEK_SET) != sms_offsets[i])\r
+ continue;\r
+\r
+ if (pm_read(buff, 16, pmf) != 16)\r
+ continue;\r
+\r
+ if (strncmp("TMR SEGA", buff, 8) == 0)\r
+ goto looks_like_sms;\r
+ }\r
+\r
+extension_check:\r
+ /* probably some headerless thing. Maybe check the extension after all. */\r
+ for (i = 0; i < array_size(md_exts); i++)\r
+ if (strcasecmp(pmf->ext, md_exts[i]) == 0)\r
+ goto looks_like_md;\r
+\r
+ for (i = 0; i < array_size(sms_exts); i++)\r
+ if (strcasecmp(pmf->ext, sms_exts[i]) == 0)\r
+ goto looks_like_sms;\r
+\r
+ /* If everything else fails, make a guess on the reset vector */\r
+ d16 = (unsigned short *)(buff0 + 4);\r
+ if ((((d16[0] << 16) | d16[1]) & 0xffffff) >= pmf->size) {\r
+ lprintf("bad MD reset vector, assuming SMS\n");\r
+ goto looks_like_sms;\r
+ }\r
+\r
+looks_like_md:\r
+ pm_close(pmf);\r
+ return PM_MD_CART;\r
+\r
+looks_like_sms:\r
+ pm_close(pmf);\r
+ return PM_MARK3;\r
+}\r
+\r
static int extract_text(char *dest, const unsigned char *src, int len, int swab)\r
{\r
char *p = dest;\r
PicoAHW &= ~PAHW_MCD;\r
}\r
\r
+static void system_announce(void)\r
+{\r
+ const char *sys_name, *tv_standard;\r
+ int fps;\r
+\r
+ if (PicoAHW & PAHW_SMS) {\r
+ sys_name = "Master System";\r
+ } else if (PicoAHW & PAHW_PICO) {\r
+ sys_name = "Pico";\r
+ } else if (PicoAHW & PAHW_MCD) {\r
+ sys_name = "Mega CD";\r
+ if ((Pico.m.hardware & 0xc0) == 0x80)\r
+ sys_name = "Sega CD";\r
+ } else if (PicoAHW & PAHW_32X) {\r
+ sys_name = "32X";\r
+ } else {\r
+ sys_name = "MegaDrive";\r
+ if ((Pico.m.hardware & 0xc0) == 0x80)\r
+ sys_name = "Genesis";\r
+ }\r
+ tv_standard = Pico.m.pal ? "PAL" : "NTSC";\r
+ fps = Pico.m.pal ? 50 : 60;\r
+\r
+ emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);\r
+}\r
+\r
// note: this function might mangle rom_fname\r
+// XXX: portions of this code should move to pico/\r
int emu_reload_rom(char *rom_fname)\r
{\r
unsigned int rom_size = 0;\r
unsigned char *rom_data = NULL;\r
char ext[5];\r
pm_file *rom = NULL;\r
- int ret, cd_state, cd_region, cfg_loaded = 0;\r
+ int cd_state = CIT_NOT_CD;\r
+ int ret, media_type, cd_region;\r
+ int cfg_loaded = 0, bad_rom = 0;\r
\r
lprintf("emu_ReloadRom(%s)\n", rom_fname);\r
\r
get_ext(rom_fname, ext);\r
\r
- // detect wrong extensions\r
- if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
- me_update_msg("Not a ROM/CD selected.");\r
- return 0;\r
- }\r
-\r
- PicoPatchUnload();\r
-\r
// check for movie file\r
if (movie_data) {\r
free(movie_data);\r
// check for both gmv and rom\r
int dummy;\r
FILE *movie_file = fopen(rom_fname, "rb");\r
- if(!movie_file) {\r
+ if (!movie_file) {\r
me_update_msg("Failed to open movie.");\r
return 0;\r
}\r
fseek(movie_file, 0, SEEK_END);\r
movie_size = ftell(movie_file);\r
fseek(movie_file, 0, SEEK_SET);\r
- if(movie_size < 64+3) {\r
+ if (movie_size < 64+3) {\r
me_update_msg("Invalid GMV file.");\r
fclose(movie_file);\r
return 0;\r
}\r
movie_data = malloc(movie_size);\r
- if(movie_data == NULL) {\r
+ if (movie_data == NULL) {\r
me_update_msg("low memory.");\r
fclose(movie_file);\r
return 0;\r
}\r
- fread(movie_data, 1, movie_size, movie_file);\r
+ dummy = fread(movie_data, 1, movie_size, movie_file);\r
fclose(movie_file);\r
if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
me_update_msg("Invalid GMV file.");\r
get_ext(rom_fname, ext);\r
}\r
\r
+ media_type = detect_media(rom_fname);\r
+ if (media_type == PM_BAD) {\r
+ me_update_msg("Not a ROM/CD img selected.");\r
+ return 0;\r
+ }\r
+\r
shutdown_MCD();\r
+ PicoPatchUnload();\r
+ PicoCartUnload();\r
+ rom_loaded = 0;\r
+\r
+ PicoAHW = 0;\r
\r
- // check for MegaCD image\r
- cd_state = emu_cd_check(&cd_region, rom_fname);\r
- if (cd_state >= 0 && cd_state != CIT_NOT_CD)\r
+ if (media_type == PM_CD)\r
{\r
- PicoAHW |= PAHW_MCD;\r
- // valid CD image, check for BIOS..\r
+ // check for MegaCD image\r
+ cd_state = emu_cd_check(&cd_region, rom_fname);\r
+ if (cd_state >= 0 && cd_state != CIT_NOT_CD)\r
+ {\r
+ // valid CD image, check for BIOS..\r
\r
- // we need to have config loaded at this point\r
- ret = emu_read_config(1, 0);\r
- if (!ret) emu_read_config(0, 0);\r
- cfg_loaded = 1;\r
+ // we need to have config loaded at this point\r
+ ret = emu_read_config(1, 0);\r
+ if (!ret) emu_read_config(0, 0);\r
+ cfg_loaded = 1;\r
+\r
+ if (PicoRegionOverride) {\r
+ cd_region = PicoRegionOverride;\r
+ lprintf("override region to %s\n", cd_region != 4 ?\r
+ (cd_region == 8 ? "EU" : "JAP") : "USA");\r
+ }\r
+ if (!find_bios(cd_region, &used_rom_name))\r
+ return 0;\r
\r
- if (PicoRegionOverride) {\r
- cd_region = PicoRegionOverride;\r
- lprintf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");\r
+ get_ext(used_rom_name, ext);\r
+ PicoAHW |= PAHW_MCD;\r
}\r
- if (!find_bios(cd_region, &used_rom_name)) {\r
- PicoAHW &= ~PAHW_MCD;\r
+ else {\r
+ me_update_msg("Invalid CD image");\r
return 0;\r
}\r
-\r
- get_ext(used_rom_name, ext);\r
}\r
- else\r
- {\r
- if (PicoAHW & PAHW_MCD) Stop_CD();\r
- PicoAHW &= ~PAHW_MCD;\r
+ else if (media_type == PM_MARK3) {\r
+ lprintf("detected SMS ROM\n");\r
+ PicoAHW = PAHW_SMS;\r
}\r
\r
rom = pm_open(used_rom_name);\r
- if (!rom) {\r
- me_update_msg("Failed to open ROM/CD image");\r
- goto fail;\r
- }\r
-\r
- if (cd_state < 0) {\r
- me_update_msg("Invalid CD image");\r
- goto fail;\r
+ if (rom == NULL) {\r
+ me_update_msg("Failed to open ROM");\r
+ return 0;\r
}\r
\r
menu_romload_prepare(used_rom_name); // also CD load\r
+ used_rom_name = NULL; // uses static_buff\r
\r
- PicoCartUnload();\r
- rom_loaded = 0;\r
-\r
- if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
+ ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);\r
+ pm_close(rom);\r
+ if (ret != 0) {\r
if (ret == 2) me_update_msg("Out of memory");\r
else if (ret == 3) me_update_msg("Read failed");\r
else me_update_msg("PicoCartLoad() failed.");\r
- goto fail2;\r
+ goto fail;\r
}\r
- pm_close(rom);\r
- rom = NULL;\r
\r
- // detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
- if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
- ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
- if (rom_data) free(rom_data);\r
- me_update_msg("Not a ROM selected.");\r
- goto fail2;\r
+ // detect wrong files\r
+ if (strncmp((char *)rom_data, "Pico", 4) == 0)\r
+ bad_rom = 1;\r
+ else if (!(PicoAHW & PAHW_SMS)) {\r
+ unsigned short *d = (unsigned short *)(rom_data + 4);\r
+ if ((((d[0] << 16) | d[1]) & 0xffffff) >= (int)rom_size) {\r
+ lprintf("bad reset vector\n");\r
+ bad_rom = 1;\r
+ }\r
+ }\r
+\r
+ if (bad_rom) {\r
+ me_update_msg("Bad ROM detected.");\r
+ goto fail;\r
}\r
\r
// load config for this ROM (do this before insert to get correct region)\r
if (!ret) emu_read_config(0, 0);\r
}\r
\r
- lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
- if (PicoCartInsert(rom_data, rom_size)) {\r
+ emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));\r
+ if (PicoCartInsert(rom_data, rom_size, static_buff)) {\r
me_update_msg("Failed to load ROM.");\r
- goto fail2;\r
+ goto fail;\r
}\r
\r
// insert CD if it was detected\r
if (cd_state != CIT_NOT_CD) {\r
ret = Insert_CD(rom_fname, cd_state);\r
if (ret != 0) {\r
+ PicoCartUnload();\r
+ rom_data = NULL; // freed by unload\r
me_update_msg("Insert_CD() failed, invalid CD image?");\r
- goto fail2;\r
+ goto fail;\r
}\r
}\r
\r
}\r
else\r
{\r
+ system_announce();\r
PicoOpt &= ~POPT_DIS_VDP_FIFO;\r
- emu_status_msg(Pico.m.pal ? "PAL SYSTEM / 50 FPS" : "NTSC SYSTEM / 60 FPS");\r
}\r
\r
+ strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
+ rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+ rom_loaded = 1;\r
+\r
// load SRAM for this ROM\r
if (currentConfig.EmuOpt & EOPT_EN_SRAM)\r
emu_save_load_game(1, 1);\r
\r
- strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
- rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
- rom_loaded = 1;\r
return 1;\r
\r
-fail2:\r
- menu_romload_end();\r
fail:\r
- if (rom != NULL) pm_close(rom);\r
+ if (rom_data)\r
+ free(rom_data);\r
+ menu_romload_end();\r
return 0;\r
}\r
\r
if (ext) strcat(dst, ext);\r
}\r
\r
+// <base dir><end>\r
void emu_make_path(char *buff, const char *end, int size)\r
{\r
int pos, end_len;\r
cfg_buff_512[511] = 0;\r
}\r
\r
+void emu_prep_defconfig(void)\r
+{\r
+ memset(&defaultConfig, 0, sizeof(defaultConfig));\r
+ defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS;\r
+ defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |\r
+ POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES |\r
+ POPT_EN_32X|POPT_EN_PWM;\r
+ defaultConfig.s_PsndRate = 44100;\r
+ defaultConfig.s_PicoRegion = 0; // auto\r
+ defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
+ defaultConfig.s_PicoCDBuffers = 0;\r
+ defaultConfig.Frameskip = -1; // auto\r
+ defaultConfig.volume = 50;\r
+ defaultConfig.gamma = 100;\r
+ defaultConfig.scaling = 0;\r
+ defaultConfig.turbo_rate = 15;\r
+\r
+ // platform specific overrides\r
+ pemu_prep_defconfig();\r
+}\r
+\r
void emu_set_defconfig(void)\r
{\r
memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));\r
}\r
}\r
\r
- plat_validate_config();\r
+ pemu_validate_config();\r
\r
// some sanity checks\r
#ifdef PSP\r
}\r
}\r
\r
-\r
-static size_t gzRead2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
- return gzread(file, p, _n);\r
-}\r
-\r
-\r
-static size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
- return gzwrite(file, p, _n);\r
-}\r
-\r
static int try_ropen_file(const char *fname)\r
{\r
FILE *f;\r
\r
char *emu_get_save_fname(int load, int is_sram, int slot)\r
{\r
- static char saveFname[512];\r
+ char *saveFname = static_buff;\r
char ext[16];\r
\r
if (is_sram)\r
{\r
- romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");\r
- if (load) {\r
- if (try_ropen_file(saveFname)) return saveFname;\r
- // try in current dir..\r
- romfname_ext(saveFname, NULL, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
- if (try_ropen_file(saveFname)) return saveFname;\r
- return NULL; // give up\r
- }\r
+ strcpy(ext, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
+ romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);\r
+ if (!load)\r
+ return saveFname;\r
+\r
+ if (try_ropen_file(saveFname))\r
+ return saveFname;\r
+\r
+ romfname_ext(saveFname, NULL, ext);\r
+ if (try_ropen_file(saveFname))\r
+ return saveFname;\r
}\r
else\r
{\r
+ const char *ext_main = (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds.gz" : ".mds";\r
+ const char *ext_othr = (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds" : ".mds.gz";\r
ext[0] = 0;\r
- if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
- strcat(ext, (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds.gz" : ".mds");\r
+ if (slot > 0 && slot < 10)\r
+ sprintf(ext, ".%i", slot);\r
+ strcat(ext, ext_main);\r
+\r
+ if (!load) {\r
+ romfname_ext(saveFname, "mds" PATH_SEP, ext);\r
+ return saveFname;\r
+ }\r
+ else {\r
+ romfname_ext(saveFname, "mds" PATH_SEP, ext);\r
+ if (try_ropen_file(saveFname))\r
+ return saveFname;\r
\r
- romfname_ext(saveFname, "mds" PATH_SEP, ext);\r
- if (load) {\r
- if (try_ropen_file(saveFname)) return saveFname;\r
romfname_ext(saveFname, NULL, ext);\r
- if (try_ropen_file(saveFname)) return saveFname;\r
- // no gzipped states, search for non-gzipped\r
- if (currentConfig.EmuOpt & EOPT_GZIP_SAVES)\r
- {\r
- ext[0] = 0;\r
- if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
- strcat(ext, ".mds");\r
-\r
- romfname_ext(saveFname, "mds"PATH_SEP, ext);\r
- if (try_ropen_file(saveFname)) return saveFname;\r
- romfname_ext(saveFname, NULL, ext);\r
- if (try_ropen_file(saveFname)) return saveFname;\r
- }\r
- return NULL;\r
+ if (try_ropen_file(saveFname))\r
+ return saveFname;\r
+\r
+ // try the other ext\r
+ ext[0] = 0;\r
+ if (slot > 0 && slot < 10)\r
+ sprintf(ext, ".%i", slot);\r
+ strcat(ext, ext_othr);\r
+\r
+ romfname_ext(saveFname, "mds"PATH_SEP, ext);\r
+ if (try_ropen_file(saveFname))\r
+ return saveFname;\r
}\r
}\r
\r
- return saveFname;\r
+ return NULL;\r
}\r
\r
int emu_check_save_file(int slot)\r
return emu_get_save_fname(1, 0, slot) ? 1 : 0;\r
}\r
\r
-void emu_setSaveStateCbs(int gz)\r
-{\r
- if (gz) {\r
- areaRead = gzRead2;\r
- areaWrite = gzWrite2;\r
- areaEof = (areaeof *) gzeof;\r
- areaSeek = (areaseek *) gzseek;\r
- areaClose = (areaclose *) gzclose;\r
- } else {\r
- areaRead = (arearw *) fread;\r
- areaWrite = (arearw *) fwrite;\r
- areaEof = (areaeof *) feof;\r
- areaSeek = (areaseek *) fseek;\r
- areaClose = (areaclose *) fclose;\r
- }\r
-}\r
-\r
int emu_save_load_game(int load, int sram)\r
{\r
int ret = 0;\r
int truncate = 1;\r
if (PicoAHW & PAHW_MCD)\r
{\r
- if (PicoOpt&POPT_EN_MCD_RAMCART) {\r
+ if (PicoOpt & POPT_EN_MCD_RAMCART) {\r
sram_size = 0x12000;\r
sram_data = SRam.data;\r
if (sram_data)\r
truncate = 0; // the .brm may contain RAM cart data after normal brm\r
}\r
} else {\r
- sram_size = SRam.end-SRam.start+1;\r
- if(Pico.m.sram_reg & 4) sram_size=0x2000;\r
+ sram_size = SRam.size;\r
sram_data = SRam.data;\r
}\r
- if (!sram_data) return 0; // SRam forcefully disabled for this game\r
+ if (sram_data == NULL)\r
+ return 0; // SRam forcefully disabled for this game\r
\r
if (load)\r
{\r
sramFile = fopen(saveFname, "rb");\r
- if(!sramFile) return -1;\r
- fread(sram_data, 1, sram_size, sramFile);\r
+ if (!sramFile)\r
+ return -1;\r
+ ret = fread(sram_data, 1, sram_size, sramFile);\r
+ ret = ret > 0 ? 0 : -1;\r
fclose(sramFile);\r
if ((PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_RAMCART))\r
memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
}\r
else\r
{\r
- void *PmovFile = NULL;\r
- if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0)\r
- {\r
- if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
- emu_setSaveStateCbs(1);\r
- if (!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
- }\r
- }\r
- else\r
- {\r
- if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
- emu_setSaveStateCbs(0);\r
- }\r
- }\r
- if(PmovFile) {\r
- ret = PmovState(load ? 6 : 5, PmovFile);\r
- areaClose(PmovFile);\r
- PmovFile = 0;\r
- if (load) Pico.m.dirtyPal=1;\r
+ ret = PicoState(saveFname, !load);\r
+ if (!ret) {\r
#ifndef NO_SYNC\r
- else sync();\r
+ if (!load) sync();\r
#endif\r
- }\r
- else ret = -1;\r
- if (!ret)\r
emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");\r
- else\r
- {\r
+ } else {\r
emu_status_msg(load ? "LOAD FAILED" : "SAVE FAILED");\r
ret = -1;\r
}\r
}\r
}\r
\r
-static void emu_msg_tray_open(void)\r
+static void emu_tray_open(void)\r
{\r
- emu_status_msg("CD tray opened");\r
+ engineState = PGS_TrayMenu;\r
+}\r
+\r
+static void emu_tray_close(void)\r
+{\r
+ emu_status_msg("CD tray closed.");\r
+}\r
+\r
+void emu_32x_startup(void)\r
+{\r
+ plat_video_toggle_renderer(0, 1, 0);\r
+ system_announce();\r
}\r
\r
void emu_reset_game(void)\r
PicoStateProgressCB = NULL;\r
}\r
}\r
- if (which & PEV_SWITCH_RND)\r
+ if ((which & PEV_SWITCH_RND) && !(PicoAHW & PAHW_32X))\r
{\r
- plat_video_toggle_renderer(1, 0);\r
+ plat_video_toggle_renderer(1, 0, 0);\r
}\r
if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))\r
{\r
char path[512];\r
int pos;\r
\r
+#if 0\r
+ // FIXME: handle through menu, etc\r
+ FILE *f;\r
+ f = fopen("32X_M_BIOS.BIN", "rb");\r
+ p32x_bios_m = malloc(2048);\r
+ fread(p32x_bios_m, 1, 2048, f);\r
+ fclose(f);\r
+ f = fopen("32X_S_BIOS.BIN", "rb");\r
+ p32x_bios_s = malloc(1024);\r
+ fread(p32x_bios_s, 1, 1024, f);\r
+ fclose(f);\r
+#endif\r
+\r
/* make dirs for saves */\r
pos = plat_get_root_dir(path, sizeof(path) - 4);\r
mkdir_path(path, pos, "mds");\r
mkdir_path(path, pos, "srm");\r
mkdir_path(path, pos, "brm");\r
\r
+ pprof_init();\r
+\r
make_config_cfg(path);\r
config_readlrom(path);\r
\r
PicoInit();\r
PicoMessage = plat_status_msg_busy_next;\r
- PicoMCDopenTray = emu_msg_tray_open;\r
- PicoMCDcloseTray = menu_loop_tray;\r
+ PicoMCDopenTray = emu_tray_open;\r
+ PicoMCDcloseTray = emu_tray_close;\r
}\r
\r
void emu_finish(void)\r
#endif\r
}\r
\r
+ pprof_finish();\r
+\r
PicoExit();\r
}\r
\r
{\r
int pframes_done; /* "period" frames, used for sync */\r
int frames_done, frames_shown; /* actual frames for fps counter */\r
- int oldmodes, target_fps, target_frametime;\r
+ int target_fps, target_frametime;\r
unsigned int timestamp_base = 0, timestamp_fps;\r
char *notice_msg = NULL;\r
char fpsbuff[24];\r
fpsbuff[0] = 0;\r
\r
/* make sure we are in correct mode */\r
- oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
Pico.m.dirtyPal = 1;\r
+ rendstatus_old = -1;\r
\r
/* number of ticks per frame */\r
if (Pico.m.pal) {\r
// prepare CD buffer\r
if (PicoAHW & PAHW_MCD)\r
PicoCDBufferInit();\r
+ PicoLoopPrepare();\r
\r
pemu_loop_prep();\r
\r
{\r
unsigned int timestamp;\r
int diff, diff_lim;\r
- int modes;\r
+\r
+ pprof_start(main);\r
\r
timestamp = get_ticks();\r
if (reset_timing) {\r
}\r
}\r
\r
- // check for mode changes\r
- modes = ((Pico.video.reg[12]&1)<<2) | (Pico.video.reg[1]&8);\r
- if (modes != oldmodes) {\r
- oldmodes = modes;\r
- pemu_video_mode_change(!(modes & 4), (modes & 8));\r
- }\r
-\r
// second changed?\r
if (timestamp - timestamp_fps >= ms_to_ticks(1000))\r
{\r
pframes_done++; frames_done++;\r
diff_lim += target_frametime;\r
\r
- if (!(currentConfig.EmuOpt & EOPT_NO_FRMLIMIT)) {\r
+ if (!(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT))) {\r
timestamp = get_ticks();\r
diff = timestamp - timestamp_base;\r
- if (diff < diff_lim) // we are too fast\r
+ if (!reset_timing && diff < diff_lim) // we are too fast\r
plat_wait_till_us(timestamp_base + diff_lim);\r
}\r
}\r
\r
emu_update_input();\r
PicoFrame();\r
+ pemu_finalize_frame(fpsbuff, notice_msg);\r
+\r
+ // plat_video_flip();\r
\r
/* frame limiter */\r
- if (!reset_timing && !(currentConfig.EmuOpt & EOPT_NO_FRMLIMIT))\r
+ if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\r
{\r
timestamp = get_ticks();\r
diff = timestamp - timestamp_base;\r
}\r
}\r
\r
- pemu_update_display(fpsbuff, notice_msg);\r
+ // XXX: for some plats it might be better to flip before vsync\r
+ // (due to shadow registers in display hw)\r
+ plat_video_flip();\r
\r
pframes_done++; frames_done++; frames_shown++;\r
+\r
+ pprof_end(main);\r
}\r
\r
emu_set_fastforward(0);\r