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=adf5e31f1a4fe0d10863b788028356de96841d91;hb=63a4f6b6a3b0315590cd3009df2c92480ed2d98b;hpb=0a1518684006294fca3cb72a6c56483650c4702f diff --git a/frontend/main.c b/frontend/main.c index adf5e31f..4c84803e 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. @@ -8,37 +8,51 @@ #include #include #include -#include -#include -#include #include #include #include +#ifndef _WIN32 +#include +#endif #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/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 "../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..." +#endif -int ready_to_go; +// don't include debug.h - it breaks ARM build (R1 redefined) +void StartDebugger(); +void StopDebugger(); + +int ready_to_go, g_emu_want_quit, g_emu_resetting; 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) @@ -49,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; @@ -97,7 +89,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"); @@ -109,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"); @@ -120,24 +115,52 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); +} + +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.PsxAuto = 1; - snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); + 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 = + 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; + + 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; + + in_type1 = PSE_PAD_TYPE_STANDARD; + in_type2 = PSE_PAD_TYPE_STANDARD; } 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; case SACTION_LOAD_STATE: ret = emu_load_state(state_slot); snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "LOADED" : "FAIL!"); @@ -146,6 +169,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) @@ -155,14 +183,53 @@ 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: - 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_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); @@ -180,55 +247,269 @@ void do_emu_action(void) snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN"); break; } + case SACTION_VOLUME_UP: + case SACTION_VOLUME_DOWN: + { + static int volume; + plat_target_step_volume(&volume, + emu_action == SACTION_VOLUME_UP ? 1 : -1); + } + 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; } -int main(int argc, char *argv[]) +static char basic_lcase(char c) { - 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; + 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 (basic_lcase(*id1) != basic_lcase(*id2)) + break; + id1++; + id2++; } - dlclose(tmp); + 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; + + SysPrintf("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) { + SysPrintf(" cwcheat game name: '%s'\n", line + 3); + continue; + } + if (strncmp(line, "_C0", 3) == 0) { + if (!newcheat && Cheats[NumCheats - 1].n == 0) { + SysPrintf("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) { + SysPrintf("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(int show_hud_msg) +{ + ClearAllCheats(); + parse_cwcheat(); + + if (Config.HLE) { + SysPrintf("note: running with HLE BIOS, expect compatibility problems\n"); + SysPrintf("----------------------------------------------------------\n"); + } + + if (show_hud_msg) { + snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG); + hud_new_msg = 3; + } +} + +int emu_core_preinit(void) +{ // what is the name of the config file? // 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)); - CheckSubDir(); set_default_paths(); + emu_set_default_config(); 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; +} + +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] = ""; char path[MAXPATHLEN]; const char *cdfile = NULL; + const char *loadst_f = NULL; int psxout = 0; 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; @@ -236,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]; @@ -255,20 +536,23 @@ 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")) { - 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); @@ -287,15 +571,17 @@ 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_probe(); + pl_init(); plat_init(); menu_init(); // loads config + if (emu_core_init() != 0) + return 1; + if (psxout) Config.PsxOut = 1; @@ -325,20 +611,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(!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); + SysPrintf("%s state %d\n", + ret ? "failed to load" : "loaded", loadst); } } else @@ -346,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; @@ -356,31 +651,58 @@ int main(int argc, char *argv[]) do_emu_action(); } + printf("Exit..\n"); + ClosePlugins(); + SysClose(); + menu_finish(); + plat_finish(); + 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; + + if (force_off && !fast_forward) + return; - LoadMcds(Config.Mcd1, Config.Mcd2); /* TODO Do we need to have this here, or in the calling main() function?? */ + 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; - if (Config.Debug) { - StartDebugger(); + 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"); } -void SysRunGui() { - printf("SysRunGui\n"); +static void SignalExit(int sig) { + // only to restore framebuffer/resolution on some devices + plat_finish(); + exit(1); } +#endif -void StartGui() { - printf("StartGui\n"); +void SysRunGui() { + printf("SysRunGui\n"); } static void dummy_lace() @@ -393,6 +715,10 @@ 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); EmuReset(); @@ -400,6 +726,7 @@ void SysReset() { CDR_stop(); GPU_updateLace = real_lace; + g_emu_resetting = 0; } void SysClose() { @@ -408,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"); -#ifndef MAEMO - menu_finish(); -#endif - SysClose(); - plat_finish(); - exit(0); -} - int get_state_filename(char *buf, int size, int i) { return get_gameid_filename(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d", i); @@ -450,7 +770,13 @@ int emu_save_state(int slot) if (ret != 0) return ret; - return SaveState(fname); + ret = SaveState(fname); +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */ + sync(); +#endif + SysPrintf("* %s \"%s\" [%d]\n", + ret == 0 ? "saved" : "failed to save", fname, slot); + return ret; } int emu_load_state(int slot) @@ -458,6 +784,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; @@ -465,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) \ @@ -505,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); @@ -515,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; } @@ -530,7 +871,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; @@ -597,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(); @@ -616,20 +960,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", @@ -643,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++; @@ -655,16 +985,14 @@ void *SysLoadLibrary(const char *lib) { return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]); } -#if defined(__x86_64__) || defined(__i386__) - // convenience hack - char name[MAXPATHLEN]; - snprintf(name, sizeof(name), "%s.x86", lib); - lib = name; -#endif - +#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; } @@ -674,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) { @@ -687,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 }