\r
#include <Pico/PicoInt.h>\r
#include <Pico/Patch.h>\r
+#include <Pico/cd/cue.h>\r
#include <zlib/zlib.h>\r
\r
#if defined(__GP2X__)\r
strlwr_(ext);\r
}\r
\r
-char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
-char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210" };\r
+char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
+char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303" };\r
char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
\r
int emu_findBios(int region, char **bios_file)\r
{\r
unsigned char buf[32];\r
pm_file *cd_f;\r
- int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
+ int region = 4; // 1: Japan, 4: US, 8: Europe\r
+ char ext[5], *fname = romFileName;\r
+ cue_track_type type = CT_UNKNOWN;\r
+ cue_data_t *cue_data = NULL;\r
+\r
+ get_ext(romFileName, ext);\r
+ if (strcasecmp(ext, ".cue") == 0) {\r
+ cue_data = cue_parse(romFileName);\r
+ if (cue_data != NULL) {\r
+ fname = cue_data->tracks[1].fname;\r
+ type = cue_data->tracks[1].type;\r
+ }\r
+ }\r
+\r
+ cd_f = pm_open(fname);\r
+ if (cue_data != NULL)\r
+ cue_destroy(cue_data);\r
\r
- cd_f = pm_open(romFileName);\r
if (!cd_f) return 0; // let the upper level handle this\r
\r
if (pm_read(buf, 32, cd_f) != 32) {\r
return 0;\r
}\r
\r
- if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1; // Sega CD (ISO)\r
- if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2; // Sega CD (BIN)\r
- if (type == 0) {\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 == 1) ? 0x100 : 0x110, SEEK_SET);\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 == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\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] == 0xa1) region = 1; // JAP\r
\r
lprintf("detected %s Sega/Mega CD image with %s region\n",\r
- type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\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 extract_text(char *dest, unsigned char *src, int len, int swab)\r
+static int extract_text(char *dest, const unsigned char *src, int len, int swab)\r
{\r
char *p = dest;\r
int i;\r
static char id_string[3+0x11+0x11+0x30+16];\r
int pos, swab = 1;\r
\r
- if (PicoMCD & 1) {\r
+ if (PicoAHW & PAHW_MCD) {\r
strcpy(id_string, "CD|");\r
swab = 0;\r
}\r
free(movie_data);\r
movie_data = 0;\r
}\r
- if (!strcmp(ext, ".gmv")) {\r
+ if (!strcmp(ext, ".gmv"))\r
+ {\r
// check for both gmv and rom\r
int dummy;\r
FILE *movie_file = fopen(romFileName, "rb");\r
get_ext(romFileName, ext);\r
}\r
\r
- if ((PicoMCD & 1) && Pico_mcd != NULL)\r
+ if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)\r
Stop_CD();\r
\r
// check for MegaCD image\r
cd_state = emu_cdCheck(&cd_region);\r
- if (cd_state > 0)\r
+ if (cd_state != CIT_NOT_CD)\r
{\r
- PicoMCD |= 1;\r
+ PicoAHW |= PAHW_MCD;\r
// valid CD image, check for BIOS..\r
\r
// we need to have config loaded at this point\r
}\r
if (!emu_findBios(cd_region, &used_rom_name)) {\r
// bios_help() ?\r
- PicoMCD &= ~1;\r
+ PicoAHW &= ~PAHW_MCD;\r
return 0;\r
}\r
\r
}\r
else\r
{\r
- if (PicoMCD & 1) Stop_CD();\r
- PicoMCD &= ~1;\r
+ if (PicoAHW & PAHW_MCD) Stop_CD();\r
+ PicoAHW &= ~PAHW_MCD;\r
}\r
\r
rom = pm_open(used_rom_name);\r
}\r
\r
// load config for this ROM (do this before insert to get correct region)\r
- if (!(PicoMCD&1))\r
+ if (!(PicoAHW & PAHW_MCD))\r
memcpy(id_header, rom_data + 0x100, sizeof(id_header));\r
if (!cfg_loaded) {\r
ret = emu_ReadConfig(1, 1);\r
return 0;\r
}\r
\r
- Pico.m.frame_count = 0;\r
-\r
// insert CD if it was detected\r
- if (cd_state > 0) {\r
- ret = Insert_CD(romFileName, cd_state == 2);\r
+ if (cd_state != CIT_NOT_CD) {\r
+ ret = Insert_CD(romFileName, cd_state);\r
if (ret != 0) {\r
sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
lprintf("%s\n", menuErrorMsg);\r
// additional movie stuff\r
if (movie_data) {\r
if(movie_data[0x14] == '6')\r
- PicoOpt |= 0x20; // 6 button pad\r
- else PicoOpt &= ~0x20;\r
- PicoOpt |= 0x10040; // accurate timing, no VDP fifo timing\r
+ PicoOpt |= POPT_6BTN_PAD; // 6 button pad\r
+ else PicoOpt &= ~POPT_6BTN_PAD;\r
+ PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing\r
if(movie_data[0xF] >= 'A') {\r
if(movie_data[0x16] & 0x80) {\r
PicoRegionOverride = 8;\r
} else {\r
PicoRegionOverride = 4;\r
}\r
- PicoReset(0);\r
+ PicoReset();\r
// TODO: bits 6 & 5\r
}\r
movie_data[0x18+30] = 0;\r
}\r
else\r
{\r
- PicoOpt &= ~0x10000;\r
+ PicoOpt &= ~POPT_DIS_VDP_FIFO;\r
if(Pico.m.pal) {\r
strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
} else {\r
}\r
\r
\r
+static void make_config_cfg(char *cfg)\r
+{\r
+ strncpy(cfg, PicoConfigFile, 511);\r
+ if (config_slot != 0)\r
+ {\r
+ char *p = strrchr(cfg, '.');\r
+ if (p == NULL) p = cfg + strlen(cfg);\r
+ sprintf(p, ".%i.cfg", config_slot);\r
+ }\r
+ cfg[511] = 0;\r
+}\r
+\r
int emu_ReadConfig(int game, int no_defaults)\r
{\r
char cfg[512];\r
{\r
if (!no_defaults)\r
emu_setDefaultConfig();\r
- strncpy(cfg, PicoConfigFile, 511);\r
- if (config_slot != 0)\r
- {\r
- char *p = strrchr(cfg, '.');\r
- if (p == NULL) p = cfg + strlen(cfg);\r
- sprintf(p, ".%i.cfg", config_slot);\r
- }\r
- cfg[511] = 0;\r
+ make_config_cfg(cfg);\r
ret = config_readsect(cfg, NULL);\r
}\r
else\r
else strcpy(cfg, "game.cfg");\r
\r
ret = -1;\r
- if (config_havesect(cfg, sect)) {\r
+ if (config_havesect(cfg, sect))\r
+ {\r
+ // read user's config\r
int vol = currentConfig.volume;\r
emu_setDefaultConfig();\r
ret = config_readsect(cfg, sect);\r
currentConfig.volume = vol; // make vol global (bah)\r
}\r
+ else\r
+ {\r
+ // read global config, and apply game_def.cfg on top\r
+ make_config_cfg(cfg);\r
+ config_readsect(cfg, NULL);\r
+ ret = config_readsect("game_def.cfg", sect);\r
+ }\r
\r
if (ret != 0)\r
{\r
- // fall back to old\r
+ // fall back to old game specific cfg\r
char extbuf[16];\r
if (config_slot != 0)\r
sprintf(extbuf, ".%i.pbcfg", config_slot);\r
PsndRate = currentConfig.s_PsndRate;\r
PicoRegionOverride = currentConfig.s_PicoRegion;\r
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
- PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
+ // PicoCDBuffers = currentConfig.s_PicoCDBuffers; // ignore in this case\r
}\r
}\r
else\r
if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r
#ifdef PSP\r
if (currentConfig.gamma < -4 || currentConfig.gamma > 16) currentConfig.gamma = 0;\r
+ if (currentConfig.gamma2 < 0 || currentConfig.gamma2 > 2) currentConfig.gamma2 = 0;\r
#else\r
if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;\r
#endif\r
}\r
}\r
\r
+#ifdef PSP\r
+#define MAX_COMBO_KEY 23\r
+#else\r
+#define MAX_COMBO_KEY 31\r
+#endif\r
+\r
void emu_findKeyBindCombos(void)\r
{\r
int act, u;\r
if (act == 16 || act == 17) continue; // player2 flag\r
if (act > 17)\r
{\r
- for (u = 0; u < 32; u++)\r
+ for (u = 0; u <= MAX_COMBO_KEY; u++)\r
if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;\r
}\r
else\r
{\r
- for (u = 0; u < 32; u++)\r
+ for (u = 0; u <= MAX_COMBO_KEY; u++)\r
if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1\r
(currentConfig.KeyBinds[u] & (1 << act))) keyc++;\r
- for (u = 0; u < 32; u++)\r
+ for (u = 0; u <= MAX_COMBO_KEY; u++)\r
if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2\r
(currentConfig.KeyBinds[u] & (1 << act))) keyc2++;\r
if (keyc2 > keyc) keyc = keyc2;\r
if (keyc > 1)\r
{\r
// loop again and mark those keys and actions as combo\r
- for (u = 0; u < 32; u++)\r
+ for (u = 0; u <= MAX_COMBO_KEY; u++)\r
{\r
if (currentConfig.KeyBinds[u] & (1 << act)) {\r
kb_combo_keys |= 1 << u;\r
\r
if (is_sram)\r
{\r
- romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");\r
+ romfname_ext(saveFname, (PicoAHW&1) ? "brm/" : "srm/", (PicoAHW&1) ? ".brm" : ".srm");\r
if (load) {\r
if (try_ropen_file(saveFname)) return saveFname;\r
// try in current dir..\r
- romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");\r
+ romfname_ext(saveFname, NULL, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
if (try_ropen_file(saveFname)) return saveFname;\r
return NULL; // give up\r
}\r
int sram_size;\r
unsigned char *sram_data;\r
int truncate = 1;\r
- if (PicoMCD&1) {\r
- if (PicoOpt&0x8000) { // MCD RAM cart?\r
+ if (PicoAHW & PAHW_MCD)\r
+ {\r
+ if (PicoOpt&POPT_EN_MCD_RAMCART) {\r
sram_size = 0x12000;\r
sram_data = SRam.data;\r
if (sram_data)\r
}\r
if (!sram_data) return 0; // SRam forcefully disabled for this game\r
\r
- if (load) {\r
+ if (load)\r
+ {\r
sramFile = fopen(saveFname, "rb");\r
if(!sramFile) return -1;\r
fread(sram_data, 1, sram_size, sramFile);\r
fclose(sramFile);\r
- if ((PicoMCD&1) && (PicoOpt&0x8000))\r
+ if ((PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_RAMCART))\r
memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
} else {\r
// sram save needs some special processing\r
notaz.gp2x.de / picodrive.git / blobdiff