X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=dc5be3cfeb8232e2f208f6008817b5181890d0e2;hp=32b12eaa2a24e484e9c8e8a0dd70d009cf1a8b86;hb=b07c18e8645a17be916266820ae564e0d320cc1a;hpb=2c8869044c0faff01c6bb8986346f78f631ceac1 diff --git a/frontend/main.c b/frontend/main.c index 32b12eaa..dc5be3cf 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/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" + +// 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 iSPUIRQWait; +extern int iUseTimer; +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,20 +130,75 @@ 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, "gpuPCSX4ALL.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; + iSPUIRQWait = 1; + iUseTimer = 2; + 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]; int ret; emu_action_old = emu_action; switch (emu_action) { - case SACTION_NONE: - return; case SACTION_ENTER_MENU: menu_loop(); return; @@ -136,10 +221,43 @@ void do_emu_action(void) state_slot = 9; goto do_state_slot; 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_SCREENSHOT: + { + 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: + plat_minimize(); + return; + default: + return; } hud_new_msg = 3; return; @@ -148,23 +266,11 @@ 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[]) { - 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; - } - dlclose(tmp); - // what is the name of the config file? // it may be redefined by -cfg on the command line strcpy(cfgfile_basename, "pcsx.cfg"); @@ -176,6 +282,8 @@ int main(int argc, char *argv[]) CheckSubDir(); set_default_paths(); + emu_set_default_config(); + check_memcards(); strcpy(Config.Bios, "HLE"); #ifdef MAEMO @@ -185,12 +293,14 @@ 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; // 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,6 +324,10 @@ 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")) { @@ -250,10 +364,15 @@ 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(); + menu_init(); // loads config + + if (psxout) + Config.PsxOut = 1; if (LoadPlugins() == -1) { // FIXME: this recovery doesn't work, just delete bad config and bail out @@ -296,6 +415,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(); @@ -322,7 +445,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(); @@ -350,6 +473,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 @@ -381,21 +507,8 @@ void OnFile_Exit() { } 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 +532,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) @@ -585,20 +703,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",