#include <stdlib.h>\r
#include <string.h>\r
#include <stdarg.h>\r
-#ifndef NO_SYNC\r
+#ifdef __GP2X__\r
#include <unistd.h>\r
#endif\r
\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
\r
+#ifndef _WIN32\r
+#define PATH_SEP "/"\r
+#define PATH_SEP_C '/'\r
+#else\r
+#define PATH_SEP "\\"\r
+#define PATH_SEP_C '\\'\r
+#endif\r
\r
#define STATUS_MSG_TIMEOUT 2000\r
\r
void *g_screen_ptr;\r
\r
-#if !SCREEN_SIZE_FIXED\r
-int g_screen_width = SCREEN_WIDTH;\r
-int g_screen_height = SCREEN_HEIGHT;\r
-#endif\r
+int g_screen_width = 320;\r
+int g_screen_height = 240;\r
\r
-char *PicoConfigFile = "config.cfg";\r
+const char *PicoConfigFile = "config2.cfg";\r
currentConfig_t currentConfig, defaultConfig;\r
int state_slot = 0;\r
int config_slot = 0, config_slot_current = 0;\r
int pico_pen_x = 320/2, pico_pen_y = 240/2;\r
-int pico_inp_mode = 0;\r
+int pico_inp_mode;\r
+int flip_after_sync;\r
int engineState = PGS_Menu;\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
}\r
\r
static const char * const biosfiles_us[] = {\r
- "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "bios_CD_U"\r
+ "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210", "bios_CD_U"\r
};\r
static const char * const biosfiles_eu[] = {\r
- "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303", "bios_CD_E"\r
+ "eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210", "bios_CD_E"\r
};\r
static const char * const biosfiles_jp[] = {\r
- "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"\r
+ "jp_mcd2_921222", "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"\r
};\r
\r
static const char *find_bios(int *region, const char *cd_fname)\r
ret = emu_read_config(cd_fname, 0);\r
if (!ret) emu_read_config(NULL, 0);\r
\r
- if (PicoRegionOverride) {\r
- *region = PicoRegionOverride;\r
+ if (PicoIn.regionOverride) {\r
+ *region = PicoIn.regionOverride;\r
lprintf("override region to %s\n", *region != 4 ?\r
(*region == 8 ? "EU" : "JAP") : "USA");\r
}\r
static char id_string[3+0xe*3+0x3*3+0x30*3+3];\r
int pos, swab = 1;\r
\r
- if (PicoAHW & PAHW_MCD) {\r
+ if (PicoIn.AHW & PAHW_MCD) {\r
strcpy(id_string, "CD|");\r
swab = 0;\r
}\r
- else if (PicoAHW & PAHW_SMS)\r
+ else if (PicoIn.AHW & PAHW_SMS)\r
strcpy(id_string, "MS|");\r
else strcpy(id_string, "MD|");\r
pos = 3;\r
\r
- if (!(PicoAHW & PAHW_SMS)) {\r
+ if (!(PicoIn.AHW & PAHW_SMS)) {\r
pos += extract_text(id_string + pos, media_id_header + 0x80, 0x0e, swab); // serial\r
id_string[pos] = '|'; pos++;\r
pos += extract_text(id_string + pos, media_id_header + 0xf0, 0x03, swab); // region\r
// buffer must be at least 150 byte long\r
void emu_get_game_name(char *str150)\r
{\r
- int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1;\r
+ int ret, swab = (PicoIn.AHW & PAHW_MCD) ? 0 : 1;\r
char *s, *d;\r
\r
ret = extract_text(str150, media_id_header + 0x50, 0x30, swab); // overseas name\r
const char *sys_name, *tv_standard, *extra = "";\r
int fps;\r
\r
- if (PicoAHW & PAHW_SMS) {\r
+ if (PicoIn.AHW & PAHW_SMS) {\r
sys_name = "Master System";\r
#ifdef NO_SMS\r
extra = " [no support]";\r
#endif\r
- } else if (PicoAHW & PAHW_PICO) {\r
+ } else if (PicoIn.AHW & PAHW_PICO) {\r
sys_name = "Pico";\r
- } else if (PicoAHW & PAHW_MCD) {\r
+ } else if ((PicoIn.AHW & (PAHW_32X|PAHW_MCD)) == (PAHW_32X|PAHW_MCD)) {\r
+ sys_name = "32X + Mega CD";\r
+ if ((Pico.m.hardware & 0xc0) == 0x80)\r
+ sys_name = "32X + Sega CD";\r
+ } else if (PicoIn.AHW & 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
+ } else if (PicoIn.AHW & PAHW_32X) {\r
sys_name = "32X";\r
} else {\r
sys_name = "MegaDrive";\r
\r
int emu_reload_rom(const char *rom_fname_in)\r
{\r
+ // use setting before rom config is loaded\r
+ int autoload = g_autostateld_opt;\r
char *rom_fname = NULL;\r
char ext[5];\r
enum media_type_e media_type;\r
break;\r
}\r
\r
+ // make quirks visible in UI\r
+ if (PicoIn.quirks & PQUIRK_FORCE_6BTN)\r
+ currentConfig.input_dev0 = PICO_INPUT_PAD_6BTN;\r
+\r
menu_romload_end();\r
menu_romload_started = 0;\r
\r
// additional movie stuff\r
if (movie_data)\r
{\r
- if (movie_data[0x14] == '6')\r
- PicoOpt |= POPT_6BTN_PAD; // 6 button pad\r
- else PicoOpt &= ~POPT_6BTN_PAD;\r
- PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing\r
+ enum input_device indev = (movie_data[0x14] == '6') ?\r
+ PICO_INPUT_PAD_6BTN : PICO_INPUT_PAD_3BTN;\r
+ PicoSetInputDevice(0, indev);\r
+ PicoSetInputDevice(1, indev);\r
+\r
+ PicoIn.opt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing\r
if (movie_data[0xF] >= 'A') {\r
if (movie_data[0x16] & 0x80) {\r
- PicoRegionOverride = 8;\r
+ PicoIn.regionOverride = 8;\r
} else {\r
- PicoRegionOverride = 4;\r
+ PicoIn.regionOverride = 4;\r
}\r
PicoReset();\r
// TODO: bits 6 & 5\r
else\r
{\r
system_announce();\r
- PicoOpt &= ~POPT_DIS_VDP_FIFO;\r
+ PicoIn.opt &= ~POPT_DIS_VDP_FIFO;\r
}\r
\r
strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
if (currentConfig.EmuOpt & EOPT_EN_SRAM)\r
emu_save_load_game(1, 1);\r
\r
+ // state autoload?\r
+ if (autoload) {\r
+ int time, newest = 0, newest_slot = -1;\r
+ int slot;\r
+\r
+ for (slot = 0; slot < 10; slot++) {\r
+ if (emu_check_save_file(slot, &time)) {\r
+ if (time > newest) {\r
+ newest = time;\r
+ newest_slot = slot;\r
+ }\r
+ }\r
+ }\r
+\r
+ if (newest_slot >= 0) {\r
+ lprintf("autoload slot %d\n", newest_slot);\r
+ state_slot = newest_slot;\r
+ emu_save_load_game(1, 0);\r
+ }\r
+ else {\r
+ lprintf("no save to autoload.\n");\r
+ }\r
+ }\r
+\r
retval = 1;\r
out:\r
if (menu_romload_started)\r
\r
int emu_swap_cd(const char *fname)\r
{\r
- cd_img_type cd_type;\r
+ enum cd_img_type cd_type;\r
int ret = -1;\r
\r
cd_type = PicoCdCheck(fname, NULL);\r
if (cd_type != CIT_NOT_CD)\r
- ret = Insert_CD(fname, cd_type);\r
+ ret = cdd_load(fname, cd_type);\r
if (ret != 0) {\r
menu_update_msg("Load failed, invalid CD image?");\r
return 0;\r
}\r
\r
strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);\r
- rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+ rom_fname_loaded[sizeof(rom_fname_loaded) - 1] = 0;\r
+\r
return 1;\r
}\r
\r
void emu_prep_defconfig(void)\r
{\r
memset(&defaultConfig, 0, sizeof(defaultConfig));\r
- defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;\r
+ defaultConfig.EmuOpt = 0x9d | 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_MCD_GFX |\r
- POPT_EN_SVP_DRC|POPT_ACC_SPRITES |\r
+ POPT_EN_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_PicoCDBuffers = 0;\r
defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;\r
defaultConfig.Frameskip = -1; // auto\r
+ defaultConfig.input_dev0 = PICO_INPUT_PAD_3BTN;\r
+ defaultConfig.input_dev1 = PICO_INPUT_PAD_3BTN;\r
defaultConfig.volume = 50;\r
defaultConfig.gamma = 100;\r
defaultConfig.scaling = 0;\r
defaultConfig.turbo_rate = 15;\r
+ defaultConfig.msh2_khz = PICO_MSH2_HZ / 1000;\r
+ defaultConfig.ssh2_khz = PICO_SSH2_HZ / 1000;\r
\r
// platform specific overrides\r
pemu_prep_defconfig();\r
void emu_set_defconfig(void)\r
{\r
memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));\r
- PicoOpt = currentConfig.s_PicoOpt;\r
+ PicoIn.opt = currentConfig.s_PicoOpt;\r
PsndRate = currentConfig.s_PsndRate;\r
- PicoRegionOverride = currentConfig.s_PicoRegion;\r
- PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
- PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
- p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;\r
- p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;\r
+ PicoIn.regionOverride = currentConfig.s_PicoRegion;\r
+ PicoIn.autoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
}\r
\r
int emu_read_config(const char *rom_fname, int no_defaults)\r
}\r
else\r
{\r
- char *sect = emu_make_rom_id(rom_fname);\r
+ char ext[16];\r
+ int vol;\r
\r
if (config_slot != 0)\r
- sprintf(cfg, "game.%i.cfg", config_slot);\r
- else strcpy(cfg, "game.cfg");\r
-\r
- ret = -1;\r
- if (config_havesect(cfg, sect))\r
- {\r
- // read user's config\r
- int vol = currentConfig.volume;\r
- emu_set_defconfig();\r
- ret = config_readsect(cfg, sect);\r
- currentConfig.volume = vol; // make vol global (bah)\r
- }\r
+ snprintf(ext, sizeof(ext), ".%i.cfg", config_slot);\r
else\r
+ strcpy(ext, ".cfg");\r
+\r
+ fname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext, rom_fname);\r
+\r
+ // read user's config\r
+ vol = currentConfig.volume;\r
+ ret = config_readsect(cfg, NULL);\r
+ currentConfig.volume = vol; // make vol global (bah)\r
+\r
+ if (ret != 0)\r
{\r
// read global config, and apply game_def.cfg on top\r
make_config_cfg(cfg);\r
config_readsect(cfg, NULL);\r
- emu_make_path(cfg, "game_def.cfg", sizeof(cfg));\r
- ret = config_readsect(cfg, sect);\r
- }\r
\r
- if (ret == 0)\r
- {\r
- lprintf("loaded cfg from sect \"%s\"\n", sect);\r
+ emu_make_path(cfg, "game_def.cfg", sizeof(cfg));\r
+ ret = config_readsect(cfg, emu_make_rom_id(rom_fname));\r
}\r
}\r
\r
\r
int emu_write_config(int is_game)\r
{\r
- char cfg[512], *game_sect = NULL;\r
+ char cfg[512];\r
int ret, write_lrom = 0;\r
\r
if (!is_game)\r
make_config_cfg(cfg);\r
write_lrom = 1;\r
} else {\r
+ char ext[16];\r
+\r
if (config_slot != 0)\r
- sprintf(cfg, "game.%i.cfg", config_slot);\r
- else strcpy(cfg, "game.cfg");\r
- game_sect = emu_make_rom_id(rom_fname_loaded);\r
- lprintf("emu_write_config: sect \"%s\"\n", game_sect);\r
+ snprintf(ext, sizeof(ext), ".%i.cfg", config_slot);\r
+ else\r
+ strcpy(ext, ".cfg");\r
+\r
+ romfname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext);\r
}\r
\r
lprintf("emu_write_config: %s ", cfg);\r
- ret = config_writesect(cfg, game_sect);\r
+ ret = config_write(cfg);\r
if (write_lrom) config_writelrom(cfg);\r
-#ifndef NO_SYNC\r
+#ifdef __GP2X__\r
sync();\r
#endif\r
lprintf((ret == 0) ? "(ok)\n" : "(failed)\n");\r
\r
#undef mk_text_out\r
\r
+void emu_osd_text16(int x, int y, const char *text)\r
+{\r
+ int len = strlen(text) * 8;\r
+ int i, h;\r
+\r
+ len++;\r
+ if (x + len > g_screen_width)\r
+ len = g_screen_width - x;\r
+\r
+ for (h = 0; h < 8; h++) {\r
+ unsigned short *p;\r
+ p = (unsigned short *)g_screen_ptr\r
+ + x + g_screen_width * (y + h);\r
+ for (i = len; i > 0; i--, p++)\r
+ *p = (*p >> 2) & 0x39e7;\r
+ }\r
+ emu_text_out16(x, y, text);\r
+}\r
\r
-void update_movie(void)\r
+static void update_movie(void)\r
{\r
int offs = Pico.m.frame_count*3 + 0x40;\r
if (offs+3 > movie_size) {\r
lprintf("END OF MOVIE.\n");\r
} else {\r
// MXYZ SACB RLDU\r
- PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU\r
- if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // C\r
- if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // A\r
- if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // B\r
- PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
- if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // C\r
- if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // A\r
- if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // B\r
- PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
- if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
- if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
- PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
- if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X\r
- if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z\r
+ PicoIn.pad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU\r
+ if(!(movie_data[offs] & 0x10)) PicoIn.pad[0] |= 0x40; // C\r
+ if(!(movie_data[offs] & 0x20)) PicoIn.pad[0] |= 0x10; // A\r
+ if(!(movie_data[offs] & 0x40)) PicoIn.pad[0] |= 0x20; // B\r
+ PicoIn.pad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
+ if(!(movie_data[offs+1] & 0x10)) PicoIn.pad[1] |= 0x40; // C\r
+ if(!(movie_data[offs+1] & 0x20)) PicoIn.pad[1] |= 0x10; // A\r
+ if(!(movie_data[offs+1] & 0x40)) PicoIn.pad[1] |= 0x20; // B\r
+ PicoIn.pad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
+ if(!(movie_data[offs+2] & 0x01)) PicoIn.pad[0] |= 0x0400; // X\r
+ if(!(movie_data[offs+2] & 0x04)) PicoIn.pad[0] |= 0x0100; // Z\r
+ PicoIn.pad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
+ if(!(movie_data[offs+2] & 0x10)) PicoIn.pad[1] |= 0x0400; // X\r
+ if(!(movie_data[offs+2] & 0x40)) PicoIn.pad[1] |= 0x0100; // Z\r
}\r
}\r
\r
-static int try_ropen_file(const char *fname)\r
+static int try_ropen_file(const char *fname, int *time)\r
{\r
+ struct stat st;\r
FILE *f;\r
\r
f = fopen(fname, "rb");\r
if (f) {\r
+ if (time != NULL) {\r
+ *time = 0;\r
+ if (fstat(fileno(f), &st) == 0)\r
+ *time = (int)st.st_mtime;\r
+ }\r
fclose(f);\r
return 1;\r
}\r
return 0;\r
}\r
\r
-char *emu_get_save_fname(int load, int is_sram, int slot)\r
+char *emu_get_save_fname(int load, int is_sram, int slot, int *time)\r
{\r
char *saveFname = static_buff;\r
char ext[16];\r
\r
if (is_sram)\r
{\r
- strcpy(ext, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
+ strcpy(ext, (PicoIn.AHW & PAHW_MCD) ? ".brm" : ".srm");\r
romfname_ext(saveFname, sizeof(static_buff),\r
- (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);\r
+ (PicoIn.AHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);\r
if (!load)\r
return saveFname;\r
\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
\r
romfname_ext(saveFname, sizeof(static_buff), NULL, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
}\r
else\r
}\r
else {\r
romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
\r
romfname_ext(saveFname, sizeof(static_buff), NULL, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
\r
// try the other ext\r
strcat(ext, ext_othr);\r
\r
romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
}\r
}\r
\r
int emu_check_save_file(int slot, int *time)\r
{\r
- return emu_get_save_fname(1, 0, slot) ? 1 : 0;\r
+ return emu_get_save_fname(1, 0, slot, time) ? 1 : 0;\r
}\r
\r
int emu_save_load_game(int load, int sram)\r
char *saveFname;\r
\r
// make save filename\r
- saveFname = emu_get_save_fname(load, sram, state_slot);\r
+ saveFname = emu_get_save_fname(load, sram, state_slot, NULL);\r
if (saveFname == NULL) {\r
if (!sram)\r
emu_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");\r
int sram_size;\r
unsigned char *sram_data;\r
int truncate = 1;\r
- if (PicoAHW & PAHW_MCD)\r
+ if (PicoIn.AHW & PAHW_MCD)\r
{\r
- if (PicoOpt & POPT_EN_MCD_RAMCART) {\r
+ if (PicoIn.opt & POPT_EN_MCD_RAMCART) {\r
sram_size = 0x12000;\r
- sram_data = SRam.data;\r
+ sram_data = Pico.sv.data;\r
if (sram_data)\r
- memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);\r
+ memcpy(sram_data, Pico_mcd->bram, 0x2000);\r
} else {\r
sram_size = 0x2000;\r
sram_data = Pico_mcd->bram;\r
truncate = 0; // the .brm may contain RAM cart data after normal brm\r
}\r
} else {\r
- sram_size = SRam.size;\r
- sram_data = SRam.data;\r
+ sram_size = Pico.sv.size;\r
+ sram_data = Pico.sv.data;\r
}\r
if (sram_data == NULL)\r
- return 0; // SRam forcefully disabled for this game\r
+ return 0; // cart saves forcefully disabled for this game\r
\r
if (load)\r
{\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
+ if ((PicoIn.AHW & PAHW_MCD) && (PicoIn.opt&POPT_EN_MCD_RAMCART))\r
+ memcpy(Pico_mcd->bram, sram_data, 0x2000);\r
} else {\r
// sram save needs some special processing\r
// see if we have anything to save\r
ret = fwrite(sram_data, 1, sram_size, sramFile);\r
ret = (ret != sram_size) ? -1 : 0;\r
fclose(sramFile);\r
-#ifndef NO_SYNC\r
+#ifdef __GP2X__\r
sync();\r
#endif\r
}\r
{\r
ret = PicoState(saveFname, !load);\r
if (!ret) {\r
-#ifndef NO_SYNC\r
+#ifdef __GP2X__\r
if (!load) sync();\r
#endif\r
emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");\r
currentConfig.EmuOpt = set_EmuOpt;\r
PsndRerate(1);\r
is_on = 0;\r
+ // mainly to unbreak pcm\r
+ if (PicoIn.AHW & PAHW_MCD)\r
+ pcd_state_loaded();\r
}\r
}\r
\r
return;\r
\r
/* handle other input modes */\r
- if (PicoPad[0] & 1) pico_pen_y--;\r
- if (PicoPad[0] & 2) pico_pen_y++;\r
- if (PicoPad[0] & 4) pico_pen_x--;\r
- if (PicoPad[0] & 8) pico_pen_x++;\r
- PicoPad[0] &= ~0x0f; // release UDLR\r
+ if (PicoIn.pad[0] & 1) pico_pen_y--;\r
+ if (PicoIn.pad[0] & 2) pico_pen_y++;\r
+ if (PicoIn.pad[0] & 4) pico_pen_x--;\r
+ if (PicoIn.pad[0] & 8) pico_pen_x++;\r
+ PicoIn.pad[0] &= ~0x0f; // release UDLR\r
\r
lim_x = (Pico.video.reg[12]&1) ? 319 : 255;\r
if (pico_pen_y < 8)\r
PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);\r
}\r
\r
-static void do_turbo(int *pad, int acts)\r
+static void do_turbo(unsigned short *pad, int acts)\r
{\r
static int turbo_pad = 0;\r
static unsigned char turbo_cnt[3] = { 0, 0, 0 };\r
char tmp[64];\r
int keys, len;\r
\r
- strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE?" : "OVERWRITE SAVE?");\r
+ strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE? " : "OVERWRITE SAVE? ");\r
len = strlen(tmp);\r
- nm = in_get_key_name(-1, -PBTN_MA3);\r
+ nm = in_get_key_name(-1, -PBTN_MOK);\r
snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm);\r
len = strlen(tmp);\r
nm = in_get_key_name(-1, -PBTN_MBACK);\r
plat_status_msg_busy_first(tmp);\r
\r
in_set_config_int(0, IN_CFG_BLOCKING, 1);\r
- while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))\r
+ while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))\r
;\r
- while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )\r
+ while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MOK | PBTN_MBACK)))\r
;\r
if (keys & PBTN_MBACK)\r
do_it = 0;\r
- while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))\r
+ while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))\r
;\r
in_set_config_int(0, IN_CFG_BLOCKING, 0);\r
}\r
emu_status_msg("SAVE SLOT %i [%s]", state_slot,\r
emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");\r
}\r
+ if (which & PEV_RESET)\r
+ emu_reset_game();\r
if (which & PEV_MENU)\r
engineState = PGS_Menu;\r
}\r
pl_actions[0] = actions[IN_BINDTYPE_PLAYER12];\r
pl_actions[1] = actions[IN_BINDTYPE_PLAYER12] >> 16;\r
\r
- PicoPad[0] = pl_actions[0] & 0xfff;\r
- PicoPad[1] = pl_actions[1] & 0xfff;\r
+ PicoIn.pad[0] = pl_actions[0] & 0xfff;\r
+ PicoIn.pad[1] = pl_actions[1] & 0xfff;\r
\r
if (pl_actions[0] & 0x7000)\r
- do_turbo(&PicoPad[0], pl_actions[0]);\r
+ do_turbo(&PicoIn.pad[0], pl_actions[0]);\r
if (pl_actions[1] & 0x7000)\r
- do_turbo(&PicoPad[1], pl_actions[1]);\r
+ do_turbo(&PicoIn.pad[1], pl_actions[1]);\r
\r
events = actions[IN_BINDTYPE_EMU] & PEV_MASK;\r
\r
\r
events &= ~prev_events;\r
\r
- if (PicoAHW == PAHW_PICO)\r
+ if (PicoIn.AHW == PAHW_PICO)\r
run_events_pico(events);\r
if (events)\r
run_events_ui(events);\r
\r
void emu_cmn_forced_frame(int no_scale, int do_emu)\r
{\r
- int po_old = PicoOpt;\r
+ int po_old = PicoIn.opt;\r
\r
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- PicoOpt |= POPT_ACC_SPRITES;\r
+ PicoIn.opt &= ~POPT_ALT_RENDERER;\r
+ PicoIn.opt |= POPT_ACC_SPRITES;\r
if (!no_scale)\r
- PicoOpt |= POPT_EN_SOFTSCALE;\r
+ PicoIn.opt |= POPT_EN_SOFTSCALE;\r
\r
PicoDrawSetOutFormat(PDF_RGB555, 1);\r
Pico.m.dirtyPal = 1;\r
else\r
PicoFrameDrawOnly();\r
\r
- PicoOpt = po_old;\r
+ PicoIn.opt = po_old;\r
}\r
\r
void emu_init(void)\r
mkdir_path(path, pos, "mds");\r
mkdir_path(path, pos, "srm");\r
mkdir_path(path, pos, "brm");\r
+ mkdir_path(path, pos, "cfg");\r
\r
pprof_init();\r
\r
void emu_finish(void)\r
{\r
// save SRAM\r
- if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
+ if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {\r
emu_save_load_game(0, 1);\r
- SRam.changed = 0;\r
+ Pico.sv.changed = 0;\r
}\r
\r
if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {\r
char cfg[512];\r
make_config_cfg(cfg);\r
config_writelrom(cfg);\r
-#ifndef NO_SYNC\r
+#ifdef __GP2X__\r
sync();\r
#endif\r
}\r
\r
if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
{\r
- int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
+ int is_stereo = (PicoIn.opt & POPT_EN_STEREO) ? 1 : 0;\r
\r
PsndRerate(Pico.m.frame_count ? 1 : 0);\r
\r
pemu_loop_prep();\r
}\r
\r
-static void skip_frame(int do_audio)\r
-{\r
- PicoSkipFrame = do_audio ? 1 : 2;\r
- PicoFrame();\r
- PicoSkipFrame = 0;\r
-}\r
-\r
/* our tick here is 1 us right now */\r
#define ms_to_ticks(x) (unsigned int)(x * 1000)\r
#define get_ticks() plat_get_ticks_us()\r
\r
void emu_loop(void)\r
{\r
- int pframes_done; /* "period" frames, used for sync */\r
int frames_done, frames_shown; /* actual frames for fps counter */\r
- int target_fps, target_frametime;\r
- unsigned int timestamp_base = 0, timestamp_fps;\r
+ int target_frametime_x3;\r
+ unsigned int timestamp_x3 = 0;\r
+ unsigned int timestamp_aim_x3 = 0;\r
+ unsigned int timestamp_fps_x3 = 0;\r
char *notice_msg = NULL;\r
char fpsbuff[24];\r
- int i;\r
+ int fskip_cnt = 0;\r
\r
fpsbuff[0] = 0;\r
\r
PicoLoopPrepare();\r
\r
- // prepare CD buffer\r
- if (PicoAHW & PAHW_MCD)\r
- PicoCDBufferInit();\r
-\r
plat_video_loop_prepare();\r
emu_loop_prep();\r
pemu_sound_start();\r
\r
/* number of ticks per frame */\r
- if (Pico.m.pal) {\r
- target_fps = 50;\r
- target_frametime = ms_to_ticks(1000) / 50;\r
- } else {\r
- target_fps = 60;\r
- target_frametime = ms_to_ticks(1000) / 60 + 1;\r
- }\r
+ if (Pico.m.pal)\r
+ target_frametime_x3 = 3 * ms_to_ticks(1000) / 50;\r
+ else\r
+ target_frametime_x3 = 3 * ms_to_ticks(1000) / 60;\r
\r
- timestamp_fps = get_ticks();\r
reset_timing = 1;\r
-\r
- frames_done = frames_shown = pframes_done = 0;\r
-\r
- plat_video_wait_vsync();\r
+ frames_done = frames_shown = 0;\r
\r
/* loop with resync every 1 sec. */\r
while (engineState == PGS_Running)\r
{\r
- unsigned int timestamp;\r
- int diff, diff_lim;\r
+ int skip = 0;\r
+ int diff;\r
\r
pprof_start(main);\r
\r
- timestamp = get_ticks();\r
if (reset_timing) {\r
reset_timing = 0;\r
- timestamp_base = timestamp;\r
- pframes_done = 0;\r
+ plat_video_wait_vsync();\r
+ timestamp_aim_x3 = get_ticks() * 3;\r
+ timestamp_fps_x3 = timestamp_aim_x3;\r
+ fskip_cnt = 0;\r
+ }\r
+ else if (currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) {\r
+ timestamp_aim_x3 = get_ticks() * 3;\r
}\r
\r
+ timestamp_x3 = get_ticks() * 3;\r
+\r
// show notice_msg message?\r
if (notice_msg_time != 0)\r
{\r
static int noticeMsgSum;\r
- if (timestamp - ms_to_ticks(notice_msg_time) > ms_to_ticks(STATUS_MSG_TIMEOUT)) {\r
+ if (timestamp_x3 - ms_to_ticks(notice_msg_time) * 3\r
+ > ms_to_ticks(STATUS_MSG_TIMEOUT) * 3)\r
+ {\r
notice_msg_time = 0;\r
plat_status_msg_clear();\r
+ plat_video_flip();\r
+ plat_status_msg_clear(); /* Do it again in case of double buffering */\r
notice_msg = NULL;\r
- } else {\r
+ }\r
+ else {\r
int sum = noticeMsg[0] + noticeMsg[1] + noticeMsg[2];\r
if (sum != noticeMsgSum) {\r
plat_status_msg_clear();\r
}\r
\r
// second changed?\r
- if (timestamp - timestamp_fps >= ms_to_ticks(1000))\r
+ if (timestamp_x3 - timestamp_fps_x3 >= ms_to_ticks(1000) * 3)\r
{\r
#ifdef BENCHMARK\r
static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
printf("%s\n", fpsbuff);\r
#else\r
- if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {\r
- sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
- if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
- }\r
+ if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
+ snprintf(fpsbuff, 8, "%02i/%02i ", frames_shown, frames_done);\r
#endif\r
frames_shown = frames_done = 0;\r
- timestamp_fps += ms_to_ticks(1000);\r
+ timestamp_fps_x3 += ms_to_ticks(1000) * 3;\r
}\r
#ifdef PFRAMES\r
sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
#endif\r
\r
- if (timestamp - timestamp_base >= ms_to_ticks(1000))\r
- {\r
- if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && currentConfig.Frameskip >= 0)\r
- pframes_done = 0;\r
- else\r
- pframes_done -= target_fps;\r
- if (pframes_done < -2) {\r
- /* don't drag more than 2 frames behind */\r
- pframes_done = -2;\r
- timestamp_base = timestamp - 2 * target_frametime;\r
- }\r
- else\r
- timestamp_base += ms_to_ticks(1000);\r
- }\r
-\r
- diff = timestamp - timestamp_base;\r
- diff_lim = (pframes_done + 1) * target_frametime;\r
+ diff = timestamp_aim_x3 - timestamp_x3;\r
\r
- if (currentConfig.Frameskip >= 0) // frameskip enabled\r
+ if (currentConfig.Frameskip >= 0) // frameskip enabled (or 0)\r
{\r
- for (i = 0; i < currentConfig.Frameskip; i++) {\r
- emu_update_input();\r
- skip_frame(1);\r
- pframes_done++; frames_done++;\r
- diff_lim += target_frametime;\r
-\r
- if (!(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT))) {\r
- timestamp = get_ticks();\r
- diff = timestamp - timestamp_base;\r
- if (!reset_timing && diff < diff_lim) // we are too fast\r
- plat_wait_till_us(timestamp_base + diff_lim);\r
- }\r
+ if (fskip_cnt < currentConfig.Frameskip) {\r
+ fskip_cnt++;\r
+ skip = 1;\r
+ }\r
+ else {\r
+ fskip_cnt = 0;\r
}\r
}\r
- else if (diff > diff_lim)\r
+ else if (diff < -target_frametime_x3)\r
{\r
/* no time left for this frame - skip */\r
/* limit auto frameskip to 8 */\r
- if (frames_done / 8 <= frames_shown) {\r
- emu_update_input();\r
- skip_frame(diff < diff_lim + target_frametime * 16);\r
- pframes_done++; frames_done++;\r
- continue;\r
- }\r
+ if (frames_done / 8 <= frames_shown)\r
+ skip = 1;\r
+ }\r
+\r
+ // don't go in debt too much\r
+ while (diff < -target_frametime_x3 * 3) {\r
+ timestamp_aim_x3 += target_frametime_x3;\r
+ diff = timestamp_aim_x3 - timestamp_x3;\r
}\r
\r
emu_update_input();\r
- PicoFrame();\r
- pemu_finalize_frame(fpsbuff, notice_msg);\r
+ if (skip) {\r
+ int do_audio = diff > -target_frametime_x3 * 2;\r
+ PicoIn.skipFrame = do_audio ? 1 : 2;\r
+ PicoFrame();\r
+ PicoIn.skipFrame = 0;\r
+ }\r
+ else {\r
+ PicoFrame();\r
+ pemu_finalize_frame(fpsbuff, notice_msg);\r
+ frames_shown++;\r
+ }\r
+ frames_done++;\r
+ timestamp_aim_x3 += target_frametime_x3;\r
\r
- // plat_video_flip();\r
+ if (!skip && !flip_after_sync)\r
+ plat_video_flip();\r
\r
/* frame limiter */\r
- if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\r
+ if (!skip && !reset_timing\r
+ && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\r
{\r
- timestamp = get_ticks();\r
- diff = timestamp - timestamp_base;\r
+ unsigned int timestamp = get_ticks();\r
+ diff = timestamp_aim_x3 - timestamp * 3;\r
\r
// sleep or vsync if we are still too fast\r
- if (diff < diff_lim)\r
- {\r
+ if (diff > target_frametime_x3 && (currentConfig.EmuOpt & EOPT_VSYNC)) {\r
// we are too fast\r
- plat_wait_till_us(timestamp_base + diff_lim - target_frametime / 4);\r
- if (currentConfig.EmuOpt & EOPT_VSYNC)\r
- plat_video_wait_vsync();\r
+ plat_video_wait_vsync();\r
+ timestamp = get_ticks();\r
+ diff = timestamp * 3 - timestamp_aim_x3;\r
+ }\r
+ if (diff > target_frametime_x3) {\r
+ // still too fast\r
+ plat_wait_till_us(timestamp + (diff - target_frametime_x3) / 3);\r
}\r
}\r
\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
+ if (!skip && flip_after_sync)\r
+ plat_video_flip();\r
\r
pprof_end(main);\r
}\r
emu_set_fastforward(0);\r
\r
// save SRAM\r
- if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
+ if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {\r
plat_status_msg_busy_first("Writing SRAM/BRAM...");\r
emu_save_load_game(0, 1);\r
- SRam.changed = 0;\r
+ Pico.sv.changed = 0;\r
}\r
\r
pemu_loop_end();\r
emu_sound_stop();\r
-\r
- // pemu_loop_end() might want to do 1 frame for bg image,\r
- // so free CD buffer here\r
- if (PicoAHW & PAHW_MCD)\r
- PicoCDBufferFree();\r
}\r
-\r
notaz.gp2x.de / picodrive.git / blobdiff