X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fcommon%2Femu.c;h=1573d12818c032b5577728eb785b2f3251d766df;hb=be7867d8756f15956447d3275382a77a71922feb;hp=bce9b789ceb614e84bbbbde1a2ca6f2e733b4826;hpb=4c2e35547fd6f849648234989419a4a02d2546b4;p=picodrive.git diff --git a/platform/common/emu.c b/platform/common/emu.c index bce9b78..1573d12 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -10,7 +10,7 @@ #include #include #include -#ifndef NO_SYNC +#ifdef __GP2X__ #include #endif @@ -28,22 +28,28 @@ #include #include +#ifndef _WIN32 +#define PATH_SEP "/" +#define PATH_SEP_C '/' +#else +#define PATH_SEP "\\" +#define PATH_SEP_C '\\' +#endif #define STATUS_MSG_TIMEOUT 2000 void *g_screen_ptr; -#if !SCREEN_SIZE_FIXED -int g_screen_width = SCREEN_WIDTH; -int g_screen_height = SCREEN_HEIGHT; -#endif +int g_screen_width = 320; +int g_screen_height = 240; char *PicoConfigFile = "config.cfg"; currentConfig_t currentConfig, defaultConfig; int state_slot = 0; int config_slot = 0, config_slot_current = 0; int pico_pen_x = 320/2, pico_pen_y = 240/2; -int pico_inp_mode = 0; +int pico_inp_mode; +int flip_after_sync; int engineState = PGS_Menu; static short __attribute__((aligned(4))) sndBuffer[2*44100/50]; @@ -144,9 +150,15 @@ void emu_status_msg(const char *format, ...) notice_msg_time = plat_get_ticks_ms(); } -static const char * const biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" }; -static const char * const biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" }; -static const char * const biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" }; +static const char * const biosfiles_us[] = { + "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "bios_CD_U" +}; +static const char * const biosfiles_eu[] = { + "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303", "bios_CD_E" +}; +static const char * const biosfiles_jp[] = { + "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J" +}; static const char *find_bios(int *region, const char *cd_fname) { @@ -529,7 +541,8 @@ void emu_prep_defconfig(void) memset(&defaultConfig, 0, sizeof(defaultConfig)); defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS; defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 | - POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES | + POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX | + POPT_EN_SVP_DRC|POPT_ACC_SPRITES | POPT_EN_32X|POPT_EN_PWM; defaultConfig.s_PsndRate = 44100; defaultConfig.s_PicoRegion = 0; // auto @@ -541,6 +554,8 @@ void emu_prep_defconfig(void) defaultConfig.gamma = 100; defaultConfig.scaling = 0; defaultConfig.turbo_rate = 15; + defaultConfig.msh2_khz = PICO_MSH2_HZ / 1000; + defaultConfig.ssh2_khz = PICO_SSH2_HZ / 1000; // platform specific overrides pemu_prep_defconfig(); @@ -554,8 +569,6 @@ void emu_set_defconfig(void) PicoRegionOverride = currentConfig.s_PicoRegion; PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder; PicoCDBuffers = currentConfig.s_PicoCDBuffers; - p32x_msh2_multiplier = MSH2_MULTI_DEFAULT; - p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT; } int emu_read_config(const char *rom_fname, int no_defaults) @@ -574,33 +587,29 @@ int emu_read_config(const char *rom_fname, int no_defaults) } else { - char *sect = emu_make_rom_id(rom_fname); + char ext[16]; + int vol; if (config_slot != 0) - sprintf(cfg, "game.%i.cfg", config_slot); - else strcpy(cfg, "game.cfg"); - - ret = -1; - if (config_havesect(cfg, sect)) - { - // read user's config - int vol = currentConfig.volume; - emu_set_defconfig(); - ret = config_readsect(cfg, sect); - currentConfig.volume = vol; // make vol global (bah) - } + snprintf(ext, sizeof(ext), ".%i.cfg", config_slot); else + strcpy(ext, ".cfg"); + + fname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext, rom_fname); + + // read user's config + vol = currentConfig.volume; + ret = config_readsect(cfg, NULL); + currentConfig.volume = vol; // make vol global (bah) + + if (ret != 0) { // read global config, and apply game_def.cfg on top make_config_cfg(cfg); config_readsect(cfg, NULL); - emu_make_path(cfg, "game_def.cfg", sizeof(cfg)); - ret = config_readsect(cfg, sect); - } - if (ret == 0) - { - lprintf("loaded cfg from sect \"%s\"\n", sect); + emu_make_path(cfg, "game_def.cfg", sizeof(cfg)); + ret = config_readsect(cfg, emu_make_rom_id(rom_fname)); } } @@ -625,7 +634,7 @@ int emu_read_config(const char *rom_fname, int no_defaults) int emu_write_config(int is_game) { - char cfg[512], *game_sect = NULL; + char cfg[512]; int ret, write_lrom = 0; if (!is_game) @@ -633,17 +642,20 @@ int emu_write_config(int is_game) make_config_cfg(cfg); write_lrom = 1; } else { + char ext[16]; + if (config_slot != 0) - sprintf(cfg, "game.%i.cfg", config_slot); - else strcpy(cfg, "game.cfg"); - game_sect = emu_make_rom_id(rom_fname_loaded); - lprintf("emu_write_config: sect \"%s\"\n", game_sect); + snprintf(ext, sizeof(ext), ".%i.cfg", config_slot); + else + strcpy(ext, ".cfg"); + + romfname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext); } lprintf("emu_write_config: %s ", cfg); - ret = config_writesect(cfg, game_sect); + ret = config_write(cfg); if (write_lrom) config_writelrom(cfg); -#ifndef NO_SYNC +#ifdef __GP2X__ sync(); #endif lprintf((ret == 0) ? "(ok)\n" : "(failed)\n"); @@ -853,7 +865,7 @@ int emu_save_load_game(int load, int sram) ret = fwrite(sram_data, 1, sram_size, sramFile); ret = (ret != sram_size) ? -1 : 0; fclose(sramFile); -#ifndef NO_SYNC +#ifdef __GP2X__ sync(); #endif } @@ -864,7 +876,7 @@ int emu_save_load_game(int load, int sram) { ret = PicoState(saveFname, !load); if (!ret) { -#ifndef NO_SYNC +#ifdef __GP2X__ if (!load) sync(); #endif emu_status_msg(load ? "STATE LOADED" : "STATE SAVED"); @@ -916,9 +928,6 @@ void emu_32x_startup(void) { plat_video_toggle_renderer(0, 0); // HACK system_announce(); - - // force mode change event - rendstatus_old = -1; } void emu_reset_game(void) @@ -1168,6 +1177,7 @@ void emu_init(void) mkdir_path(path, pos, "mds"); mkdir_path(path, pos, "srm"); mkdir_path(path, pos, "brm"); + mkdir_path(path, pos, "cfg"); pprof_init(); @@ -1194,7 +1204,7 @@ void emu_finish(void) char cfg[512]; make_config_cfg(cfg); config_writelrom(cfg); -#ifndef NO_SYNC +#ifdef __GP2X__ sync(); #endif } @@ -1286,10 +1296,6 @@ void emu_loop(void) fpsbuff[0] = 0; - /* make sure we are in correct mode */ - Pico.m.dirtyPal = 1; - rendstatus_old = -1; - PicoLoopPrepare(); // prepare CD buffer @@ -1364,10 +1370,8 @@ void emu_loop(void) sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2); printf("%s\n", fpsbuff); #else - if (currentConfig.EmuOpt & EOPT_SHOW_FPS) { - sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done); - if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; } - } + if (currentConfig.EmuOpt & EOPT_SHOW_FPS) + sprintf(fpsbuff, "%02i/%02i ", frames_shown, frames_done); #endif frames_shown = frames_done = 0; timestamp_fps += ms_to_ticks(1000); @@ -1426,7 +1430,8 @@ void emu_loop(void) PicoFrame(); pemu_finalize_frame(fpsbuff, notice_msg); - // plat_video_flip(); + if (!flip_after_sync) + plat_video_flip(); /* frame limiter */ if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT))) @@ -1444,9 +1449,8 @@ void emu_loop(void) } } - // XXX: for some plats it might be better to flip before vsync - // (due to shadow registers in display hw) - plat_video_flip(); + if (flip_after_sync) + plat_video_flip(); pframes_done++; frames_done++; frames_shown++;