#include <errno.h>
#include <dlfcn.h>
#include <zlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include "main.h"
#include "menu.h"
#include "linux/in_evdev.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/cdrom.h"
+#include "../libpcsxcore/cdriso.h"
#include "../libpcsxcore/psemu_plugin_defs.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/dfinput/main.h"
#include "revision.h"
+#define REARMED_BIRTHDAY_TIME 1293306830 /* 25 Dec 2010 */
+
#define array_size(x) (sizeof(x) / sizeof(x[0]))
typedef enum
MA_MAIN_RESET_GAME,
MA_MAIN_LOAD_ROM,
MA_MAIN_SWAP_CD,
+ MA_MAIN_SWAP_CD_MULTI,
MA_MAIN_RUN_BIOS,
MA_MAIN_RUN_EXE,
MA_MAIN_CONTROLS,
MA_MAIN_EXIT,
MA_CTRL_PLAYER1,
MA_CTRL_PLAYER2,
+ MA_CTRL_ANALOG,
MA_CTRL_EMU,
MA_CTRL_DEV_FIRST,
MA_CTRL_DEV_NEXT,
MA_CTRL_NUBS_BTNS,
MA_CTRL_DEADZONE,
+ MA_CTRL_VIBRATION,
MA_CTRL_DONE,
MA_OPT_SAVECFG,
MA_OPT_SAVECFG_GAME,
static int warned_about_bios, region, in_type_sel1, in_type_sel2;
static int psx_clock;
static int memcard1_sel, memcard2_sel;
-int g_opts, analog_deadzone;
+int g_opts;
+int analog_deadzone; // for Caanoo
#ifdef __ARM_ARCH_7A__
#define DEFAULT_PSX_CLOCK 57
printf("Warning: path truncated: %s\n", buff);
}
-static int emu_check_save_file(int slot)
+static int emu_check_save_file(int slot, int *time)
{
- int ret = emu_check_state(slot);
- return ret == 0 ? 1 : 0;
+ char fname[MAXPATHLEN];
+ struct stat status;
+ int ret;
+
+ ret = emu_check_state(slot);
+ if (ret != 0 || time == NULL)
+ return ret == 0 ? 1 : 0;
+
+ ret = get_state_filename(fname, sizeof(fname), slot);
+ if (ret != 0)
+ return 1;
+
+ ret = stat(fname, &status);
+ if (ret != 0)
+ return 1;
+
+ if (status.st_mtime < REARMED_BIRTHDAY_TIME)
+ return 1; // probably bad rtc like on some Caanoos
+
+ *time = status.st_mtime;
+
+ return 1;
}
static int emu_save_load_game(int load, int unused)
default: in_type2 = PSE_PAD_TYPE_STANDARD;
}
if (in_evdev_allow_abs_only != allow_abs_only_old) {
- plat_rescan_inputs();
+ in_probe();
allow_abs_only_old = in_evdev_allow_abs_only;
}
static void menu_set_defconfig(void)
{
+ emu_set_default_config();
+
g_opts = 0;
scaling = SCALE_4_3;
volume_boost = 0;
frameskip = 0;
- analog_deadzone = 70;
+ analog_deadzone = 50;
psx_clock = DEFAULT_PSX_CLOCK;
region = 0;
in_type_sel1 = in_type_sel2 = 0;
in_evdev_allow_abs_only = 0;
- Config.Xa = Config.Cdda = Config.Sio =
- Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
- Config.CdrReschedule = 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;
-
- iUseReverb = 2;
- iUseInterpolation = 1;
- iXAPitch = 0;
- iSPUIRQWait = 1;
- iUseTimer = 2;
-#ifndef __ARM_ARCH_7A__ /* XXX */
- iUseReverb = 0;
- iUseInterpolation = 0;
-#endif
menu_sync_config();
}
{ #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val }
// 'versioned' var, used when defaults change
+#define CE_CONFIG_STR_V(val, ver) \
+ { #val #ver, 0, Config.val }
+
#define CE_INTVAL_V(val, ver) \
{ #val #ver, sizeof(val), &val }
void *val;
} config_data[] = {
CE_CONFIG_STR(Bios),
- CE_CONFIG_STR(Gpu),
+ CE_CONFIG_STR_V(Gpu, 2),
CE_CONFIG_STR(Spu),
// CE_CONFIG_STR(Cdr),
CE_CONFIG_VAL(Xa),
CE_INTVAL(in_type_sel1),
CE_INTVAL(in_type_sel2),
CE_INTVAL(analog_deadzone),
- CE_INTVAL_V(frameskip, 2),
+ CE_INTVAL_V(frameskip, 3),
CE_INTVAL_P(gpu_peops.iUseDither),
CE_INTVAL_P(gpu_peops.dwActFixes),
+ CE_INTVAL_P(gpu_unai.lineskip),
CE_INTVAL_P(gpu_unai.abe_hack),
CE_INTVAL_P(gpu_unai.no_light),
CE_INTVAL_P(gpu_unai.no_blend),
CE_INTVAL(in_evdev_allow_abs_only),
CE_INTVAL(volume_boost),
CE_INTVAL(psx_clock),
+ CE_INTVAL(new_dynarec_hacks),
+ CE_INTVAL(in_enable_vibration),
};
static char *get_cd_label(void)
// rrrr rggg gggb bbbb
static unsigned short fname2color(const char *fname)
{
- static const char *cdimg_exts[] = { ".bin", ".img", ".mdf", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
- static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index", ".sbi" };
+ static const char *cdimg_exts[] = { ".bin", ".img", ".mdf", ".iso", ".cue", ".z",
+ ".bz", ".znx", ".pbp", ".cbn" };
+ static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub",
+ ".table", ".index", ".sbi" };
const char *ext = strrchr(fname, '.');
int i;
{ "Gun A button ", 1 << SACTION_GUN_A },
{ "Gun B button ", 1 << SACTION_GUN_B },
{ "Gun Offscreen Trigger", 1 << SACTION_GUN_TRIGGER2 },
+#ifndef __ARM_ARCH_7A__ /* XXX */
+ { "Volume Up ", 1 << SACTION_VOLUME_UP },
+ { "Volume Down ", 1 << SACTION_VOLUME_DOWN },
+#endif
{ NULL, 0 }
};
}
kbinds = binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)];
- for (i = 0; kbinds && i < ARRAY_SIZE(emuctrl_actions) - 1; i++) {
+ for (i = 0; kbinds && emuctrl_actions[i].name != NULL; i++) {
mask = emuctrl_actions[i].mask;
if (mask & kbinds) {
strncpy(act, emuctrl_actions[i].name, 31);
}
}
}
+
+ for (k = 0; k < array_size(in_adev); k++)
+ {
+ if (in_adev[k] == d)
+ fprintf(f, "bind_analog = %d\n", k);
+ }
}
}
char dev[256], key[128], *act;
const char *p;
int bind, bindtype;
- int dev_id;
+ int ret, dev_id;
p = cfg;
while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) {
if (strncmp(p, "binddev = ", 10) == 0)
break;
+ if (strncmp(p, "bind_analog", 11) == 0) {
+ ret = sscanf(p, "bind_analog = %d", &bind);
+ p += 11;
+ if (ret != 1) {
+ printf("input: parse error: %16s..\n", p);
+ continue;
+ }
+ if ((unsigned int)bind >= array_size(in_adev)) {
+ printf("input: analog id %d out of range\n", bind);
+ continue;
+ }
+ in_adev[bind] = dev_id;
+ continue;
+ }
+
p += 4;
if (*p != ' ') {
printf("input: parse error: %16s..\n", p);
return 0;
}
+static const char *adevnames[IN_MAX_DEVS + 2];
+static int stick_sel[2];
+
+static menu_entry e_menu_keyconfig_analog[] =
+{
+ mee_enum ("Left stick (L3)", 0, stick_sel[0], adevnames),
+ mee_range(" X axis", 0, in_adev_axis[0][0], 0, 7),
+ mee_range(" Y axis", 0, in_adev_axis[0][1], 0, 7),
+ mee_enum ("Right stick (R3)", 0, stick_sel[1], adevnames),
+ mee_range(" X axis", 0, in_adev_axis[1][0], 0, 7),
+ mee_range(" Y axis", 0, in_adev_axis[1][1], 0, 7),
+ mee_end,
+};
+
+static int key_config_analog(int id, int keys)
+{
+ int i, d, count, sel = 0;
+ int sel2dev_map[IN_MAX_DEVS];
+
+ memset(adevnames, 0, sizeof(adevnames));
+ memset(sel2dev_map, 0xff, sizeof(sel2dev_map));
+ memset(stick_sel, 0, sizeof(stick_sel));
+
+ adevnames[0] = "None";
+ i = 1;
+ for (d = 0; d < IN_MAX_DEVS; d++)
+ {
+ const char *name = in_get_dev_name(d, 0, 1);
+ if (name == NULL)
+ continue;
+
+ count = 0;
+ in_get_config(d, IN_CFG_ABS_AXIS_COUNT, &count);
+ if (count == 0)
+ continue;
+
+ if (in_adev[0] == d) stick_sel[0] = i;
+ if (in_adev[1] == d) stick_sel[1] = i;
+ sel2dev_map[i] = d;
+ adevnames[i++] = name;
+ }
+ adevnames[i] = NULL;
+
+ me_loop(e_menu_keyconfig_analog, &sel);
+
+ in_adev[0] = sel2dev_map[stick_sel[0]];
+ in_adev[1] = sel2dev_map[stick_sel[1]];
+
+ return 0;
+}
+
static const char *mgn_dev_name(int id, int *offs)
{
const char *name = NULL;
static int mh_input_rescan(int id, int keys)
{
//menu_sync_config();
- plat_rescan_inputs();
+ in_probe();
me_update_msg("rescan complete.");
return 0;
NULL
};
static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change.";
-static const char h_notsgun[] = "Don't trigger (shoot) when touching screen in gun games.";
+static const char h_notsgun[] = "Don't trigger (shoot) when touching screen in gun games.";
+static const char h_vibration[]= "Must select analog above and enable this ingame too.";
static menu_entry e_menu_keyconfig[] =
{
mee_handler_id("Player 1", MA_CTRL_PLAYER1, key_config_loop_wrap),
mee_handler_id("Player 2", MA_CTRL_PLAYER2, key_config_loop_wrap),
+ mee_handler_id("Analog controls", MA_CTRL_ANALOG, key_config_analog),
mee_handler_id("Emulator/Gun controls", MA_CTRL_EMU, key_config_loop_wrap),
mee_label (""),
mee_enum ("Port 1 device", 0, in_type_sel1, men_in_type_sel),
mee_enum ("Port 2 device", 0, in_type_sel2, men_in_type_sel),
mee_onoff_h ("Nubs as buttons", MA_CTRL_NUBS_BTNS, in_evdev_allow_abs_only, 1, h_nub_btns),
+ mee_onoff_h ("Vibration", MA_CTRL_VIBRATION, in_enable_vibration, 1, h_vibration),
mee_range ("Analog deadzone", MA_CTRL_DEADZONE, analog_deadzone, 1, 99),
mee_onoff_h ("No TS Gun trigger", 0, g_opts, OPT_TSGUN_NOTRIGGER, h_notsgun),
mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg),
mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
- mee_handler ("Rescan devices", mh_input_rescan),
+ mee_handler ("Rescan devices:", mh_input_rescan),
mee_label (""),
- mee_label ("Input devices:"),
mee_label_mk (MA_CTRL_DEV_FIRST, mgn_dev_name),
mee_label_mk (MA_CTRL_DEV_NEXT, mgn_dev_name),
mee_label_mk (MA_CTRL_DEV_NEXT, mgn_dev_name),
static menu_entry e_menu_plugin_gpu_unai[] =
{
+ mee_onoff ("Skip every 2nd line", 0, pl_rearmed_cbs.gpu_unai.lineskip, 1),
mee_onoff ("Abe's Odyssey hack", 0, pl_rearmed_cbs.gpu_unai.abe_hack, 1),
mee_onoff ("Disable lighting", 0, pl_rearmed_cbs.gpu_unai.no_light, 1),
mee_onoff ("Disable blending", 0, pl_rearmed_cbs.gpu_unai.no_blend, 1),
// ------------ adv options menu ------------
+static const char h_cfg_psxclk[] = "Over/under-clock the PSX, default is " DEFAULT_PSX_CLOCK_S "\n";
+static const char h_cfg_nosmc[] = "Will cause crashes when loading, break memcards";
+static const char h_cfg_gteunn[] = "May cause graphical glitches";
+static const char h_cfg_gteflgs[] = "Will cause graphical glitches";
+
+static menu_entry e_menu_speed_hacks[] =
+{
+ mee_range_h ("PSX CPU clock, %%", 0, psx_clock, 1, 500, h_cfg_psxclk),
+ mee_onoff_h ("Disable SMC checks", 0, new_dynarec_hacks, NDHACK_NO_SMC_CHECK, h_cfg_nosmc),
+ mee_onoff_h ("Assume GTE regs unneeded", 0, new_dynarec_hacks, NDHACK_GTE_UNNEEDED, h_cfg_gteunn),
+ mee_onoff_h ("Disable GTE flags", 0, new_dynarec_hacks, NDHACK_GTE_NO_FLAGS, h_cfg_gteflgs),
+ mee_end,
+};
+
+static int menu_loop_speed_hacks(int id, int keys)
+{
+ static int sel = 0;
+ me_loop(e_menu_speed_hacks, &sel);
+ return 0;
+}
+
static const char *men_cfg_cdrr[] = { "Auto", "ON", "OFF", NULL };
static const char h_cfg_cpul[] = "Shows CPU usage in %";
static const char h_cfg_spu[] = "Shows active SPU channels\n"
"(timing hack, breaks other games)";
static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix\n"
"(timing hack, breaks other games)";
-static const char h_cfg_cdrr[] = "Compatibility tweak (fixes Team Buddies, maybe more)\n"
- "(CD timing hack, breaks FMVs)";
-static const char h_cfg_psxclk[] = "Over/under-clock the PSX, default is " DEFAULT_PSX_CLOCK_S "\n"
- "(may break games, must reload game to take effect)";
+static const char h_cfg_cdrr[] = "Compatibility tweak (CD timing hack, breaks FMVs)";
static const char h_cfg_nodrc[] = "Disable dynamic recompiler and use interpreter\n"
"Might be useful to overcome some dynarec bugs";
+static const char h_cfg_shacks[] = "Breaks games but may give better performance\n"
+ "must reload game for any change to take effect";
static menu_entry e_menu_adv_options[] =
{
//mee_onoff_h ("Rootcounter hack", 0, Config.RCntFix, 1, h_cfg_rcnt1),
mee_onoff_h ("Rootcounter hack 2", 0, Config.VSyncWA, 1, h_cfg_rcnt2),
mee_enum_h ("CD read reschedule hack",0, Config.CdrReschedule, men_cfg_cdrr, h_cfg_cdrr),
- mee_range_h ("PSX CPU clock, %%", 0, psx_clock, 1, 500, h_cfg_psxclk),
mee_onoff_h ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc),
+ mee_handler_h ("[Speed hacks]", menu_loop_speed_hacks, h_cfg_shacks),
mee_end,
};
}
static const char *men_region[] = { "Auto", "NTSC", "PAL", NULL };
-static const char *men_frameskip[] = { "Auto", "Off", "1", NULL };
+static const char *men_frameskip[] = { "Auto", "Off", "1", "2", "3", NULL };
/*
static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };
static const char h_confirm_save[] = "Ask for confirmation when overwriting save,\n"
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
"(C) 2009-2011 PCSX-Reloaded Team\n\n"
- "GPU and SPU code by Pete Bernert\n"
- " and the P.E.Op.S. team\n"
"ARM recompiler (C) 2009-2011 Ari64\n"
- "PCSX4ALL plugins by PCSX4ALL team\n"
+#ifdef __ARM_NEON__
+ "ARM NEON GPU (c) 2011 Exophase\n"
+#endif
+ "PEOpS GPU and SPU by Pete Bernert\n"
+ " and the P.E.Op.S. team\n"
+ "PCSX4ALL plugin by PCSX4ALL team\n"
" Chui, Franxis, Unai\n\n"
"integration, optimization and\n"
" frontend (C) 2010-2011 notaz\n";
}
plugin_call_rearmed_cbs();
+ cdrIsoMultidiskCount = 1;
CdromId[0] = '\0';
CdromLabel[0] = '\0';
}
ready_to_go = 1;
+ snprintf(hud_msg, sizeof(hud_msg), "Booting up...");
+ hud_new_msg = 2;
return 0;
}
return -1;
}
+ if (Config.HLE)
+ printf("note: running without BIOS, expect compatibility problems\n");
+
strcpy(last_selected_fname, rom_fname_reload);
return 0;
}
return 0;
}
+static int swap_cd_multidisk(void)
+{
+ cdrIsoMultidiskSelect++;
+ CdromId[0] = '\0';
+ CdromLabel[0] = '\0';
+
+ CDR_close();
+ if (CDR_open() < 0) {
+ me_update_msg("failed to open cdr plugin");
+ return -1;
+ }
+
+ SetCdOpenCaseTime(time(NULL) + 2);
+ LidInterrupt();
+
+ return 0;
+}
+
static int main_menu_handler(int id, int keys)
{
switch (id)
if (swap_cd_image() == 0)
return 1;
break;
+ case MA_MAIN_SWAP_CD_MULTI:
+ if (swap_cd_multidisk() == 0)
+ return 1;
+ break;
case MA_MAIN_RUN_BIOS:
if (run_bios() == 0)
return 1;
static menu_entry e_menu_main2[] =
{
- mee_handler_id("Change CD image", MA_MAIN_SWAP_CD, main_menu_handler),
- mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler),
- mee_handler_id("Run EXE", MA_MAIN_RUN_EXE, main_menu_handler),
+ mee_handler_id("Change CD image", MA_MAIN_SWAP_CD, main_menu_handler),
+ mee_handler_id("Next multidisk CD", MA_MAIN_SWAP_CD_MULTI, main_menu_handler),
+ mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler),
+ mee_handler_id("Run EXE", MA_MAIN_RUN_EXE, main_menu_handler),
mee_handler ("Memcard manager", menu_loop_memcards),
mee_end,
};
static int sel = 0;
me_enable(e_menu_main2, MA_MAIN_SWAP_CD, ready_to_go);
+ me_enable(e_menu_main2, MA_MAIN_SWAP_CD_MULTI, ready_to_go && cdrIsoMultidiskCount > 1);
me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);
return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main);
me_enable(e_menu_options, MA_OPT_DISP_OPTS, 0);
me_enable(e_menu_keyconfig, MA_CTRL_NUBS_BTNS, 0);
#else
+ me_enable(e_menu_keyconfig, MA_CTRL_VIBRATION, 0);
me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0);
#endif
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff