/*
- * (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.
#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/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();
void StopDebugger();
-int ready_to_go;
+// sound plugin
+extern int iUseReverb;
+extern int iUseInterpolation;
+extern int iXAPitch;
+extern int iVolume;
+
+int ready_to_go, g_emu_want_quit, g_emu_resetting;
unsigned long gpuDisp;
char cfgfile_basename[MAXPATHLEN];
int state_slot;
#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;
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");
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, "gpuPCSX4ALL.so");
-#endif
- Config.PsxAuto = 1;
-
- snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
}
-static void check_memcards(void)
+void emu_set_default_config(void)
{
- char buf[MAXPATHLEN];
- FILE *f;
- int i;
+ // 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;
- for (i = 1; i <= 9; i++) {
- snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+ 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;
+
+ 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;
- f = fopen(buf, "rb");
- if (f == NULL) {
- printf("Creating memcard: %s\n", buf);
- CreateMcd(buf);
- }
- else
- fclose(f);
- }
+ 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_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!");
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)
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++;
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);
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;
- printf("* %s\n", hud_msg);
}
-int main(int argc, char *argv[])
+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 (basic_lcase(*id1) != basic_lcase(*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;
+ }
+
+ 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();
- check_memcards();
+ 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
+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;
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;
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];
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);
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_evdev_init();
- //in_probe();
+ pl_init();
plat_init();
menu_init(); // loads config
- pl_init();
- plat_rescan_inputs();
+
+ if (emu_core_init() != 0)
+ return 1;
if (psxout)
Config.PsxOut = 1;
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);
- }
- 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
pl_start_watchdog();
- while (1)
+ while (!g_emu_want_quit)
{
stop = 0;
emu_action = SACTION_NONE;
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;
- 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");
}
-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()
// 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();
CDR_stop();
GPU_updateLace = real_lace;
+ g_emu_resetting = 0;
}
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);
return ret;
ret = SaveState(fname);
- printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+#ifndef __ARM_ARCH_7A__ /* XXX */
+ sync();
+#endif
+ SysPrintf("* %s \"%s\" [%d]\n",
+ ret == 0 ? "saved" : "failed to save", fname, slot);
return ret;
}
char fname[MAXPATHLEN];
int ret;
+ hud_msg[0] = 0;
+
ret = get_state_filename(fname, sizeof(fname), slot);
if (ret != 0)
return ret;
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 <android/log.h>
- 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) \
static int _OpenPlugins(void) {
int ret;
+#ifndef NO_FRONTEND
signal(SIGINT, SignalExit);
signal(SIGPIPE, SignalExit);
+#endif
GPU_clearDynarec(clearDynarec);
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; }
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;
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();
void *ret;
int i;
- printf("plugin: %s\n", lib);
+ SysPrintf("plugin: %s\n", lib);
if (tmp != NULL) {
tmp++;
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
-
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
- fprintf(stderr, "dlopen: %s\n", dlerror());
+ SysMessage("dlopen: %s", dlerror());
return ret;
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff