#define PORTS_NUMBER 8
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#define ISHEXDEC ((buf[cursor]>='0') && (buf[cursor]<='9')) || ((buf[cursor]>='a') && (buf[cursor]<='f')) || ((buf[cursor]>='A') && (buf[cursor]<='F'))
//hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key
-int rebootemu = 0;
+static int rebootemu = 0;
static retro_video_refresh_t video_cb;
static retro_input_poll_t input_poll_cb;
static retro_environment_t environ_cb;
static retro_audio_sample_batch_t audio_batch_cb;
static struct retro_rumble_interface rumble;
+static struct retro_log_callback logging;
+static retro_log_printf_t log_cb;
static void *vout_buf;
static void * vout_buf_ptr;
/* memory card data */
extern char Mcd1Data[MCD_SIZE];
+extern char Mcd2Data[MCD_SIZE];
extern char McdDisable[2];
/* PCSX ReARMed core calls and stuff */
#define VOUT_MAX_WIDTH 1024
#define VOUT_MAX_HEIGHT 512
+//Dummy functions
+bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info){return false;}
+void retro_unload_game(void){}
+static int vout_open(void){return 0;}
+static void vout_close(void){}
+static int snd_init(void){return 0;}
+static void snd_finish(void){}
+static int snd_busy(void){return 0;}
+
static void init_memcard(char *mcd_data)
{
unsigned off = 0;
}
}
-static int vout_open(void)
-{
- return 0;
-}
-
static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
{
vout_width = w;
pl_rearmed_cbs.flip_cnt++;
}
-static void vout_close(void)
-{
-}
-
#ifdef _3DS
typedef struct
{
void plat_trigger_vibrate(int pad, int low, int high)
{
- rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8);
- rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0);
+ if(in_enable_vibration)
+ {
+ rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8);
+ rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0);
+ }
}
void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
}
/* sound calls */
-static int snd_init(void)
-{
- return 0;
-}
-
-static void snd_finish(void)
-{
-}
-
-static int snd_busy(void)
-{
- return 0;
-}
-
static void snd_feed(void *buf, int bytes)
{
if (audio_batch_cb != NULL)
{
static const struct retro_variable vars[] = {
{ "pcsx_rearmed_frameskip", "Frameskip; 0|1|2|3" },
- { "pcsx_rearmed_region", "Region; Auto|NTSC|PAL" },
+ { "pcsx_rearmed_region", "Region; auto|NTSC|PAL" },
{ "pcsx_rearmed_pad1type", "Pad 1 Type; default|none|standard|analog|negcon" },
{ "pcsx_rearmed_pad2type", "Pad 2 Type; default|none|standard|analog|negcon" },
{ "pcsx_rearmed_pad3type", "Pad 3 Type; default|none|standard|analog|negcon" },
{ "pcsx_rearmed_pad8type", "Pad 8 Type; default|none|standard|analog|negcon" },
{ "pcsx_rearmed_multitap1", "Multitap 1; auto|disabled|enabled" },
{ "pcsx_rearmed_multitap2", "Multitap 2; auto|disabled|enabled" },
+ { "pcsx_rearmed_vibration", "Enable Vibration; enabled|disabled" },
+ { "pcsx_rearmed_dithering", "Enable Dithering; enabled|disabled" },
#ifndef DRC_DISABLE
{ "pcsx_rearmed_drc", "Dynamic recompiler; enabled|disabled" },
#endif
{ "pcsx_rearmed_neon_enhancement_enable", "Enhanced resolution (slow); disabled|enabled" },
{ "pcsx_rearmed_neon_enhancement_no_main", "Enhanced resolution speed hack; disabled|enabled" },
#endif
- { "pcsx_rearmed_duping_enable", "Frame duping; on|off" },
- { "pcsx_rearmed_show_bios_bootlogo", "Show Bios Bootlogo; on|off" },
- { "pcsx_rearmed_spu_reverb", "Sound: Reverb; on|off" },
+ { "pcsx_rearmed_duping_enable", "Frame duping; enabled|disabled" },
+ { "pcsx_rearmed_show_bios_bootlogo", "Show Bios Bootlogo(Breaks some games); disabled|enabled" },
+ { "pcsx_rearmed_spu_reverb", "Sound: Reverb; enabled|disabled" },
{ "pcsx_rearmed_spu_interpolation", "Sound: Interpolation; simple|gaussian|cubic|off" },
{ "pcsx_rearmed_pe2_fix", "Parasite Eve 2/Vandal Hearts 1/2 Fix; disabled|enabled" },
{ "pcsx_rearmed_inuyasha_fix", "InuYasha Sengoku Battle Fix; disabled|enabled" },
{ NULL, NULL },
};
+ if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
+ log_cb = logging.log;
+
environ_cb = cb;
cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
#define SLASH '/'
#endif
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
static char base_dir[PATH_MAX];
static bool read_m3u(const char *file)
if (is_m3u) {
if (!read_m3u(info->path)) {
- SysPrintf("failed to read m3u file\n");
+ log_cb(RETRO_LOG_INFO, "failed to read m3u file\n");
return false;
}
} else {
/* have to reload after set_cd_image for correct cdr plugin */
if (LoadPlugins() == -1) {
- SysPrintf("failed to load plugins\n");
+ log_cb(RETRO_LOG_INFO, "failed to load plugins\n");
return false;
}
NetOpened = 0;
if (OpenPlugins() == -1) {
- SysPrintf("failed to open plugins\n");
+ log_cb(RETRO_LOG_INFO, "failed to open plugins\n");
return false;
}
plugin_call_rearmed_cbs();
dfinput_activate();
- Config.PsxAuto = 1;
if (CheckCdrom() == -1) {
- SysPrintf("unsupported/invalid CD image: %s\n", info->path);
+ log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path);
return false;
}
SysReset();
if (LoadCdrom() == -1) {
- SysPrintf("could not load CD-ROM!\n");
+ log_cb(RETRO_LOG_INFO, "could not load CD\n");
return false;
}
emu_on_new_cd(0);
return true;
}
-bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info)
-{
- return false;
-}
-
-void retro_unload_game(void)
-{
-}
-
unsigned retro_get_region(void)
{
return is_pal_mode ? RETRO_REGION_PAL : RETRO_REGION_NTSC;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
Config.PsxAuto = 0;
- if (strcmp(var.value, "Automatic") == 0)
+ if (strcmp(var.value, "auto") == 0)
Config.PsxAuto = 1;
else if (strcmp(var.value, "NTSC") == 0)
Config.PsxType = 0;
update_multitap();
+ var.value = NULL;
+ var.key = "pcsx_rearmed_vibration";
+
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ if (strcmp(var.value, "disabled") == 0)
+ in_enable_vibration = 0;
+ else if (strcmp(var.value, "enabled") == 0)
+ in_enable_vibration = 1;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_dithering";
+
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ if (strcmp(var.value, "disabled") == 0) {
+ pl_rearmed_cbs.gpu_peops.iUseDither = 0;
+ pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 0;
+#ifdef __ARM_NEON__
+ pl_rearmed_cbs.gpu_neon.allow_dithering = 0;
+#endif
+ }
+ else if (strcmp(var.value, "enabled") == 0) {
+ pl_rearmed_cbs.gpu_peops.iUseDither = 1;
+ pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 1;
+#ifdef __ARM_NEON__
+ pl_rearmed_cbs.gpu_neon.allow_dithering = 1;
+#endif
+ }
+ }
+
#ifdef __ARM_NEON__
var.value = "NULL";
var.key = "pcsx_rearmed_neon_interlace_enable";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
- if (strcmp(var.value, "off") == 0)
+ if (strcmp(var.value, "disabled") == 0)
duping_enable = false;
- else if (strcmp(var.value, "on") == 0)
+ else if (strcmp(var.value, "enabled") == 0)
duping_enable = true;
}
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
- if (strcmp(var.value, "off") == 0)
+ if (strcmp(var.value, "disabled") == 0)
spu_config.iUseReverb = false;
- else if (strcmp(var.value, "on") == 0)
+ else if (strcmp(var.value, "enabled") == 0)
spu_config.iUseReverb = true;
}
var.key = "pcsx_rearmed_show_bios_bootlogo";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
- if (strcmp(var.value, "on") == 0)
+ if (strcmp(var.value, "enabled") == 0)
rebootemu = 1;
}
}
}
}
-static int min(int a, int b)
-{
- return a < b ? a : b;
-}
-
void retro_run(void)
{
int i;
if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD)
{
- in_analog_left[i][0] = min((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255);
- in_analog_left[i][1] = min((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 255) + 128, 255);
- in_analog_right[i][0] = min((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255);
- in_analog_right[i][1] = min((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 255) + 128, 255);
+ in_analog_left[i][0] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255);
+ in_analog_left[i][1] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 255) + 128, 255);
+ in_analog_right[i][0] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255);
+ in_analog_right[i][1] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 255) + 128, 255);
}
}
void retro_init(void)
{
- const char *bios[] = { "scph1001", "scph5501", "scph7001" };
+ const char *bios[] = { "SCPH101", "SCPH7001", "SCPH5501", "SCPH1001" };
const char *dir;
char path[256];
int i, ret;
SysPrintf("no BIOS files found.\n");
struct retro_message msg =
{
- "no BIOS found, expect bugs!",
+ "No PlayStation BIOS file found - add for better compatibility",
180
};
environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg);
spu_config.iUseFixedUpdates = 1;
McdDisable[0] = 0;
- McdDisable[1] = 1;
+ McdDisable[1] = 0;
init_memcard(Mcd1Data);
+ init_memcard(Mcd2Data);
SaveFuncs.open = save_open;
SaveFuncs.read = save_read;