#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
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
memset(&defaultConfig, 0, sizeof(defaultConfig));\r
defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|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_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |\r
+ 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.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
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
}\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
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
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
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
PicoFrame();\r
pemu_finalize_frame(fpsbuff, notice_msg);\r
\r
- // plat_video_flip();\r
+ if (!flip_after_sync)\r
+ plat_video_flip();\r
\r
/* frame limiter */\r
if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\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
+ if (flip_after_sync)\r
+ plat_video_flip();\r
\r
pframes_done++; frames_done++; frames_shown++;\r
\r