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
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
// 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
\r
shutdown_MCD();\r
PicoPatchUnload();\r
+ PicoCartUnload();\r
+ rom_loaded = 0;\r
+\r
PicoAHW = 0;\r
\r
if (media_type == PM_CD)\r
}\r
\r
menu_romload_prepare(used_rom_name); // also CD load\r
-\r
- PicoCartUnload();\r
- rom_loaded = 0;\r
+ used_rom_name = NULL; // uses static_buff\r
\r
ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);\r
pm_close(rom);\r
if (!ret) emu_read_config(0, 0);\r
}\r
\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 fail;\r
}\r
}\r
else\r
{\r
- const char *sys_name, *tv_standard;\r
- int fps;\r
-\r
- if (PicoAHW & PAHW_SMS) {\r
- sys_name = "Master System";\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
+ system_announce();\r
PicoOpt &= ~POPT_DIS_VDP_FIFO;\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
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
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
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
{\r
PicoReset();\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
{\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
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 (!reset_timing && diff < diff_lim) // we are too fast\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
notaz.gp2x.de / libpicofe.git / blobdiff