X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=4c84803e57a95bd4ce8f340dbd58ebf9aa6e8b13;hp=29d2c2579d68dbf8d5f38713c42d4f74db0c44ac;hb=63a4f6b6a3b0315590cd3009df2c92480ed2d98b;hpb=ea66e8840b75b0284f192e6fa068857b91ef08eb diff --git a/frontend/main.c b/frontend/main.c index 29d2c257..4c84803e 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -8,12 +8,12 @@ #include #include #include -#include -#include -#include #include #include #include +#ifndef _WIN32 +#include +#endif #include "main.h" #include "plugin.h" @@ -25,12 +25,17 @@ #include "../libpcsxcore/cheat.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" +#include "../plugins/dfsound/spu_config.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..." @@ -40,13 +45,7 @@ void StartDebugger(); void StopDebugger(); -// sound plugin -extern int iUseReverb; -extern int iUseInterpolation; -extern int iXAPitch; -extern int iVolume; - -int ready_to_go; +int ready_to_go, g_emu_want_quit, g_emu_resetting; unsigned long gpuDisp; char cfgfile_basename[MAXPATHLEN]; int state_slot; @@ -54,8 +53,6 @@ enum sched_action emu_action, emu_action_old; char hud_msg[64]; int hud_new_msg; -static void toggle_fast_forward(int force_off); - static void make_path(char *buf, size_t size, const char *dir, const char *fname) { if (fname) @@ -66,28 +63,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; @@ -126,9 +101,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"); @@ -137,8 +115,6 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); - - snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); } void emu_set_default_config(void) @@ -146,7 +122,6 @@ 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 @@ -161,13 +136,16 @@ void emu_set_default_config(void) 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; + spu_config.iUseReverb = 1; + spu_config.iUseInterpolation = 1; + spu_config.iXAPitch = 0; + spu_config.iVolume = 768; + spu_config.iTempo = 0; + spu_config.iUseThread = 1; // no effect if only 1 core is detected +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */ + spu_config.iUseReverb = 0; + spu_config.iUseInterpolation = 0; + spu_config.iTempo = 1; #endif new_dynarec_hacks = 0; cycle_multiplier = 200; @@ -176,25 +154,6 @@ 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) { int ret; @@ -228,7 +187,7 @@ 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); + SysPrintf("* %s\n", hud_msg); break; case SACTION_TOGGLE_FSKIP: pl_rearmed_cbs.fskip_advice = 0; @@ -262,7 +221,7 @@ do_state_slot: g_opts |= OPT_SHOWFPS; break; case SACTION_TOGGLE_FULLSCREEN: - g_fullscreen = !g_fullscreen; + plat_target.vout_fullscreen = !plat_target.vout_fullscreen; if (GPU_open != NULL && GPU_close != NULL) { GPU_close(); GPU_open(&gpuDisp, "PCSX", NULL); @@ -290,7 +249,11 @@ do_state_slot: } case SACTION_VOLUME_UP: case SACTION_VOLUME_DOWN: - plat_target_step_volume(emu_action == SACTION_VOLUME_UP); + { + static int volume; + plat_target_step_volume(&volume, + emu_action == SACTION_VOLUME_UP ? 1 : -1); + } return; case SACTION_MINIMIZE: if (GPU_close != NULL) @@ -301,7 +264,7 @@ do_state_slot: if (GPU_open != NULL) { ret = GPU_open(&gpuDisp, "PCSX", NULL); if (ret) - fprintf(stderr, "GPU_open returned %d\n", ret); + SysMessage("GPU_open returned %d", ret); } return; #endif @@ -312,12 +275,19 @@ do_state_slot: hud_new_msg = 3; } +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) { 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++; @@ -348,7 +318,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); @@ -360,12 +330,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--; } @@ -374,7 +344,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; } @@ -418,8 +388,8 @@ void emu_on_new_cd(int show_hud_msg) 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"); } if (show_hud_msg) { @@ -434,7 +404,14 @@ int emu_core_preinit(void) // it may be redefined by -cfg on the command line strcpy(cfgfile_basename, "pcsx.cfg"); +#ifdef IOS + emuLog = fopen("/User/Documents/pcsxr.log", "w"); + if (emuLog == NULL) + emuLog = fopen("pcsxr.log", "w"); + if (emuLog == NULL) +#endif emuLog = stdout; + SetIsoFile(NULL); memset(&Config, 0, sizeof(Config)); @@ -448,11 +425,15 @@ int emu_core_preinit(void) int emu_core_init(void) { - CheckSubDir(); + SysPrintf("Starting PCSX-ReARMed " REV "\n"); + +#ifndef NO_FRONTEND + check_profile(); check_memcards(); +#endif if (EmuInit() == -1) { - printf("PSX emulator couldn't be initialized.\n"); + SysPrintf("PSX emulator couldn't be initialized.\n"); return -1; } @@ -465,7 +446,58 @@ int emu_core_init(void) return 0; } +void emu_core_ask_exit(void) +{ + stop = 1; + g_emu_want_quit = 1; +} + #ifndef NO_FRONTEND + +#include +#include + +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] = ""; @@ -485,7 +517,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]; @@ -547,7 +579,8 @@ int main(int argc, char *argv[]) plat_init(); menu_init(); // loads config - emu_core_init(); + if (emu_core_init() != 0) + return 1; if (psxout) Config.PsxOut = 1; @@ -578,7 +611,7 @@ 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(!loadst); @@ -588,7 +621,8 @@ int main(int argc, char *argv[]) if (loadst_f) { int ret = LoadState(loadst_f); - printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f); + SysPrintf("%s state file: %s\n", + ret ? "failed to load" : "loaded", loadst_f); ready_to_go |= ret == 0; } @@ -598,7 +632,8 @@ int main(int argc, char *argv[]) // 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); + SysPrintf("%s state %d\n", + ret ? "failed to load" : "loaded", loadst); } } else @@ -606,7 +641,7 @@ int main(int argc, char *argv[]) pl_start_watchdog(); - while (1) + while (!g_emu_want_quit) { stop = 0; emu_action = SACTION_NONE; @@ -616,6 +651,12 @@ int main(int argc, char *argv[]) do_emu_action(); } + printf("Exit..\n"); + ClosePlugins(); + SysClose(); + menu_finish(); + plat_finish(); + return 0; } @@ -652,6 +693,12 @@ static void toggle_fast_forward(int force_off) snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s", fast_forward ? "ON" : "OFF"); } + +static void SignalExit(int sig) { + // only to restore framebuffer/resolution on some devices + plat_finish(); + exit(1); +} #endif void SysRunGui() { @@ -668,6 +715,7 @@ void SysReset() { // so we need to prevent updateLace() call.. void *real_lace = GPU_updateLace; GPU_updateLace = dummy_lace; + g_emu_resetting = 1; // reset can run code, timing must be set pl_timing_prepare(Config.PsxType); @@ -678,6 +726,7 @@ void SysReset() { CDR_stop(); GPU_updateLace = real_lace; + g_emu_resetting = 0; } void SysClose() { @@ -686,22 +735,15 @@ void SysClose() { StopDebugger(); - if (emuLog != NULL) fclose(emuLog); + if (emuLog != NULL && emuLog != stdout && emuLog != stderr) { + fclose(emuLog); + emuLog = NULL; + } } void SysUpdate() { } -void OnFile_Exit() { - printf("OnFile_Exit\n"); - SysClose(); -#ifndef NO_FRONTEND - menu_finish(); - plat_finish(); - exit(0); -#endif -} - int get_state_filename(char *buf, int size, int i) { return get_gameid_filename(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d", i); @@ -729,10 +771,11 @@ int emu_save_state(int slot) return ret; ret = SaveState(fname); -#ifndef __ARM_ARCH_7A__ /* XXX */ +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */ 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; } @@ -750,34 +793,44 @@ 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); - - fprintf(emuLog, "%s", msg); + fflush(emuLog); } -void SysMessage(const char *fmt, ...) { - va_list list; - char msg[512]; +#else - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); +#include - if (msg[strlen(msg) - 1] == '\n') - msg[strlen(msg) - 1] = 0; +void SysPrintf(const char *fmt, ...) { + va_list list; - fprintf(stderr, "%s\n", msg); + va_start(list, fmt); + __android_log_vprint(ANDROID_LOG_INFO, "PCSX", fmt, list); + va_end(list); } -static void SignalExit(int sig) { - ClosePlugins(); - OnFile_Exit(); +#endif + +void SysMessage(const char *fmt, ...) { + va_list list; + char msg[512]; + int ret; + + va_start(list, fmt); + ret = vsnprintf(msg, sizeof(msg), fmt, list); + va_end(list); + + if (ret < sizeof(msg) && msg[ret - 1] == '\n') + msg[ret - 1] = 0; + + SysPrintf("%s\n", msg); } #define PARSEPATH(dst, src) \ @@ -790,8 +843,10 @@ static void SignalExit(int sig) { static int _OpenPlugins(void) { int ret; +#ifndef NO_FRONTEND signal(SIGINT, SignalExit); signal(SIGPIPE, SignalExit); +#endif GPU_clearDynarec(clearDynarec); @@ -800,6 +855,7 @@ static int _OpenPlugins(void) { ret = SPU_open(); if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; } SPU_registerCallback(SPUirq); + SPU_registerScheduleCb(SPUschedule); // pcsx-rearmed: we handle gpu elsewhere //ret = GPU_open(&gpuDisp, "PCSX", NULL); //if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; } @@ -882,8 +938,11 @@ int OpenPlugins() { void ClosePlugins() { int ret; +#ifndef NO_FRONTEND signal(SIGINT, SIG_DFL); signal(SIGPIPE, SIG_DFL); +#endif + ret = CDR_close(); if (ret < 0) { SysMessage(_("Error closing CD-ROM plugin!")); return; } ret = SPU_close(); @@ -914,10 +973,10 @@ static const int builtin_plugin_ids[] = { void *SysLoadLibrary(const char *lib) { const char *tmp = strrchr(lib, '/'); - void *ret; + void *ret = NULL; int i; - printf("plugin: %s\n", lib); + SysPrintf("plugin: %s\n", lib); if (tmp != NULL) { tmp++; @@ -926,9 +985,14 @@ void *SysLoadLibrary(const char *lib) { return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]); } +#ifndef _WIN32 ret = dlopen(lib, RTLD_NOW); if (ret == NULL) - fprintf(stderr, "dlopen: %s\n", dlerror()); + SysMessage("dlopen: %s", dlerror()); +#else + /* no external plugin support, abi is no longer + * compatible with psemu/pcsx anyway */ +#endif return ret; } @@ -938,11 +1002,19 @@ void *SysLoadSym(void *lib, const char *sym) { if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins)) return plugin_link(plugid - PLUGIN_DL_BASE, sym); +#ifndef _WIN32 return dlsym(lib, sym); +#else + return NULL; +#endif } const char *SysLibError() { +#ifndef _WIN32 return dlerror(); +#else + return "not supported"; +#endif } void SysCloseLibrary(void *lib) { @@ -951,6 +1023,8 @@ void SysCloseLibrary(void *lib) { if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins)) return; +#ifndef _WIN32 dlclose(lib); +#endif }