X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=bb6aaa95fdbb2f74415a2083bbe03e0518e2c42c;hp=7b3aac53a205f7d2ae99a40c7199906f836cd198;hb=38c2028e228dcf17f3b4b0ac7e6984d1e1c6df79;hpb=5440b88ee29ee5b8929fcf338dfc8f476468514d diff --git a/frontend/main.c b/frontend/main.c index 7b3aac53..bb6aaa95 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -22,12 +22,14 @@ #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(); @@ -37,8 +39,6 @@ void StopDebugger(); extern int iUseReverb; extern int iUseInterpolation; extern int iXAPitch; -extern int iSPUIRQWait; -extern int iUseTimer; extern int iVolume; int ready_to_go; @@ -131,7 +131,7 @@ static void set_default_paths(void) strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); #if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */ - strcpy(Config.Gpu, "gpuPCSX4ALL.so"); + strcpy(Config.Gpu, "gpu_unai.so"); #endif snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); @@ -145,18 +145,19 @@ void emu_set_default_config(void) Config.CdrReschedule = 0; Config.PsxAuto = 1; + pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto 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; - pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto + 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; - iSPUIRQWait = 1; - iUseTimer = 2; iVolume = 768; #ifndef __ARM_ARCH_7A__ /* XXX */ iUseReverb = 0; @@ -190,15 +191,11 @@ static void check_memcards(void) void do_emu_action(void) { - char buf[MAXPATHLEN]; int ret; emu_action_old = emu_action; switch (emu_action) { - 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!"); @@ -207,6 +204,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) @@ -216,7 +217,12 @@ 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: pl_rearmed_cbs.fskip_advice = 0; pl_rearmed_cbs.frameskip++; @@ -229,6 +235,7 @@ void do_emu_action(void) break; case SACTION_SCREENSHOT: { + char buf[MAXPATHLEN]; void *scrbuf; int w, h, bpp; time_t t = time(NULL); @@ -250,20 +257,132 @@ void do_emu_action(void) case SACTION_VOLUME_DOWN: plat_step_volume(emu_action == SACTION_VOLUME_UP); return; + case SACTION_MINIMIZE: + plat_minimize(); + 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; - printf("* %s\n", hud_msg); } -int main(int argc, char *argv[]) +static int cdidcmp(const char *id1, const char *id2) +{ + 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++; + } + +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 @@ -274,16 +393,35 @@ int main(int argc, char *argv[]) memset(&Config, 0, sizeof(Config)); - CheckSubDir(); set_default_paths(); emu_set_default_config(); - check_memcards(); 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; @@ -292,6 +430,8 @@ int main(int argc, char *argv[]) int loadst = 0; int i; + emu_core_preinit(); + // read command line options for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-psxout")) psxout = 1; @@ -325,17 +465,16 @@ int main(int argc, char *argv[]) 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); @@ -354,17 +493,16 @@ 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_evdev_init(); - //in_probe(); pl_init(); plat_init(); menu_init(); // loads config + emu_core_init(); + if (psxout) Config.PsxOut = 1; @@ -397,6 +535,7 @@ int main(int argc, char *argv[]) printf(_("Could not load CD-ROM!\n")); return -1; } + emu_on_new_cd(); ready_to_go = 1; } } @@ -429,33 +568,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); - - if (Config.Debug) { - StartDebugger(); - } - return 0; } +#endif void SysRunGui() { printf("SysRunGui\n"); } -void StartGui() { - printf("StartGui\n"); -} - static void dummy_lace() { } @@ -492,12 +612,12 @@ void SysUpdate() { void OnFile_Exit() { printf("OnFile_Exit\n"); -#ifndef MAEMO - menu_finish(); -#endif SysClose(); +#ifndef NO_FRONTEND + menu_finish(); plat_finish(); exit(0); +#endif } int get_state_filename(char *buf, int size, int i) { @@ -527,6 +647,9 @@ int emu_save_state(int slot) return ret; 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; } @@ -608,7 +731,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; @@ -721,9 +844,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);