X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=15eae7166e5e0af9e5305013aaea1a4b10b113a5;hp=068fe501f639ebaafaf5291206d4b1461f2dd978;hb=2c843d964027089a747453afc0b07d0eac5835d9;hpb=e64dc4c54e96643522dc4b8c205d143c7d9b2f1d diff --git a/frontend/main.c b/frontend/main.c index 068fe501..15eae716 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -20,17 +20,29 @@ #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/input.h" #include "common/readpng.h" +#include "common/input.h" +#include "linux/in_evdev.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]; @@ -94,7 +106,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"); @@ -117,11 +129,65 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); - Config.PsxAuto = 1; +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */ + strcpy(Config.Gpu, "gpu_unai.so"); +#endif 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_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) { char buf[MAXPATHLEN]; @@ -130,8 +196,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; @@ -154,9 +218,14 @@ void do_emu_action(void) state_slot = 9; goto do_state_slot; case SACTION_TOGGLE_FSKIP: - pl_rearmed_cbs.frameskip ^= 1; - snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s", - pl_rearmed_cbs.frameskip ? "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_SCREENSHOT: { @@ -177,6 +246,15 @@ void do_emu_action(void) 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: + plat_minimize(); + return; + default: + return; } hud_new_msg = 3; return; @@ -185,23 +263,125 @@ 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) { - 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; } - dlclose(tmp); + 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 main(int argc, char *argv[]) +{ // what is the name of the config file? // it may be redefined by -cfg on the command line strcpy(cfgfile_basename, "pcsx.cfg"); @@ -213,6 +393,8 @@ int main(int argc, char *argv[]) CheckSubDir(); set_default_paths(); + emu_set_default_config(); + check_memcards(); strcpy(Config.Bios, "HLE"); #ifdef MAEMO @@ -293,8 +475,10 @@ int main(int argc, char *argv[]) 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(); // loads config @@ -330,6 +514,7 @@ int main(int argc, char *argv[]) printf(_("Could not load CD-ROM!\n")); return -1; } + emu_on_new_cd(); ready_to_go = 1; } } @@ -372,7 +557,7 @@ int SysInit() { return -1; } - LoadMcds(Config.Mcd1, Config.Mcd2); /* TODO Do we need to have this here, or in the calling main() function?? */ + LoadMcds(Config.Mcd1, Config.Mcd2); if (Config.Debug) { StartDebugger(); @@ -400,6 +585,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 @@ -456,7 +644,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) @@ -622,20 +815,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", @@ -663,9 +842,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);