X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=7c15cb0990a4aca073a0a125a516612a651e6c09;hp=61f023f0069ceac3b603620240925e3d0e63a946;hb=d81b8e972678928ffece2d38213de8048f5e872d;hpb=45d45c1e22620ef51023d0b8e09e85db9cb9380c diff --git a/frontend/main.c b/frontend/main.c index 61f023f0..7c15cb09 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -13,30 +13,42 @@ #include #include #include +#include #include "main.h" #include "plugin.h" #include "plugin_lib.h" #include "pcnt.h" #include "menu.h" +#include "plat.h" #include "../libpcsxcore/misc.h" +#include "../libpcsxcore/cheat.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" #include "common/plat.h" +#include "common/readpng.h" #include "common/input.h" +#include "linux/in_evdev.h" +#include "revision.h" + +// don't include debug.h - it breaks ARM build (R1 redefined) +void StartDebugger(); +void StopDebugger(); + +// sound plugin +extern int iUseReverb; +extern int iUseInterpolation; +extern int iXAPitch; +extern int iVolume; int ready_to_go; unsigned long gpuDisp; char cfgfile_basename[MAXPATHLEN]; -static char *(*real_getenv)(const char *name); int state_slot; enum sched_action emu_action, emu_action_old; char hud_msg[64]; int hud_new_msg; -// from softgpu plugin -extern int UseFrameSkip; - static void make_path(char *buf, size_t size, const char *dir, const char *fname) { if (fname) @@ -66,6 +78,24 @@ static void CheckSubDir() { create_profile_dir(CHEATS_DIR); create_profile_dir(PATCHES_DIR); create_profile_dir(PCSX_DOT_DIR "cfg"); + create_profile_dir("/screenshots/"); +} + +static int get_gameid_filename(char *buf, int size, const char *fmt, int i) { + char trimlabel[33]; + int j; + + strncpy(trimlabel, CdromLabel, 32); + trimlabel[32] = 0; + for (j = 31; j >= 0; j--) + if (trimlabel[j] == ' ') + trimlabel[j] = 0; + else + continue; + + snprintf(buf, size, fmt, trimlabel, CdromId, i); + + return 0; } void set_cd_image(const char *fname) @@ -77,7 +107,7 @@ void set_cd_image(const char *fname) if (ext && ( strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 || - strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) { + strcasecmp(ext, ".znx") == 0 /*|| strcasecmp(ext, ".pbp") == 0*/)) { SetIsoFile(NULL); cdrcimg_set_fname(fname); strcpy(Config.Cdr, "builtin_cdrcimg"); @@ -100,11 +130,64 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); - Config.PsxAuto = 1; snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); } +void emu_set_default_config(void) +{ + // try to set sane config on which most games work + Config.Xa = Config.Cdda = Config.Sio = + Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; + Config.CdrReschedule = 0; + Config.PsxAuto = 1; + + pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto + pl_rearmed_cbs.gpu_neon.enhancement_enable = + pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0; + pl_rearmed_cbs.gpu_peops.iUseDither = 0; + pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; + pl_rearmed_cbs.gpu_unai.abe_hack = + pl_rearmed_cbs.gpu_unai.no_light = + pl_rearmed_cbs.gpu_unai.no_blend = 0; + memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl)); + pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64; + pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1; + + iUseReverb = 2; + iUseInterpolation = 1; + iXAPitch = 0; + iVolume = 768; +#ifndef __ARM_ARCH_7A__ /* XXX */ + iUseReverb = 0; + iUseInterpolation = 0; +#endif + new_dynarec_hacks = 0; + cycle_multiplier = 200; + + in_type1 = PSE_PAD_TYPE_STANDARD; + in_type2 = PSE_PAD_TYPE_STANDARD; +} + +static void check_memcards(void) +{ + char buf[MAXPATHLEN]; + FILE *f; + int i; + + for (i = 1; i <= 9; i++) { + snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i); + + f = fopen(buf, "rb"); + if (f == NULL) { + printf("Creating memcard: %s\n", buf); + CreateMcd(buf); + } + else + fclose(f); + } +} + void do_emu_action(void) { int ret; @@ -112,11 +195,6 @@ void do_emu_action(void) emu_action_old = emu_action; switch (emu_action) { - case SACTION_NONE: - return; - case SACTION_ENTER_MENU: - menu_loop(); - return; case SACTION_LOAD_STATE: ret = emu_load_state(state_slot); snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "LOADED" : "FAIL!"); @@ -125,6 +203,10 @@ void do_emu_action(void) ret = emu_save_state(state_slot); snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "SAVED" : "FAIL!"); break; +#ifndef NO_FRONTEND + case SACTION_ENTER_MENU: + menu_loop(); + return; case SACTION_NEXT_SSLOT: state_slot++; if (state_slot > 9) @@ -134,37 +216,187 @@ void do_emu_action(void) state_slot--; if (state_slot < 0) state_slot = 9; - goto do_state_slot; +do_state_slot: + snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot, + emu_check_state(state_slot) == 0 ? "USED" : "FREE"); + hud_new_msg = 3; + printf("* %s\n", hud_msg); + break; case SACTION_TOGGLE_FSKIP: - UseFrameSkip ^= 1; - snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s", - UseFrameSkip ? "ON" : "OFF"); + pl_rearmed_cbs.fskip_advice = 0; + pl_rearmed_cbs.frameskip++; + if (pl_rearmed_cbs.frameskip > 1) + pl_rearmed_cbs.frameskip = -1; + snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP: %s", + pl_rearmed_cbs.frameskip == -1 ? "AUTO" : + pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" ); + plugin_call_rearmed_cbs(); + break; + case SACTION_TOGGLE_RENDERER: + pl_rearmed_cbs.gpu_neon.enhancement_enable = + !pl_rearmed_cbs.gpu_neon.enhancement_enable; + plugin_call_rearmed_cbs(); break; + case SACTION_SCREENSHOT: + { + char buf[MAXPATHLEN]; + void *scrbuf; + int w, h, bpp; + time_t t = time(NULL); + struct tm *tb = localtime(&t); + int ti = tb->tm_yday * 1000000 + tb->tm_hour * 10000 + + tb->tm_min * 100 + tb->tm_sec; + + scrbuf = pl_prepare_screenshot(&w, &h, &bpp); + get_gameid_filename(buf, sizeof(buf), + "screenshots/%.32s-%.9s.%d.png", ti); + ret = -1; + if (scrbuf != 0 && bpp == 16) + ret = writepng(buf, scrbuf, w, h); + if (ret == 0) + snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN"); + break; + } + case SACTION_VOLUME_UP: + case SACTION_VOLUME_DOWN: + plat_step_volume(emu_action == SACTION_VOLUME_UP); + return; + case SACTION_MINIMIZE: + if (GPU_close != NULL) + GPU_close(); + + plat_minimize(); + + if (GPU_open != NULL) { + ret = GPU_open(&gpuDisp, "PCSX", NULL); + if (ret) + fprintf(stderr, "GPU_open returned %d\n", ret); + } + return; +#endif + default: + return; } - hud_new_msg = 3; - return; -do_state_slot: - snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot, - emu_check_state(state_slot) == 0 ? "USED" : "FREE"); hud_new_msg = 3; } -int main(int argc, char *argv[]) +static int cdidcmp(const char *id1, const char *id2) { - void *tmp; - - tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY); - if (tmp == NULL) - tmp = dlopen("/lib32/libdl.so.2", RTLD_LAZY); - if (tmp != NULL) - real_getenv = dlsym(tmp, "getenv"); - if (real_getenv == NULL) { - fprintf(stderr, "%s\n", dlerror()); - return 1; + while (*id1 != 0 && *id2 != 0) { + if (*id1 == '_') { id1++; continue; } + if (*id2 == '_') { id2++; continue; } + if (*id1 != *id2) + break; + id1++; + id2++; + } + + return *id1 - *id2; +} + +static void parse_cwcheat(void) +{ + char line[256], buf[64], name[64], *p; + int newcheat = 1; + u32 a, v; + FILE *f; + + f = fopen("cheatpops.db", "r"); + if (f == NULL) + return; + + /* find the game */ + while (fgets(line, sizeof(line), f)) { + if (sscanf(line, "_S %63s", buf) != 1) + continue; + if (cdidcmp(buf, CdromId) == 0) + break; + } + + if (feof(f)) + goto out; + + printf("cwcheat section found for %s\n", CdromId); + while (fgets(line, sizeof(line), f)) + { + p = line + strlen(line); + for (p--; p >= line && (*p == '\r' || *p == '\n' || *p == ' '); p--) + *p = 0; + if (*p == 0 || *p == '#' || *p == ';') + continue; + + if (strncmp(line, "_S", 2) == 0) + break; + if (strncmp(line, "_G", 2) == 0) { + printf(" cwcheat game name: '%s'\n", line + 3); + continue; + } + if (strncmp(line, "_C0", 3) == 0) { + if (!newcheat && Cheats[NumCheats - 1].n == 0) { + printf("cheat '%s' failed to parse\n", name); + free(Cheats[NumCheats - 1].Descr); + NumCheats--; + } + snprintf(name, sizeof(name), "%s", line + 4); + newcheat = 1; + continue; + } + if (sscanf(line, "_L %x %x", &a, &v) != 2) { + printf("line failed to parse: '%s'\n", line); + continue; + } + + if (newcheat) { + if (NumCheats >= NumCheatsAllocated) { + NumCheatsAllocated += 16; + Cheats = realloc(Cheats, sizeof(Cheat) * + NumCheatsAllocated); + if (Cheats == NULL) + break; + } + Cheats[NumCheats].Descr = strdup(name); + Cheats[NumCheats].Enabled = 0; + Cheats[NumCheats].WasEnabled = 0; + Cheats[NumCheats].First = NumCodes; + Cheats[NumCheats].n = 0; + NumCheats++; + newcheat = 0; + } + + if (NumCodes >= NumCodesAllocated) { + NumCodesAllocated += 16; + CheatCodes = realloc(CheatCodes, sizeof(CheatCode) * + NumCodesAllocated); + if (CheatCodes == NULL) + break; + } + CheatCodes[NumCodes].Addr = a; + CheatCodes[NumCodes].Val = v; + NumCodes++; + Cheats[NumCheats - 1].n++; } - dlclose(tmp); +out: + fclose(f); +} + +void emu_on_new_cd(void) +{ + ClearAllCheats(); + parse_cwcheat(); + + if (Config.HLE) { + printf("note: running with HLE BIOS, expect compatibility problems\n"); + printf("----------------------------------------------------------\n"); + } + + snprintf(hud_msg, sizeof(hud_msg), "Booting up..."); + hud_new_msg = 2; +} + +int emu_core_preinit(void) +{ // what is the name of the config file? // it may be redefined by -cfg on the command line strcpy(cfgfile_basename, "pcsx.cfg"); @@ -174,23 +406,48 @@ int main(int argc, char *argv[]) memset(&Config, 0, sizeof(Config)); - CheckSubDir(); set_default_paths(); + emu_set_default_config(); strcpy(Config.Bios, "HLE"); -#ifdef MAEMO - extern int maemo_main(int argc, char **argv); - return maemo_main(argc, argv); -#else + return 0; +} + +int emu_core_init(void) +{ + CheckSubDir(); + check_memcards(); + + if (EmuInit() == -1) { + printf("PSX emulator couldn't be initialized.\n"); + return -1; + } + + LoadMcds(Config.Mcd1, Config.Mcd2); + + if (Config.Debug) { + StartDebugger(); + } + + return 0; +} + +#ifndef NO_FRONTEND +int main(int argc, char *argv[]) +{ char file[MAXPATHLEN] = ""; char path[MAXPATHLEN]; const char *cdfile = NULL; + const char *loadst_f = NULL; + int psxout = 0; int loadst = 0; int i; + emu_core_preinit(); + // read command line options for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1; + if (!strcmp(argv[i], "-psxout")) psxout = 1; else if (!strcmp(argv[i], "-load")) loadst = atol(argv[++i]); else if (!strcmp(argv[i], "-cfg")) { if (i+1 >= argc) break; @@ -214,20 +471,23 @@ int main(int argc, char *argv[]) cdfile = isofilename; } + else if (!strcmp(argv[i], "-loadf")) { + if (i+1 >= argc) break; + loadst_f = argv[++i]; + } else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "-help") || !strcmp(argv[i], "--help")) { - printf(PACKAGE_NAME " " PACKAGE_VERSION "\n"); + printf("PCSX-ReARMed " REV "\n"); printf("%s\n", _( " pcsx [options] [file]\n" "\toptions:\n" "\t-cdfile FILE\tRuns a CD image file\n" - "\t-nogui\t\tDon't open the GTK GUI\n" "\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n" "\t-psxout\t\tEnable PSX output\n" "\t-load STATENUM\tLoads savestate STATENUM (1-5)\n" "\t-h -help\tDisplay this message\n" - "\tfile\t\tLoads file\n")); + "\tfile\t\tLoads a PSX EXE file\n")); return 0; } else { strncpy(file, argv[i], MAXPATHLEN); @@ -246,14 +506,18 @@ int main(int argc, char *argv[]) if (cdfile) set_cd_image(cdfile); - if (SysInit() == -1) - return 1; - // frontend stuff + // init input but leave probing to platform code, + // they add input drivers and may need to modify them after probe in_init(); - in_probe(); + pl_init(); plat_init(); - menu_init(); + menu_init(); // loads config + + emu_core_init(); + + if (psxout) + Config.PsxOut = 1; if (LoadPlugins() == -1) { // FIXME: this recovery doesn't work, just delete bad config and bail out @@ -284,6 +548,7 @@ int main(int argc, char *argv[]) printf(_("Could not load CD-ROM!\n")); return -1; } + emu_on_new_cd(); ready_to_go = 1; } } @@ -296,6 +561,10 @@ int main(int argc, char *argv[]) int ret = emu_load_state(loadst - 1); printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst); } + if (loadst_f) { + int ret = LoadState(loadst_f); + printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f); + } } else menu_loop(); @@ -312,33 +581,14 @@ int main(int argc, char *argv[]) do_emu_action(); } - return 0; -#endif -} - -int SysInit() { - if (EmuInit() == -1) { - printf("PSX emulator couldn't be initialized.\n"); - return -1; - } - - LoadMcds(Config.Mcd1, Config.Mcd2); /* TODO Do we need to have this here, or in the calling main() function?? */ - - if (Config.Debug) { - StartDebugger(); - } - return 0; } +#endif void SysRunGui() { printf("SysRunGui\n"); } -void StartGui() { - printf("StartGui\n"); -} - static void dummy_lace() { } @@ -350,6 +600,9 @@ void SysReset() { void *real_lace = GPU_updateLace; GPU_updateLace = dummy_lace; + // reset can run code, timing must be set + pl_timing_prepare(Config.PsxType); + EmuReset(); // hmh core forgets this @@ -372,30 +625,17 @@ void SysUpdate() { void OnFile_Exit() { printf("OnFile_Exit\n"); -#ifndef MAEMO + SysClose(); +#ifndef NO_FRONTEND menu_finish(); -#endif plat_finish(); - SysClose(); exit(0); +#endif } int get_state_filename(char *buf, int size, int i) { - char trimlabel[33]; - int j; - - strncpy(trimlabel, CdromLabel, 32); - trimlabel[32] = 0; - for (j = 31; j >= 0; j--) - if (trimlabel[j] == ' ') - trimlabel[j] = 0; - else - continue; - - snprintf(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d", - trimlabel, CdromId, i); - - return 0; + return get_gameid_filename(buf, size, + "." STATES_DIR "%.32s-%.9s.%3.3d", i); } int emu_check_state(int slot) @@ -419,7 +659,12 @@ int emu_save_state(int slot) if (ret != 0) return ret; - return SaveState(fname); + ret = SaveState(fname); +#ifndef __ARM_ARCH_7A__ /* XXX */ + sync(); +#endif + printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot); + return ret; } int emu_load_state(int slot) @@ -499,7 +744,7 @@ static int _OpenPlugins(void) { MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL); - strcpy(info.EmuName, "PCSX " PACKAGE_VERSION); + strcpy(info.EmuName, "PCSX"); strncpy(info.CdromID, CdromId, 9); strncpy(info.CdromLabel, CdromLabel, 9); info.psxMem = psxM; @@ -585,20 +830,6 @@ void ClosePlugins() { } } -#if 1 -/* this is to avoid having to hack every plugin to stop using $HOME */ -char *getenv(const char *name) -{ - static char ret[8] = "."; - - if (name && strcmp(name, "HOME") == 0 && - ((int)name >> 28) == 0) // HACK: let libs find home - return ret; - - return real_getenv(name); -} -#endif - /* we hook statically linked plugins here */ static const char *builtin_plugins[] = { "builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad", @@ -626,9 +857,11 @@ void *SysLoadLibrary(const char *lib) { #if defined(__x86_64__) || defined(__i386__) // convenience hack - char name[MAXPATHLEN]; - snprintf(name, sizeof(name), "%s.x86", lib); - lib = name; + if (strstr(lib, ".x86") == NULL) { + char name[MAXPATHLEN]; + snprintf(name, sizeof(name), "%s.x86_64", lib); + lib = name; + } #endif ret = dlopen(lib, RTLD_NOW);