\r
#include <stdio.h>\r
#include <stdlib.h>\r
+#include <string.h>\r
#include <stdarg.h>\r
#ifndef NO_SYNC\r
#include <unistd.h>\r
#include "../libpicofe/posix.h"\r
#include "../libpicofe/input.h"\r
#include "../libpicofe/fonts.h"\r
+#include "../libpicofe/sndout.h"\r
#include "../libpicofe/lprintf.h"\r
#include "../libpicofe/plat.h"\r
#include "emu.h"\r
#include "input_pico.h"\r
#include "menu_pico.h"\r
-#include "config.h"\r
+#include "config_file.h"\r
\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
-#include <pico/cd/cue.h>\r
\r
\r
#define STATUS_MSG_TIMEOUT 2000\r
int pico_inp_mode = 0;\r
int engineState = PGS_Menu;\r
\r
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\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];\r
+const char *rom_fname_reload;\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
static char noticeMsg[40];\r
notice_msg_time = plat_get_ticks_ms();\r
}\r
\r
-static const char * const biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
-static const char * const biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" };\r
-static const char * const biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
-\r
-static int find_bios(int region, char **bios_file)\r
+static const char * const biosfiles_us[] = {\r
+ "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "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
+};\r
+static const char * const biosfiles_jp[] = {\r
+ "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"\r
+};\r
+\r
+static const char *find_bios(int *region, const char *cd_fname)\r
{\r
int i, count;\r
const char * const *files;\r
FILE *f = NULL;\r
+ int ret;\r
+\r
+ // we need to have config loaded at this point\r
+ ret = emu_read_config(cd_fname, 0);\r
+ if (!ret) emu_read_config(NULL, 0);\r
+\r
+ if (PicoRegionOverride) {\r
+ *region = PicoRegionOverride;\r
+ lprintf("override region to %s\n", *region != 4 ?\r
+ (*region == 8 ? "EU" : "JAP") : "USA");\r
+ }\r
\r
- if (region == 4) { // US\r
+ if (*region == 4) { // US\r
files = biosfiles_us;\r
count = sizeof(biosfiles_us) / sizeof(char *);\r
- } else if (region == 8) { // EU\r
+ } else if (*region == 8) { // EU\r
files = biosfiles_eu;\r
count = sizeof(biosfiles_eu) / sizeof(char *);\r
- } else if (region == 1 || region == 2) {\r
+ } else if (*region == 1 || *region == 2) {\r
files = biosfiles_jp;\r
count = sizeof(biosfiles_jp) / sizeof(char *);\r
} else {\r
if (f) {\r
lprintf("using bios: %s\n", static_buff);\r
fclose(f);\r
- if (bios_file)\r
- *bios_file = static_buff;\r
- return 1;\r
+ return static_buff;\r
} else {\r
sprintf(static_buff, "no %s BIOS files found, read docs",\r
- region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+ *region != 4 ? (*region == 8 ? "EU" : "JAP") : "USA");\r
menu_update_msg(static_buff);\r
- return 0;\r
+ return NULL;\r
}\r
}\r
\r
}\r
*/\r
\r
-static unsigned char id_header[0x100];\r
-\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
- unsigned char buf[32];\r
- pm_file *cd_f;\r
- int region = 4; // 1: Japan, 4: US, 8: Europe\r
- char ext[5];\r
- cue_track_type type = CT_UNKNOWN;\r
- cue_data_t *cue_data = NULL;\r
-\r
- get_ext(fname_in, ext);\r
- if (strcasecmp(ext, ".cue") == 0) {\r
- cue_data = cue_parse(fname_in);\r
- if (cue_data != NULL) {\r
- fname = cue_data->tracks[1].fname;\r
- type = cue_data->tracks[1].type;\r
- }\r
- else\r
- return -1;\r
- }\r
-\r
- cd_f = pm_open(fname);\r
- if (cue_data != NULL)\r
- cue_destroy(cue_data);\r
-\r
- if (cd_f == NULL) return 0; // let the upper level handle this\r
-\r
- if (pm_read(buf, 32, cd_f) != 32) {\r
- pm_close(cd_f);\r
- return -1;\r
- }\r
-\r
- if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) {\r
- if (type && type != CT_ISO)\r
- elprintf(EL_STATUS, ".cue has wrong type: %i", type);\r
- type = CT_ISO; // Sega CD (ISO)\r
- }\r
- if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) {\r
- if (type && type != CT_BIN)\r
- elprintf(EL_STATUS, ".cue has wrong type: %i", type);\r
- type = CT_BIN; // Sega CD (BIN)\r
- }\r
-\r
- if (type == CT_UNKNOWN) {\r
- pm_close(cd_f);\r
- return 0;\r
- }\r
-\r
- pm_seek(cd_f, (type == CT_ISO) ? 0x100 : 0x110, SEEK_SET);\r
- pm_read(id_header, sizeof(id_header), cd_f);\r
-\r
- /* it seems we have a CD image here. Try to detect region now.. */\r
- pm_seek(cd_f, (type == CT_ISO) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
- pm_read(buf, 1, cd_f);\r
- pm_close(cd_f);\r
-\r
- if (buf[0] == 0x64) region = 8; // EU\r
- if (buf[0] == 0xa1) region = 1; // JAP\r
-\r
- lprintf("detected %s Sega/Mega CD image with %s region\n",\r
- type == CT_BIN ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-\r
- if (pregion != NULL) *pregion = region;\r
-\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
pos = 3;\r
\r
if (!(PicoAHW & PAHW_SMS)) {\r
- pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial\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, id_header + 0xf0, 0x03, swab); // region\r
+ pos += extract_text(id_string + pos, media_id_header + 0xf0, 0x03, swab); // region\r
id_string[pos] = '|'; pos++;\r
- pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name\r
+ pos += extract_text(id_string + pos, media_id_header + 0x50, 0x30, swab); // overseas name\r
id_string[pos] = 0;\r
if (pos > 5)\r
return id_string;\r
int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1;\r
char *s, *d;\r
\r
- ret = extract_text(str150, id_header + 0x50, 0x30, swab); // overseas name\r
+ ret = extract_text(str150, media_id_header + 0x50, 0x30, swab); // overseas name\r
\r
for (s = d = str150 + 1; s < str150+ret; s++)\r
{\r
*d = 0;\r
}\r
\r
-static void shutdown_MCD(void)\r
-{\r
- if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)\r
- Stop_CD();\r
- PicoAHW &= ~PAHW_MCD;\r
-}\r
-\r
static void system_announce(void)\r
{\r
const char *sys_name, *tv_standard, *extra = "";\r
emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);\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
+static void do_region_override(const char *media_fname)\r
+{\r
+ // we only need to override region if config tells us so\r
+ int ret = emu_read_config(media_fname, 0);\r
+ if (!ret) emu_read_config(NULL, 0);\r
+}\r
+\r
+int emu_reload_rom(const char *rom_fname_in)\r
{\r
- unsigned int rom_size = 0;\r
- char *used_rom_name = rom_fname;\r
- unsigned char *rom_data = NULL;\r
+ char *rom_fname = NULL;\r
char ext[5];\r
- pm_file *rom = NULL;\r
- int cd_state = CIT_NOT_CD;\r
- int ret, media_type, cd_region;\r
- int cfg_loaded = 0, bad_rom = 0;\r
+ enum media_type_e media_type;\r
+ int menu_romload_started = 0;\r
+ char carthw_path[512];\r
+ int retval = 0;\r
+\r
+ lprintf("emu_ReloadRom(%s)\n", rom_fname_in);\r
\r
- lprintf("emu_ReloadRom(%s)\n", rom_fname);\r
+ rom_fname = strdup(rom_fname_in);\r
+ if (rom_fname == NULL)\r
+ return 0;\r
\r
get_ext(rom_fname, ext);\r
\r
FILE *movie_file = fopen(rom_fname, "rb");\r
if (!movie_file) {\r
menu_update_msg("Failed to open movie.");\r
- return 0;\r
+ goto out;\r
}\r
fseek(movie_file, 0, SEEK_END);\r
movie_size = ftell(movie_file);\r
if (movie_size < 64+3) {\r
menu_update_msg("Invalid GMV file.");\r
fclose(movie_file);\r
- return 0;\r
+ goto out;\r
}\r
movie_data = malloc(movie_size);\r
if (movie_data == NULL) {\r
menu_update_msg("low memory.");\r
fclose(movie_file);\r
- return 0;\r
+ goto out;\r
}\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
menu_update_msg("Invalid GMV file.");\r
- return 0;\r
+ goto out;\r
}\r
dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
if (!dummy) {\r
menu_update_msg("Could't find a ROM for movie.");\r
- return 0;\r
+ goto out;\r
}\r
get_ext(rom_fname, ext);\r
lprintf("gmv loaded for %s\n", rom_fname);\r
dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
if (!dummy) {\r
menu_update_msg("Could't find a ROM to patch.");\r
- return 0;\r
+ goto out;\r
}\r
get_ext(rom_fname, ext);\r
}\r
\r
- media_type = detect_media(rom_fname);\r
- if (media_type == PM_BAD) {\r
- menu_update_msg("Not a ROM/CD img selected.");\r
- return 0;\r
- }\r
-\r
- shutdown_MCD();\r
- PicoCartUnload();\r
- rom_loaded = 0;\r
-\r
- PicoAHW = 0;\r
-\r
- if (media_type == PM_CD)\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
- {\r
- // valid CD image, check for BIOS..\r
-\r
- // we need to have config loaded at this point\r
- ret = emu_read_config(rom_fname, 0);\r
- if (!ret) emu_read_config(NULL, 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
- get_ext(used_rom_name, ext);\r
- PicoAHW |= PAHW_MCD;\r
- }\r
- else {\r
- menu_update_msg("Invalid CD image");\r
- return 0;\r
- }\r
- }\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 == NULL) {\r
- menu_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
- ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);\r
- pm_close(rom);\r
- if (ret != 0) {\r
- if (ret == 2) menu_update_msg("Out of memory");\r
- else if (ret == 3) menu_update_msg("Read failed");\r
- else menu_update_msg("PicoCartLoad() failed.");\r
- goto fail;\r
- }\r
-\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
+ menu_romload_prepare(rom_fname); // also CD load\r
+ menu_romload_started = 1;\r
\r
- if (bad_rom) {\r
- menu_update_msg("Bad ROM detected.");\r
- goto fail;\r
- }\r
+ emu_make_path(carthw_path, "carthw.cfg", sizeof(carthw_path));\r
\r
- // load config for this ROM (do this before insert to get correct region)\r
- if (!(PicoAHW & PAHW_MCD))\r
- memcpy(id_header, rom_data + 0x100, sizeof(id_header));\r
- if (!cfg_loaded) {\r
- ret = emu_read_config(rom_fname, 0);\r
- if (!ret) emu_read_config(NULL, 0);\r
- }\r
+ media_type = PicoLoadMedia(rom_fname, carthw_path,\r
+ find_bios, do_region_override);\r
\r
- emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));\r
- if (PicoCartInsert(rom_data, rom_size, static_buff)) {\r
- menu_update_msg("Failed to load ROM.");\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
- menu_update_msg("Insert_CD() failed, invalid CD image?");\r
- goto fail;\r
- }\r
+ switch (media_type) {\r
+ case PM_BAD_DETECT:\r
+ menu_update_msg("Not a ROM/CD img selected.");\r
+ goto out;\r
+ case PM_BAD_CD:\r
+ menu_update_msg("Invalid CD image");\r
+ goto out;\r
+ case PM_BAD_CD_NO_BIOS:\r
+ // find_bios() prints a message\r
+ goto out;\r
+ case PM_ERROR:\r
+ menu_update_msg("Load error");\r
+ goto out;\r
+ default:\r
+ break;\r
}\r
\r
menu_romload_end();\r
+ menu_romload_started = 0;\r
\r
if (PicoPatches) {\r
PicoPatchPrepare();\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
- return 1;\r
-\r
-fail:\r
- if (rom_data)\r
- free(rom_data);\r
- menu_romload_end();\r
- return 0;\r
+ retval = 1;\r
+out:\r
+ if (menu_romload_started)\r
+ menu_romload_end();\r
+ free(rom_fname);\r
+ return retval;\r
}\r
\r
int emu_swap_cd(const char *fname)\r
cd_img_type cd_type;\r
int ret = -1;\r
\r
- cd_type = emu_cd_check(NULL, fname);\r
+ cd_type = PicoCdCheck(fname, NULL);\r
if (cd_type != CIT_NOT_CD)\r
ret = Insert_CD(fname, cd_type);\r
if (ret != 0) {\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
sync();\r
{\r
plat_video_toggle_renderer(0, 0); // HACK\r
system_announce();\r
-\r
- // force mode change event\r
- rendstatus_old = -1;\r
}\r
\r
void emu_reset_game(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
PicoMessage = plat_status_msg_busy_next;\r
PicoMCDopenTray = emu_tray_open;\r
PicoMCDcloseTray = emu_tray_close;\r
+\r
+ sndout_init();\r
}\r
\r
void emu_finish(void)\r
pprof_finish();\r
\r
PicoExit();\r
+ sndout_exit();\r
+}\r
+\r
+static void snd_write_nonblocking(int len)\r
+{\r
+ sndout_write_nb(PsndOut, len);\r
+}\r
+\r
+void emu_sound_start(void)\r
+{\r
+ PsndOut = NULL;\r
+\r
+ if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
+ {\r
+ int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
+\r
+ PsndRerate(Pico.m.frame_count ? 1 : 0);\r
+\r
+ printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
+ PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
+ sndout_start(PsndRate, is_stereo);\r
+ PicoWriteSound = snd_write_nonblocking;\r
+ plat_update_volume(0, 0);\r
+ memset(sndBuffer, 0, sizeof(sndBuffer));\r
+ PsndOut = sndBuffer;\r
+ }\r
+}\r
+\r
+void emu_sound_stop(void)\r
+{\r
+ sndout_stop();\r
+}\r
+\r
+void emu_sound_wait(void)\r
+{\r
+ sndout_wait();\r
+}\r
+\r
+static void emu_loop_prep(void)\r
+{\r
+ static int pal_old = -1;\r
+ static int filter_old = -1;\r
+\r
+ if (currentConfig.CPUclock != plat_target_cpu_clock_get())\r
+ plat_target_cpu_clock_set(currentConfig.CPUclock);\r
+\r
+ if (Pico.m.pal != pal_old) {\r
+ plat_target_lcdrate_set(Pico.m.pal);\r
+ pal_old = Pico.m.pal;\r
+ }\r
+\r
+ if (currentConfig.filter != filter_old) {\r
+ plat_target_hwfilter_set(currentConfig.filter);\r
+ filter_old = currentConfig.filter;\r
+ }\r
+\r
+ plat_target_gamma_set(currentConfig.gamma, 0);\r
+\r
+ pemu_loop_prep();\r
}\r
\r
static void skip_frame(int do_audio)\r
\r
fpsbuff[0] = 0;\r
\r
- /* make sure we are in correct mode */\r
- Pico.m.dirtyPal = 1;\r
- rendstatus_old = -1;\r
-\r
PicoLoopPrepare();\r
\r
// prepare CD buffer\r
if (PicoAHW & PAHW_MCD)\r
PicoCDBufferInit();\r
\r
- pemu_loop_prep();\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
}\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