X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=0f0e641bce0e88c82f5404c0c2aed694600b051d;hp=9d3cc333c4192e8a1e86ca00ef4673b40bdeec02;hb=e6495add01b91c6ebb9fdb15920fc7fa431d647e;hpb=9c27c2051287b235fe0dba18a74b3863a3062646 diff --git a/frontend/main.c b/frontend/main.c index 9d3cc333..0f0e641b 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -1,5 +1,5 @@ /* - * (C) notaz, 2010-2011 + * (C) notaz, 2010-2012 * * This work is licensed under the terms of the GNU GPLv2 or later. * See the COPYING file in the top-level directory. @@ -25,10 +25,20 @@ #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" + +#ifndef NO_FRONTEND +#include "libpicofe/input.h" +#include "libpicofe/plat.h" +#include "libpicofe/readpng.h" + +static void toggle_fast_forward(int force_off); +static void check_profile(void); +static void check_memcards(void); +#endif +#ifndef BOOT_MSG +#define BOOT_MSG "Booting up..." +#endif // don't include debug.h - it breaks ARM build (R1 redefined) void StartDebugger(); @@ -40,7 +50,7 @@ extern int iUseInterpolation; extern int iXAPitch; extern int iVolume; -int ready_to_go; +int ready_to_go, g_resetting; unsigned long gpuDisp; char cfgfile_basename[MAXPATHLEN]; int state_slot; @@ -58,28 +68,6 @@ static void make_path(char *buf, size_t size, const char *dir, const char *fname #define MAKE_PATH(buf, dir, fname) \ make_path(buf, sizeof(buf), dir, fname) -static void create_profile_dir(const char *directory) { - char path[MAXPATHLEN]; - - MAKE_PATH(path, directory, NULL); - mkdir(path, S_IRWXU | S_IRWXG); -} - -static void CheckSubDir() { - // make sure that ~/.pcsx exists - create_profile_dir(PCSX_DOT_DIR); - - create_profile_dir(BIOS_DIR); - create_profile_dir(MEMCARD_DIR); - create_profile_dir(STATES_DIR); - create_profile_dir(PLUGINS_DIR); - create_profile_dir(PLUGINS_CFG_DIR); - 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; @@ -118,9 +106,12 @@ void set_cd_image(const char *fname) static void set_default_paths(void) { +#ifndef NO_FRONTEND + snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd"); MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd"); strcpy(Config.BiosDir, "bios"); +#endif strcpy(Config.PluginsDir, "plugins"); strcpy(Config.Gpu, "builtin_gpu"); @@ -129,11 +120,6 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); -#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) @@ -141,10 +127,11 @@ 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 = @@ -169,36 +156,13 @@ void emu_set_default_config(void) 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_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 +171,11 @@ 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: + toggle_fast_forward(1); + menu_loop(); + return; case SACTION_NEXT_SSLOT: state_slot++; if (state_slot > 9) @@ -216,7 +185,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; + SysPrintf("* %s\n", hud_msg); + break; case SACTION_TOGGLE_FSKIP: pl_rearmed_cbs.fskip_advice = 0; pl_rearmed_cbs.frameskip++; @@ -227,8 +201,37 @@ void do_emu_action(void) pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" ); plugin_call_rearmed_cbs(); break; + case SACTION_SWITCH_DISPMODE: + pl_switch_dispmode(); + plugin_call_rearmed_cbs(); + if (GPU_open != NULL && GPU_close != NULL) { + GPU_close(); + GPU_open(&gpuDisp, "PCSX", NULL); + } + break; + case SACTION_FAST_FORWARD: + toggle_fast_forward(0); + plugin_call_rearmed_cbs(); + break; + case SACTION_TOGGLE_FPS: + if ((g_opts & (OPT_SHOWFPS|OPT_SHOWCPU)) + == (OPT_SHOWFPS|OPT_SHOWCPU)) + g_opts &= ~(OPT_SHOWFPS|OPT_SHOWCPU); + else if (g_opts & OPT_SHOWFPS) + g_opts |= OPT_SHOWCPU; + else + g_opts |= OPT_SHOWFPS; + break; + case SACTION_TOGGLE_FULLSCREEN: + plat_target.vout_fullscreen = !plat_target.vout_fullscreen; + if (GPU_open != NULL && GPU_close != NULL) { + GPU_close(); + GPU_open(&gpuDisp, "PCSX", NULL); + } + break; case SACTION_SCREENSHOT: { + char buf[MAXPATHLEN]; void *scrbuf; int w, h, bpp; time_t t = time(NULL); @@ -248,22 +251,33 @@ void do_emu_action(void) } case SACTION_VOLUME_UP: case SACTION_VOLUME_DOWN: - plat_step_volume(emu_action == SACTION_VOLUME_UP); + plat_target_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) + SysMessage("GPU_open returned %d", 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; - printf("* %s\n", hud_msg); +} + +static char basic_lcase(char c) +{ + if ('A' <= c && c <= 'Z') + return c - 'A' + 'a'; + return c; } static int cdidcmp(const char *id1, const char *id2) @@ -271,7 +285,7 @@ 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) + if (basic_lcase(*id1) != basic_lcase(*id2)) break; id1++; id2++; @@ -302,7 +316,7 @@ static void parse_cwcheat(void) if (feof(f)) goto out; - printf("cwcheat section found for %s\n", CdromId); + SysPrintf("cwcheat section found for %s\n", CdromId); while (fgets(line, sizeof(line), f)) { p = line + strlen(line); @@ -314,12 +328,12 @@ static void parse_cwcheat(void) if (strncmp(line, "_S", 2) == 0) break; if (strncmp(line, "_G", 2) == 0) { - printf(" cwcheat game name: '%s'\n", line + 3); + SysPrintf(" 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); + SysPrintf("cheat '%s' failed to parse\n", name); free(Cheats[NumCheats - 1].Descr); NumCheats--; } @@ -328,7 +342,7 @@ static void parse_cwcheat(void) continue; } if (sscanf(line, "_L %x %x", &a, &v) != 2) { - printf("line failed to parse: '%s'\n", line); + SysPrintf("line failed to parse: '%s'\n", line); continue; } @@ -342,6 +356,7 @@ static void parse_cwcheat(void) } Cheats[NumCheats].Descr = strdup(name); Cheats[NumCheats].Enabled = 0; + Cheats[NumCheats].WasEnabled = 0; Cheats[NumCheats].First = NumCodes; Cheats[NumCheats].n = 0; NumCheats++; @@ -365,21 +380,23 @@ out: fclose(f); } -void emu_on_new_cd(void) +void emu_on_new_cd(int show_hud_msg) { ClearAllCheats(); parse_cwcheat(); if (Config.HLE) { - printf("note: running with HLE BIOS, expect compatibility problems\n"); - printf("----------------------------------------------------------\n"); + SysPrintf("note: running with HLE BIOS, expect compatibility problems\n"); + SysPrintf("----------------------------------------------------------\n"); } - snprintf(hud_msg, sizeof(hud_msg), "Booting up..."); - hud_new_msg = 2; + if (show_hud_msg) { + snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG); + hud_new_msg = 3; + } } -int main(int argc, char *argv[]) +int emu_core_preinit(void) { // what is the name of the config file? // it may be redefined by -cfg on the command line @@ -390,16 +407,80 @@ 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) +{ + SysPrintf("Starting PCSX-ReARMed " REV "\n"); + +#ifndef NO_FRONTEND + check_profile(); + check_memcards(); +#endif + + if (EmuInit() == -1) { + SysPrintf("PSX emulator couldn't be initialized.\n"); + return -1; + } + + LoadMcds(Config.Mcd1, Config.Mcd2); + + if (Config.Debug) { + StartDebugger(); + } + + return 0; +} + +#ifndef NO_FRONTEND +static void create_profile_dir(const char *directory) { + char path[MAXPATHLEN]; + + MAKE_PATH(path, directory, NULL); + mkdir(path, S_IRWXU | S_IRWXG); +} + +static void check_profile(void) { + // make sure that ~/.pcsx exists + create_profile_dir(PCSX_DOT_DIR); + + create_profile_dir(BIOS_DIR); + create_profile_dir(MEMCARD_DIR); + create_profile_dir(STATES_DIR); + create_profile_dir(PLUGINS_DIR); + create_profile_dir(PLUGINS_CFG_DIR); + create_profile_dir(CHEATS_DIR); + create_profile_dir(PATCHES_DIR); + create_profile_dir(PCSX_DOT_DIR "cfg"); + create_profile_dir("/screenshots/"); +} + +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) { + SysPrintf("Creating memcard: %s\n", buf); + CreateMcd(buf); + } + else + fclose(f); + } +} + +int main(int argc, char *argv[]) +{ char file[MAXPATHLEN] = ""; char path[MAXPATHLEN]; const char *cdfile = NULL; @@ -408,6 +489,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; @@ -415,7 +498,7 @@ int main(int argc, char *argv[]) else if (!strcmp(argv[i], "-cfg")) { if (i+1 >= argc) break; strncpy(cfgfile_basename, argv[++i], MAXPATHLEN-100); /* TODO buffer overruns */ - printf("Using config file %s.\n", cfgfile_basename); + SysPrintf("Using config file %s.\n", cfgfile_basename); } else if (!strcmp(argv[i], "-cdfile")) { char isofilename[MAXPATHLEN]; @@ -441,17 +524,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); @@ -470,9 +552,6 @@ 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 @@ -481,6 +560,9 @@ int main(int argc, char *argv[]) plat_init(); menu_init(); // loads config + if (emu_core_init() != 0) + return 1; + if (psxout) Config.PsxOut = 1; @@ -510,25 +592,29 @@ int main(int argc, char *argv[]) if (cdfile) { if (LoadCdrom() == -1) { ClosePlugins(); - printf(_("Could not load CD-ROM!\n")); + SysPrintf(_("Could not load CD-ROM!\n")); return -1; } - emu_on_new_cd(); + emu_on_new_cd(!loadst); ready_to_go = 1; } } + if (loadst_f) { + int ret = LoadState(loadst_f); + SysPrintf("%s state file: %s\n", + ret ? "failed to load" : "loaded", loadst_f); + ready_to_go |= ret == 0; + } + if (ready_to_go) { menu_prepare_emu(); // If a state has been specified, then load that if (loadst) { 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); + SysPrintf("%s state %d\n", + ret ? "failed to load" : "loaded", loadst); } } else @@ -547,32 +633,47 @@ int main(int argc, char *argv[]) } return 0; -#endif } -int SysInit() { - if (EmuInit() == -1) { - printf("PSX emulator couldn't be initialized.\n"); - return -1; - } +static void toggle_fast_forward(int force_off) +{ + static int fast_forward; + static int normal_g_opts; + static int normal_frameskip; + static int normal_enhancement_enable; - LoadMcds(Config.Mcd1, Config.Mcd2); + if (force_off && !fast_forward) + return; - if (Config.Debug) { - StartDebugger(); + fast_forward = !fast_forward; + if (fast_forward) { + normal_g_opts = g_opts; + normal_frameskip = pl_rearmed_cbs.frameskip; + normal_enhancement_enable = + pl_rearmed_cbs.gpu_neon.enhancement_enable; + + g_opts |= OPT_NO_FRAMELIM; + pl_rearmed_cbs.frameskip = 3; + pl_rearmed_cbs.gpu_neon.enhancement_enable = 0; + } else { + g_opts = normal_g_opts; + pl_rearmed_cbs.frameskip = normal_frameskip; + pl_rearmed_cbs.gpu_neon.enhancement_enable = + normal_enhancement_enable; + + pl_timing_prepare(Config.PsxType); } - return 0; + if (!force_off) + snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s", + fast_forward ? "ON" : "OFF"); } +#endif void SysRunGui() { printf("SysRunGui\n"); } -void StartGui() { - printf("StartGui\n"); -} - static void dummy_lace() { } @@ -583,6 +684,7 @@ void SysReset() { // so we need to prevent updateLace() call.. void *real_lace = GPU_updateLace; GPU_updateLace = dummy_lace; + g_resetting = 1; // reset can run code, timing must be set pl_timing_prepare(Config.PsxType); @@ -593,6 +695,7 @@ void SysReset() { CDR_stop(); GPU_updateLace = real_lace; + g_resetting = 0; } void SysClose() { @@ -609,12 +712,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) { @@ -647,7 +750,8 @@ int emu_save_state(int slot) #ifndef __ARM_ARCH_7A__ /* XXX */ sync(); #endif - printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot); + SysPrintf("* %s \"%s\" [%d]\n", + ret == 0 ? "saved" : "failed to save", fname, slot); return ret; } @@ -656,6 +760,8 @@ int emu_load_state(int slot) char fname[MAXPATHLEN]; int ret; + hud_msg[0] = 0; + ret = get_state_filename(fname, sizeof(fname), slot); if (ret != 0) return ret; @@ -663,29 +769,43 @@ int emu_load_state(int slot) return LoadState(fname); } +#ifndef ANDROID + void SysPrintf(const char *fmt, ...) { va_list list; - char msg[512]; va_start(list, fmt); - vsprintf(msg, fmt, list); + vfprintf(emuLog, fmt, list); va_end(list); +} + +#else + +#include + +void SysPrintf(const char *fmt, ...) { + va_list list; - fprintf(emuLog, "%s", msg); + va_start(list, fmt); + __android_log_vprint(ANDROID_LOG_INFO, "PCSX", fmt, list); + va_end(list); } +#endif + void SysMessage(const char *fmt, ...) { - va_list list; - char msg[512]; + va_list list; + char msg[512]; + int ret; - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); + va_start(list, fmt); + ret = vsnprintf(msg, sizeof(msg), fmt, list); + va_end(list); - if (msg[strlen(msg) - 1] == '\n') - msg[strlen(msg) - 1] = 0; + if (ret < sizeof(msg) && msg[ret - 1] == '\n') + msg[ret - 1] = 0; - fprintf(stderr, "%s\n", msg); + SysPrintf("%s\n", msg); } static void SignalExit(int sig) { @@ -728,7 +848,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; @@ -830,7 +950,7 @@ void *SysLoadLibrary(const char *lib) { void *ret; int i; - printf("plugin: %s\n", lib); + SysPrintf("plugin: %s\n", lib); if (tmp != NULL) { tmp++; @@ -839,18 +959,9 @@ void *SysLoadLibrary(const char *lib) { return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]); } -#if defined(__x86_64__) || defined(__i386__) - // convenience hack - if (strstr(lib, ".x86") == NULL) { - char name[MAXPATHLEN]; - snprintf(name, sizeof(name), "%s.x86_64", lib); - lib = name; - } -#endif - ret = dlopen(lib, RTLD_NOW); if (ret == NULL) - fprintf(stderr, "dlopen: %s\n", dlerror()); + SysMessage("dlopen: %s", dlerror()); return ret; }