#include <stdio.h>
#include <string.h>
#include <stdarg.h>
-#include <dlfcn.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
#include <time.h>
+#ifndef _WIN32
+#include <dlfcn.h>
+#endif
#include "main.h"
#include "plugin.h"
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/cdrcimg/cdrcimg.h"
+#include "../plugins/dfsound/spu_config.h"
+#include "arm_features.h"
#include "revision.h"
#ifndef NO_FRONTEND
#endif
// 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 iVolume;
+static void StartDebugger() {}
+static void StopDebugger() {}
int ready_to_go, g_emu_want_quit, g_emu_resetting;
unsigned long gpuDisp;
{
// try to set sane config on which most games work
Config.Xa = Config.Cdda = Config.Sio =
- Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
+ Config.icache_emulation = Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
Config.PsxAuto = 1;
pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
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_senquack.ilace_force = 0;
+ pl_rearmed_cbs.gpu_senquack.pixel_skip = 0;
+ pl_rearmed_cbs.gpu_senquack.lighting = 1;
+ pl_rearmed_cbs.gpu_senquack.fast_lighting = 0;
+ pl_rearmed_cbs.gpu_senquack.blending = 1;
+ pl_rearmed_cbs.gpu_senquack.dithering = 0;
pl_rearmed_cbs.gpu_unai.abe_hack =
pl_rearmed_cbs.gpu_unai.no_light =
pl_rearmed_cbs.gpu_unai.no_blend = 0;
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
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
+ spu_config.iUseReverb = 0;
+ spu_config.iUseInterpolation = 0;
+ spu_config.iTempo = 1;
#endif
new_dynarec_hacks = 0;
cycle_multiplier = 200;
}
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)
// 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));
}
#ifndef NO_FRONTEND
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
static void create_profile_dir(const char *directory) {
char path[MAXPATHLEN];
return ret;
ret = SaveState(fname);
-#ifndef __ARM_ARCH_7A__ /* XXX */
+#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */
sync();
#endif
SysPrintf("* %s \"%s\" [%d]\n",
va_start(list, fmt);
vfprintf(emuLog, fmt, list);
va_end(list);
+ fflush(emuLog);
}
#else
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; }
void *SysLoadLibrary(const char *lib) {
const char *tmp = strrchr(lib, '/');
- void *ret;
+ void *ret = NULL;
int i;
SysPrintf("plugin: %s\n", lib);
return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
}
+#ifndef _WIN32
ret = dlopen(lib, RTLD_NOW);
if (ret == NULL)
SysMessage("dlopen: %s", dlerror());
+#else
+ /* no external plugin support, abi is no longer
+ * compatible with psemu/pcsx anyway */
+#endif
return ret;
}
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) {
if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
return;
+#ifndef _WIN32
dlclose(lib);
+#endif
}