X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=ff17e3be0cfd442ef061c57efed00517fce0952c;hb=388947f33d88ce3de0d9cb3e873244fbb5162a59;hp=9d573bf36ce583f98cec4f6c29ab6b24cbe030e6;hpb=3e85ebdd8598be8816138335483f7a774519e5f8;p=libpicofe.git diff --git a/common/emu.c b/common/emu.c index 9d573bf..ff17e3b 100644 --- a/common/emu.c +++ b/common/emu.c @@ -5,7 +5,6 @@ #include #include -#include // tolower #ifndef NO_SYNC #include #endif @@ -15,61 +14,58 @@ #include "fonts.h" #include "lprintf.h" #include "config.h" +#include "plat.h" +#include "input.h" -#include -#include +#include +#include +#include #include -#if defined(__GP2X__) - #include "../gp2x/gp2x.h" - #define SCREEN_WIDTH 320 - #define SCREEN_BUFFER gp2x_screen -#elif defined(__GIZ__) - #include "../gizmondo/giz.h" - #define SCREEN_WIDTH 321 - #define SCREEN_BUFFER giz_screen -#elif defined(PSP) - #include "../psp/psp.h" - #define SCREEN_WIDTH 512 - #define SCREEN_BUFFER psp_screen + +void *g_screen_ptr; + +#if !SCREEN_SIZE_FIXED +int g_screen_width = SCREEN_WIDTH; +int g_screen_height = SCREEN_HEIGHT; #endif char *PicoConfigFile = "config.cfg"; currentConfig_t currentConfig, defaultConfig; -int rom_loaded = 0; -char noticeMsg[64]; int state_slot = 0; int config_slot = 0, config_slot_current = 0; +int pico_inp_mode = 0; +int engineState = PGS_Menu; + +/* TODO: len checking */ +char rom_fname_reload[512] = { 0, }; +char rom_fname_loaded[512] = { 0, }; +int rom_loaded = 0; unsigned char *movie_data = NULL; static int movie_size = 0; -// provided by platform code: -extern char romFileName[]; -extern void emu_noticeMsgUpdated(void); -extern void emu_getMainDir(char *dst, int len); -extern void emu_setDefaultConfig(void); -extern void menu_romload_prepare(const char *rom_name); -extern void menu_romload_end(void); - -// utilities -static void strlwr_(char* string) +/* don't use tolower() for easy old glibc binary compatibility */ +static void strlwr_(char *string) { - while ( (*string++ = (char)tolower(*string)) ); + char *p; + for (p = string; *p; p++) + if ('A' <= *p && *p <= 'Z') + *p += 'a' - 'A'; } -static int try_rfn_cut(void) +static int try_rfn_cut(char *fname) { FILE *tmp; char *p; - p = romFileName + strlen(romFileName) - 1; - for (; p > romFileName; p--) + p = fname + strlen(fname) - 1; + for (; p > fname; p--) if (*p == '.') break; *p = 0; - if((tmp = fopen(romFileName, "rb"))) { + if((tmp = fopen(fname, "rb"))) { fclose(tmp); return 1; } @@ -87,8 +83,8 @@ static void get_ext(char *file, char *ext) strlwr_(ext); } -char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" }; -char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210" }; +char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" }; +char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" }; char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" }; int emu_findBios(int region, char **bios_file) @@ -131,14 +127,15 @@ int emu_findBios(int region, char **bios_file) if (bios_file) *bios_file = bios_path; return 1; } else { - sprintf(menuErrorMsg, "no %s BIOS files found, read docs", + sprintf(bios_path, "no %s BIOS files found, read docs", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA"); - lprintf("%s\n", menuErrorMsg); + me_update_msg(bios_path); return 0; } } /* check if the name begins with BIOS name */ +/* static int emu_isBios(const char *name) { int i; @@ -150,37 +147,64 @@ static int emu_isBios(const char *name) if (strstr(name, biosfiles_jp[i]) != NULL) return 1; return 0; } +*/ -static unsigned char scd_id_header[0x100]; +static unsigned char id_header[0x100]; -/* checks if romFileName points to valid MegaCD image +/* checks if fname points to valid MegaCD image * if so, checks for suitable BIOS */ -int emu_cdCheck(int *pregion) +int emu_cdCheck(int *pregion, char *fname_in) { unsigned char buf[32]; pm_file *cd_f; - int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe + int region = 4; // 1: Japan, 4: US, 8: Europe + char ext[5], *fname = fname_in; + cue_track_type type = CT_UNKNOWN; + cue_data_t *cue_data = NULL; + + get_ext(fname_in, ext); + if (strcasecmp(ext, ".cue") == 0) { + cue_data = cue_parse(fname_in); + if (cue_data != NULL) { + fname = cue_data->tracks[1].fname; + type = cue_data->tracks[1].type; + } + else + return -1; + } - cd_f = pm_open(romFileName); - if (!cd_f) return 0; // let the upper level handle this + cd_f = pm_open(fname); + if (cue_data != NULL) + cue_destroy(cue_data); + + if (cd_f == NULL) return 0; // let the upper level handle this if (pm_read(buf, 32, cd_f) != 32) { pm_close(cd_f); - return 0; + return -1; + } + + if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) { + if (type && type != CT_ISO) + elprintf(EL_STATUS, ".cue has wrong type: %i", type); + type = CT_ISO; // Sega CD (ISO) + } + if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) { + if (type && type != CT_BIN) + elprintf(EL_STATUS, ".cue has wrong type: %i", type); + type = CT_BIN; // Sega CD (BIN) } - if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1; // Sega CD (ISO) - if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2; // Sega CD (BIN) - if (type == 0) { + if (type == CT_UNKNOWN) { pm_close(cd_f); return 0; } - pm_seek(cd_f, (type == 1) ? 0x100 : 0x110, SEEK_SET); - pm_read(scd_id_header, sizeof(scd_id_header), cd_f); + pm_seek(cd_f, (type == CT_ISO) ? 0x100 : 0x110, SEEK_SET); + pm_read(id_header, sizeof(id_header), cd_f); /* it seems we have a CD image here. Try to detect region now.. */ - pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET); + pm_seek(cd_f, (type == CT_ISO) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET); pm_read(buf, 1, cd_f); pm_close(cd_f); @@ -188,14 +212,14 @@ int emu_cdCheck(int *pregion) if (buf[0] == 0xa1) region = 1; // JAP lprintf("detected %s Sega/Mega CD image with %s region\n", - type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA"); + type == CT_BIN ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA"); if (pregion != NULL) *pregion = region; return type; } -static int extract_text(char *dest, unsigned char *src, int len, int swab) +static int extract_text(char *dest, const unsigned char *src, int len, int swab) { char *p = dest; int i; @@ -228,51 +252,60 @@ static int extract_text(char *dest, unsigned char *src, int len, int swab) char *emu_makeRomId(void) { - static char id_string[3+0x11+0x11+0x30+16]; - unsigned char *id_header; - int pos; - - if (Pico.rom == NULL) { - id_string[0] = 0; - return id_string; - } + static char id_string[3+0xe*3+0x3*3+0x30*3+3]; + int pos, swab = 1; - if (PicoMCD & 1) { - id_header = scd_id_header; + if (PicoAHW & PAHW_MCD) { strcpy(id_string, "CD|"); - } else { - id_header = Pico.rom + 0x100; - strcpy(id_string, "MD|"); + swab = 0; } + else strcpy(id_string, "MD|"); pos = 3; - pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, 1); // serial + pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial id_string[pos] = '|'; pos++; - pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, 1); // region + pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region id_string[pos] = '|'; pos++; - pos += extract_text(id_string + pos, id_header + 0x50, 0x30, 1); // overseas name + pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name id_string[pos] = 0; - printf("id_string: %s\n", id_string); return id_string; } -int emu_ReloadRom(void) +// buffer must be at least 150 byte long +void emu_getGameName(char *str150) +{ + int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1; + char *s, *d; + + ret = extract_text(str150, id_header + 0x50, 0x30, swab); // overseas name + + for (s = d = str150 + 1; s < str150+ret; s++) + { + if (*s == 0) break; + if (*s != ' ' || d[-1] != ' ') + *d++ = *s; + } + *d = 0; +} + +// note: this function might mangle rom_fname +int emu_ReloadRom(char *rom_fname) { unsigned int rom_size = 0; - char *used_rom_name = romFileName; + char *used_rom_name = rom_fname; unsigned char *rom_data = NULL; char ext[5]; - pm_file *rom; + pm_file *rom = NULL; int ret, cd_state, cd_region, cfg_loaded = 0; - lprintf("emu_ReloadRom(%s)\n", romFileName); + lprintf("emu_ReloadRom(%s)\n", rom_fname); - get_ext(romFileName, ext); + get_ext(rom_fname, ext); // detect wrong extensions if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz - sprintf(menuErrorMsg, "Not a ROM selected."); + me_update_msg("Not a ROM/CD selected."); return 0; } @@ -283,59 +316,62 @@ int emu_ReloadRom(void) free(movie_data); movie_data = 0; } - if (!strcmp(ext, ".gmv")) { + if (!strcmp(ext, ".gmv")) + { // check for both gmv and rom int dummy; - FILE *movie_file = fopen(romFileName, "rb"); + FILE *movie_file = fopen(rom_fname, "rb"); if(!movie_file) { - sprintf(menuErrorMsg, "Failed to open movie."); + me_update_msg("Failed to open movie."); return 0; } fseek(movie_file, 0, SEEK_END); movie_size = ftell(movie_file); fseek(movie_file, 0, SEEK_SET); if(movie_size < 64+3) { - sprintf(menuErrorMsg, "Invalid GMV file."); + me_update_msg("Invalid GMV file."); fclose(movie_file); return 0; } movie_data = malloc(movie_size); if(movie_data == NULL) { - sprintf(menuErrorMsg, "low memory."); + me_update_msg("low memory."); fclose(movie_file); return 0; } fread(movie_data, 1, movie_size, movie_file); fclose(movie_file); if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) { - sprintf(menuErrorMsg, "Invalid GMV file."); + me_update_msg("Invalid GMV file."); return 0; } - dummy = try_rfn_cut() || try_rfn_cut(); + dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname); if (!dummy) { - sprintf(menuErrorMsg, "Could't find a ROM for movie."); + me_update_msg("Could't find a ROM for movie."); return 0; } - get_ext(romFileName, ext); + get_ext(rom_fname, ext); + lprintf("gmv loaded for %s\n", rom_fname); } - else if (!strcmp(ext, ".pat")) { + else if (!strcmp(ext, ".pat")) + { int dummy; - PicoPatchLoad(romFileName); - dummy = try_rfn_cut() || try_rfn_cut(); + PicoPatchLoad(rom_fname); + dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname); if (!dummy) { - sprintf(menuErrorMsg, "Could't find a ROM to patch."); + me_update_msg("Could't find a ROM to patch."); return 0; } - get_ext(romFileName, ext); + get_ext(rom_fname, ext); } - if ((PicoMCD & 1) && Pico_mcd != NULL) - Stop_CD(); + emu_shutdownMCD(); // check for MegaCD image - cd_state = emu_cdCheck(&cd_region); - if (cd_state > 0) + cd_state = emu_cdCheck(&cd_region, rom_fname); + if (cd_state >= 0 && cd_state != CIT_NOT_CD) { + PicoAHW |= PAHW_MCD; // valid CD image, check for BIOS.. // we need to have config loaded at this point @@ -349,22 +385,27 @@ int emu_ReloadRom(void) } if (!emu_findBios(cd_region, &used_rom_name)) { // bios_help() ? + PicoAHW &= ~PAHW_MCD; return 0; } - PicoMCD |= 1; get_ext(used_rom_name, ext); } else { - if (PicoMCD & 1) Stop_CD(); - PicoMCD &= ~1; + if (PicoAHW & PAHW_MCD) Stop_CD(); + PicoAHW &= ~PAHW_MCD; } rom = pm_open(used_rom_name); if (!rom) { - sprintf(menuErrorMsg, "Failed to open rom."); - return 0; + me_update_msg("Failed to open ROM/CD image"); + goto fail; + } + + if (cd_state < 0) { + me_update_msg("Invalid CD image"); + goto fail; } menu_romload_prepare(used_rom_name); // also CD load @@ -373,24 +414,25 @@ int emu_ReloadRom(void) rom_loaded = 0; if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) { - sprintf(menuErrorMsg, "PicoCartLoad() failed."); - lprintf("%s\n", menuErrorMsg); - pm_close(rom); - menu_romload_end(); - return 0; + if (ret == 2) me_update_msg("Out of memory"); + else if (ret == 3) me_update_msg("Read failed"); + else me_update_msg("PicoCartLoad() failed."); + goto fail2; } pm_close(rom); + rom = NULL; // detect wrong files (Pico crashes on very small files), also see if ROM EP is good if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 || ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) { if (rom_data) free(rom_data); - sprintf(menuErrorMsg, "Not a ROM selected."); - menu_romload_end(); - return 0; + me_update_msg("Not a ROM selected."); + goto fail2; } // load config for this ROM (do this before insert to get correct region) + if (!(PicoAHW & PAHW_MCD)) + memcpy(id_header, rom_data + 0x100, sizeof(id_header)); if (!cfg_loaded) { ret = emu_ReadConfig(1, 1); if (!ret) emu_ReadConfig(0, 1); @@ -398,88 +440,92 @@ int emu_ReloadRom(void) lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size); if (PicoCartInsert(rom_data, rom_size)) { - sprintf(menuErrorMsg, "Failed to load ROM."); - menu_romload_end(); - return 0; + me_update_msg("Failed to load ROM."); + goto fail2; } - Pico.m.frame_count = 0; - // insert CD if it was detected - if (cd_state > 0) { - ret = Insert_CD(romFileName, cd_state == 2); + if (cd_state != CIT_NOT_CD) { + ret = Insert_CD(rom_fname, cd_state); if (ret != 0) { - sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?"); - lprintf("%s\n", menuErrorMsg); - menu_romload_end(); - return 0; + me_update_msg("Insert_CD() failed, invalid CD image?"); + goto fail2; } } menu_romload_end(); - if (!emu_isBios(romFileName)) - { - // emu_ReadConfig() might have messed currentConfig.lastRomFile - strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1); - currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0; - } - if (PicoPatches) { PicoPatchPrepare(); PicoPatchApply(); } // additional movie stuff - if (movie_data) { - if(movie_data[0x14] == '6') - PicoOpt |= 0x20; // 6 button pad - else PicoOpt &= ~0x20; - PicoOpt |= 0x10040; // accurate timing, no VDP fifo timing - if(movie_data[0xF] >= 'A') { - if(movie_data[0x16] & 0x80) { + if (movie_data) + { + if (movie_data[0x14] == '6') + PicoOpt |= POPT_6BTN_PAD; // 6 button pad + else PicoOpt &= ~POPT_6BTN_PAD; + PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing + if (movie_data[0xF] >= 'A') { + if (movie_data[0x16] & 0x80) { PicoRegionOverride = 8; } else { PicoRegionOverride = 4; } - PicoReset(0); + PicoReset(); // TODO: bits 6 & 5 } movie_data[0x18+30] = 0; - sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]); + plat_status_msg("MOVIE: %s", (char *) &movie_data[0x18]); } else { - PicoOpt &= ~0x10000; - if(Pico.m.pal) { - strcpy(noticeMsg, "PAL SYSTEM / 50 FPS"); - } else { - strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS"); - } + PicoOpt &= ~POPT_DIS_VDP_FIFO; + plat_status_msg(Pico.m.pal ? "PAL SYSTEM / 50 FPS" : "NTSC SYSTEM / 60 FPS"); } - emu_noticeMsgUpdated(); // load SRAM for this ROM - if (currentConfig.EmuOpt & 1) + if (currentConfig.EmuOpt & EOPT_USE_SRAM) emu_SaveLoadGame(1, 1); + strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1); + rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0; rom_loaded = 1; return 1; + +fail2: + menu_romload_end(); +fail: + if (rom != NULL) pm_close(rom); + return 0; } +void emu_shutdownMCD(void) +{ + if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL) + Stop_CD(); + PicoAHW &= ~PAHW_MCD; +} + static void romfname_ext(char *dst, const char *prefix, const char *ext) { char *p; int prefix_len = 0; // make save filename - for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++; + p = rom_fname_loaded + strlen(rom_fname_loaded) - 1; + for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++; *dst = 0; if (prefix) { - strcpy(dst, prefix); - prefix_len = strlen(prefix); + int len = emu_getMainDir(dst, 512); + strcpy(dst + len, prefix); + prefix_len = len + strlen(prefix); } +#ifdef UIQ3 + else p = rom_fname_loaded; // backward compatibility +#endif strncpy(dst + prefix_len, p, 511-prefix_len); dst[511-8] = 0; if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0; @@ -487,87 +533,104 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext) } +static void make_config_cfg(char *cfg) +{ + int len; + len = emu_getMainDir(cfg, 512); + strncpy(cfg + len, PicoConfigFile, 512-6-1-len); + if (config_slot != 0) + { + char *p = strrchr(cfg, '.'); + if (p == NULL) p = cfg + strlen(cfg); + sprintf(p, ".%i.cfg", config_slot); + } + cfg[511] = 0; +} + +void emu_packConfig(void) +{ + currentConfig.s_PicoOpt = PicoOpt; + currentConfig.s_PsndRate = PsndRate; + currentConfig.s_PicoRegion = PicoRegionOverride; + currentConfig.s_PicoAutoRgnOrder = PicoAutoRgnOrder; + currentConfig.s_PicoCDBuffers = PicoCDBuffers; +} + +void emu_unpackConfig(void) +{ + PicoOpt = currentConfig.s_PicoOpt; + PsndRate = currentConfig.s_PsndRate; + PicoRegionOverride = currentConfig.s_PicoRegion; + PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder; + PicoCDBuffers = currentConfig.s_PicoCDBuffers; +} + +static void emu_setDefaultConfig(void) +{ + memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig)); + emu_unpackConfig(); +} + + int emu_ReadConfig(int game, int no_defaults) { char cfg[512]; - FILE *f; int ret; if (!game) { if (!no_defaults) emu_setDefaultConfig(); - strncpy(cfg, PicoConfigFile, 511); - if (config_slot != 0) - { - char *p = strrchr(cfg, '.'); - if (p == NULL) p = cfg + strlen(cfg); - sprintf(p, ".%i.cfg", config_slot); - } - cfg[511] = 0; + make_config_cfg(cfg); ret = config_readsect(cfg, NULL); } else { - if (!no_defaults) - emu_setDefaultConfig(); + char *sect = emu_makeRomId(); // try new .cfg way if (config_slot != 0) sprintf(cfg, "game.%i.cfg", config_slot); else strcpy(cfg, "game.cfg"); - ret = config_readsect(cfg, emu_makeRomId()); - if (ret != 0) + ret = -1; + if (config_havesect(cfg, sect)) { - // fall back to old - char extbuf[16]; - if (config_slot != 0) - sprintf(extbuf, ".%i.pbcfg", config_slot); - else strcpy(extbuf, ".pbcfg"); - romfname_ext(cfg, "cfg/", extbuf); - f = fopen(cfg, "rb"); - if (!f) { - romfname_ext(cfg, NULL, ".pbcfg"); - f = fopen(cfg, "rb"); - } - if (f) { - int bread = fread(¤tConfig, 1, sizeof(currentConfig), f); - lprintf("emu_ReadConfig: %s %s\n", cfg, bread > 0 ? "(ok)" : "(failed)"); - fclose(f); - ret = 0; - } - - if (ret == 0) { - PicoOpt = currentConfig.s_PicoOpt; - PsndRate = currentConfig.s_PsndRate; - PicoRegionOverride = currentConfig.s_PicoRegion; - PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder; - PicoCDBuffers = currentConfig.s_PicoCDBuffers; - } + // read user's config + int vol = currentConfig.volume; + emu_setDefaultConfig(); + ret = config_readsect(cfg, sect); + currentConfig.volume = vol; // make vol global (bah) } else { - lprintf("loaded cf from game sect\n"); + // read global config, and apply game_def.cfg on top + make_config_cfg(cfg); + config_readsect(cfg, NULL); + ret = config_readsect("game_def.cfg", sect); + } + + if (ret == 0) + { + lprintf("loaded cfg from sect \"%s\"\n", sect); } } + plat_validate_config(); + // some sanity checks - if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; #ifdef PSP + /* TODO: mv to plat_validate_config() */ + if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; if (currentConfig.gamma < -4 || currentConfig.gamma > 16) currentConfig.gamma = 0; -#else - if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100; -#endif - if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50; -#ifdef __GP2X__ - // if volume keys are unbound, bind them to volume control - if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) { - currentConfig.KeyBinds[23] = 1<<29; // vol up - currentConfig.KeyBinds[22] = 1<<30; // vol down - } + if (currentConfig.gamma2 < 0 || currentConfig.gamma2 > 2) currentConfig.gamma2 = 0; #endif - if (ret == 0) config_slot_current = config_slot; + if (currentConfig.volume < 0 || currentConfig.volume > 99) + currentConfig.volume = 50; + + if (ret == 0) + config_slot_current = config_slot; + return (ret == 0); } @@ -579,24 +642,19 @@ int emu_WriteConfig(int is_game) if (!is_game) { - strncpy(cfg, PicoConfigFile, 511); - if (config_slot != 0) - { - char *p = strrchr(cfg, '.'); - if (p == NULL) p = cfg + strlen(cfg); - sprintf(p, ".%i.cfg", config_slot); - } - cfg[511] = 0; + make_config_cfg(cfg); write_lrom = 1; } else { if (config_slot != 0) sprintf(cfg, "game.%i.cfg", config_slot); else strcpy(cfg, "game.cfg"); game_sect = emu_makeRomId(); + lprintf("emu_WriteConfig: sect \"%s\"\n", game_sect); } lprintf("emu_WriteConfig: %s ", cfg); ret = config_writesect(cfg, game_sect); + if (write_lrom) config_writelrom(cfg); #ifndef NO_SYNC sync(); #endif @@ -607,73 +665,66 @@ int emu_WriteConfig(int is_game) } -void emu_textOut8(int x, int y, const char *text) +void emu_writelrom(void) { - int i,l,len=strlen(text); - unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; + char cfg[512]; + make_config_cfg(cfg); + config_writelrom(cfg); +#ifndef NO_SYNC + sync(); +#endif +} - /* always using built-in font */ - for (i = 0; i < len; i++) - { - for (l=0;l<8;l++) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l]; - if (fd&0x80) screen[l*SCREEN_WIDTH+0]=0xf0; - if (fd&0x40) screen[l*SCREEN_WIDTH+1]=0xf0; - if (fd&0x20) screen[l*SCREEN_WIDTH+2]=0xf0; - if (fd&0x10) screen[l*SCREEN_WIDTH+3]=0xf0; - if (fd&0x08) screen[l*SCREEN_WIDTH+4]=0xf0; - if (fd&0x04) screen[l*SCREEN_WIDTH+5]=0xf0; - if (fd&0x02) screen[l*SCREEN_WIDTH+6]=0xf0; - if (fd&0x01) screen[l*SCREEN_WIDTH+7]=0xf0; - } - screen += 8; - } +/* always using built-in font */ + +#define mk_text_out(name, type, val) \ +void name(int x, int y, const char *text) \ +{ \ + int i, l, len = strlen(text); \ + type *screen = (type *)g_screen_ptr + x + y * g_screen_width; \ + \ + for (i = 0; i < len; i++, screen += 8) \ + { \ + for (l = 0; l < 8; l++) \ + { \ + unsigned char fd = fontdata8x8[text[i] * 8 + l];\ + type *s = screen + l * g_screen_width; \ + if (fd&0x80) s[0] = val; \ + if (fd&0x40) s[1] = val; \ + if (fd&0x20) s[2] = val; \ + if (fd&0x10) s[3] = val; \ + if (fd&0x08) s[4] = val; \ + if (fd&0x04) s[5] = val; \ + if (fd&0x02) s[6] = val; \ + if (fd&0x01) s[7] = val; \ + } \ + } \ } -void emu_textOut16(int x, int y, const char *text) -{ - int i,l,len=strlen(text); - unsigned short *screen = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; +mk_text_out(emu_textOut8, unsigned char, 0xf0) +mk_text_out(emu_textOut16, unsigned short, 0xffff) - for (i = 0; i < len; i++) - { - for (l=0;l<8;l++) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l]; - if(fd&0x80) screen[l*SCREEN_WIDTH+0]=0xffff; - if(fd&0x40) screen[l*SCREEN_WIDTH+1]=0xffff; - if(fd&0x20) screen[l*SCREEN_WIDTH+2]=0xffff; - if(fd&0x10) screen[l*SCREEN_WIDTH+3]=0xffff; - if(fd&0x08) screen[l*SCREEN_WIDTH+4]=0xffff; - if(fd&0x04) screen[l*SCREEN_WIDTH+5]=0xffff; - if(fd&0x02) screen[l*SCREEN_WIDTH+6]=0xffff; - if(fd&0x01) screen[l*SCREEN_WIDTH+7]=0xffff; - } - screen += 8; - } -} +#undef mk_text_out -void emu_updateMovie(void) +void update_movie(void) { int offs = Pico.m.frame_count*3 + 0x40; if (offs+3 > movie_size) { free(movie_data); movie_data = 0; - strcpy(noticeMsg, "END OF MOVIE."); + plat_status_msg("END OF MOVIE."); lprintf("END OF MOVIE.\n"); - emu_noticeMsgUpdated(); } else { // MXYZ SACB RLDU PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU - if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // A - if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // B - if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // A + if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // C + if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // A + if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // B PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU - if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A - if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B - if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A + if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // C + if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // A + if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // B PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z @@ -714,11 +765,11 @@ char *emu_GetSaveFName(int load, int is_sram, int slot) if (is_sram) { - romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm"); + romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm"); if (load) { if (try_ropen_file(saveFname)) return saveFname; // try in current dir.. - romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm"); + romfname_ext(saveFname, NULL, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm"); if (try_ropen_file(saveFname)) return saveFname; return NULL; // give up } @@ -727,19 +778,21 @@ char *emu_GetSaveFName(int load, int is_sram, int slot) { ext[0] = 0; if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot); - strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds"); + strcat(ext, (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds.gz" : ".mds"); - romfname_ext(saveFname, "mds/", ext); + romfname_ext(saveFname, "mds" PATH_SEP, ext); if (load) { if (try_ropen_file(saveFname)) return saveFname; romfname_ext(saveFname, NULL, ext); if (try_ropen_file(saveFname)) return saveFname; - if (currentConfig.EmuOpt & 8) { + // no gzipped states, search for non-gzipped + if (currentConfig.EmuOpt & EOPT_GZIP_SAVES) + { ext[0] = 0; if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot); strcat(ext, ".mds"); - romfname_ext(saveFname, "mds/", ext); + romfname_ext(saveFname, "mds"PATH_SEP, ext); if (try_ropen_file(saveFname)) return saveFname; romfname_ext(saveFname, NULL, ext); if (try_ropen_file(saveFname)) return saveFname; @@ -781,10 +834,8 @@ int emu_SaveLoadGame(int load, int sram) // make save filename saveFname = emu_GetSaveFName(load, sram, state_slot); if (saveFname == NULL) { - if (!sram) { - strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED "); - emu_noticeMsgUpdated(); - } + if (!sram) + plat_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED"); return -1; } @@ -796,8 +847,9 @@ int emu_SaveLoadGame(int load, int sram) int sram_size; unsigned char *sram_data; int truncate = 1; - if (PicoMCD&1) { - if (PicoOpt&0x8000) { // MCD RAM cart? + if (PicoAHW & PAHW_MCD) + { + if (PicoOpt&POPT_EN_MCD_RAMCART) { sram_size = 0x12000; sram_data = SRam.data; if (sram_data) @@ -814,12 +866,13 @@ int emu_SaveLoadGame(int load, int sram) } if (!sram_data) return 0; // SRam forcefully disabled for this game - if (load) { + if (load) + { sramFile = fopen(saveFname, "rb"); if(!sramFile) return -1; fread(sram_data, 1, sram_size, sramFile); fclose(sramFile); - if ((PicoMCD&1) && (PicoOpt&0x8000)) + if ((PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_RAMCART)) memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4); } else { // sram save needs some special processing @@ -868,14 +921,193 @@ int emu_SaveLoadGame(int load, int sram) } else ret = -1; if (!ret) - strcpy(noticeMsg, load ? "GAME LOADED " : "GAME SAVED "); + plat_status_msg(load ? "GAME LOADED" : "GAME SAVED"); else { - strcpy(noticeMsg, load ? "LOAD FAILED " : "SAVE FAILED "); + plat_status_msg(load ? "LOAD FAILED" : "SAVE FAILED"); ret = -1; } - emu_noticeMsgUpdated(); return ret; } } + +void emu_changeFastForward(int set_on) +{ + static void *set_PsndOut = NULL; + static int set_Frameskip, set_EmuOpt, is_on = 0; + + if (set_on && !is_on) { + set_PsndOut = PsndOut; + set_Frameskip = currentConfig.Frameskip; + set_EmuOpt = currentConfig.EmuOpt; + PsndOut = NULL; + currentConfig.Frameskip = 8; + currentConfig.EmuOpt &= ~4; + currentConfig.EmuOpt |= 0x40000; + is_on = 1; + plat_status_msg("FAST FORWARD"); + } + else if (!set_on && is_on) { + PsndOut = set_PsndOut; + currentConfig.Frameskip = set_Frameskip; + currentConfig.EmuOpt = set_EmuOpt; + PsndRerate(1); + is_on = 0; + } +} + +void emu_RunEventsPico(unsigned int events) +{ + if (events & (1 << 3)) { + pico_inp_mode++; + if (pico_inp_mode > 2) + pico_inp_mode = 0; + switch (pico_inp_mode) { + case 2: plat_status_msg("Input: Pen on Pad"); break; + case 1: plat_status_msg("Input: Pen on Storyware"); break; + case 0: plat_status_msg("Input: Joystick"); + PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; + break; + } + } + if (events & (1 << 4)) { + PicoPicohw.page--; + if (PicoPicohw.page < 0) + PicoPicohw.page = 0; + plat_status_msg("Page %i", PicoPicohw.page); + } + if (events & (1 << 5)) { + PicoPicohw.page++; + if (PicoPicohw.page > 6) + PicoPicohw.page = 6; + plat_status_msg("Page %i", PicoPicohw.page); + } +} + +static void do_turbo(int *pad, int acts) +{ + static int turbo_pad = 0; + static unsigned char turbo_cnt[3] = { 0, 0, 0 }; + int inc = currentConfig.turbo_rate * 2; + + if (acts & 0x1000) { + turbo_cnt[0] += inc; + if (turbo_cnt[0] >= 60) + turbo_pad ^= 0x10, turbo_cnt[0] = 0; + } + if (acts & 0x2000) { + turbo_cnt[1] += inc; + if (turbo_cnt[1] >= 60) + turbo_pad ^= 0x20, turbo_cnt[1] = 0; + } + if (acts & 0x4000) { + turbo_cnt[2] += inc; + if (turbo_cnt[2] >= 60) + turbo_pad ^= 0x40, turbo_cnt[2] = 0; + } + *pad |= turbo_pad & (acts >> 8); +} + +static void run_ui_events(unsigned int which) +{ + if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE)) + { + int do_it = 1; + if ( emu_checkSaveFile(state_slot) && + (((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) || + ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) ) + { + const char *nm; + char tmp[64]; + int keys, len; + + strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE?" : "OVERWRITE SAVE?"); + len = strlen(tmp); + nm = in_get_key_name(-1, -PBTN_MA3); + snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm); + len = strlen(tmp); + nm = in_get_key_name(-1, -PBTN_MBACK); + snprintf(tmp + len, sizeof(tmp) - len, "%s=no)", nm); + + plat_status_msg_busy_first(tmp); + + in_set_blocking(1); + while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK)) + ; + while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) ) + ; + if (keys & PBTN_MBACK) + do_it = 0; + while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK)) + ; + in_set_blocking(0); + } + if (do_it) { + plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME"); + PicoStateProgressCB = plat_status_msg_busy_next; + emu_SaveLoadGame((which & PEV_STATE_LOAD) ? 1 : 0, 0); + PicoStateProgressCB = NULL; + } + } + if (which & PEV_SWITCH_RND) + { + plat_video_toggle_renderer(); + } + if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT)) + { + if (which & PEV_SSLOT_PREV) { + state_slot -= 1; + if (state_slot < 0) + state_slot = 9; + } else { + state_slot += 1; + if (state_slot > 9) + state_slot = 0; + } + + plat_status_msg("SAVE SLOT %i [%s]", state_slot, + emu_checkSaveFile(state_slot) ? "USED" : "FREE"); + } + if (which & PEV_MENU) + engineState = PGS_Menu; +} + +void emu_update_input(void) +{ + unsigned int allActions[2] = { 0, 0 }, events; + static unsigned int prevEvents = 0; + + /* FIXME: player2 */ + allActions[0] = in_update(); + + PicoPad[0] = allActions[0] & 0xfff; + PicoPad[1] = allActions[1] & 0xfff; + + if (allActions[0] & 0x7000) do_turbo(&PicoPad[0], allActions[0]); + if (allActions[1] & 0x7000) do_turbo(&PicoPad[1], allActions[1]); + + events = (allActions[0] | allActions[1]) & PEV_MASK; + + // volume is treated in special way and triggered every frame + if (events & (PEV_VOL_DOWN|PEV_VOL_UP)) + plat_update_volume(1, events & PEV_VOL_UP); + + if ((events ^ prevEvents) & PEV_FF) { + emu_changeFastForward(events & PEV_FF); + plat_update_volume(0, 0); +// reset_timing = 1; + } + + events &= ~prevEvents; + +// TODO if (PicoAHW == PAHW_PICO) +// RunEventsPico(events); + if (events) + run_ui_events(events); + if (movie_data) + update_movie(); + + prevEvents = (allActions[0] | allActions[1]) & PEV_MASK; +} +