#include "plugin.h"
#include "plugin_lib.h"
#include "omap.h"
+#include "pandora.h"
+#include "pcnt.h"
+#include "arm_utils.h"
#include "common/plat.h"
+#include "common/input.h"
+#include "linux/in_evdev.h"
#include "../libpcsxcore/misc.h"
+#include "../libpcsxcore/cdrom.h"
+#include "../libpcsxcore/psemu_plugin_defs.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../plugins/dfinput/pad.h"
#include "revision.h"
#define MENU_X2 1
MA_MAIN_LOAD_STATE,
MA_MAIN_RESET_GAME,
MA_MAIN_LOAD_ROM,
+ MA_MAIN_SWAP_CD,
MA_MAIN_RUN_BIOS,
+ MA_MAIN_RUN_EXE,
MA_MAIN_CONTROLS,
MA_MAIN_CREDITS,
MA_MAIN_EXIT,
};
static int last_psx_w, last_psx_h, last_psx_bpp;
-static int scaling, filter, state_slot, cpu_clock, cpu_clock_st;
+static int scaling, filter, cpu_clock, cpu_clock_st;
static char rom_fname_reload[MAXPATHLEN];
static char last_selected_fname[MAXPATHLEN];
-static int region;
+static int warned_about_bios, region, in_type_sel;
+static int memcard1_sel, memcard2_sel;
int g_opts;
-// from softgpu plugin
-extern int iUseDither;
-extern int UseFrameSkip;
-extern uint32_t dwActFixes;
-extern float fFrameRateHz;
-extern int dwFrameRateTicks;
-
// sound plugin
extern int iUseReverb;
extern int iUseInterpolation;
static const char *bioses[24];
static const char *gpu_plugins[16];
static const char *spu_plugins[16];
+static const char *memcards[32];
static int bios_sel, gpu_plugsel, spu_plugsel;
static int emu_check_save_file(int slot)
{
- char fname[MAXPATHLEN];
- int ret;
-
- ret = get_state_filename(fname, sizeof(fname), slot);
- if (ret != 0)
- return 0;
-
- ret = CheckState(fname);
+ int ret = emu_check_state(slot);
return ret == 0 ? 1 : 0;
}
-static int emu_save_load_game(int load, int sram)
+static int emu_save_load_game(int load, int unused)
{
- char fname[MAXPATHLEN];
int ret;
- ret = get_state_filename(fname, sizeof(fname), state_slot);
- if (ret != 0)
- return 0;
-
if (load) {
- ret = LoadState(fname);
+ ret = emu_load_state(state_slot);
// reflect hle/bios mode from savestate
if (Config.HLE)
bios_sel = 1;
}
else
- ret = SaveState(fname);
+ ret = emu_save_state(state_slot);
return ret;
}
// propagate menu settings to the emu vars
static void menu_sync_config(void)
{
+ static int allow_abs_only_old;
+
Config.PsxAuto = 1;
if (region > 0) {
Config.PsxAuto = 0;
Config.PsxType = region - 1;
}
- pl_frame_interval = Config.PsxType ? 20000 : 16667;
+ in_type = in_type_sel ? PSE_PAD_TYPE_ANALOGPAD : PSE_PAD_TYPE_STANDARD;
+ if (in_evdev_allow_abs_only != allow_abs_only_old) {
+ pandora_rescan_inputs();
+ allow_abs_only_old = in_evdev_allow_abs_only;
+ }
+ pl_frame_interval = Config.PsxType ? 20000 : 16667;
// used by P.E.Op.S. frameskip code
- fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
- dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100));
+ pl_rearmed_cbs.gpu_peops.fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
+ pl_rearmed_cbs.gpu_peops.dwFrameRateTicks =
+ (100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100));
}
static void menu_set_defconfig(void)
scaling = SCALE_4_3;
region = 0;
+ in_type_sel = 0;
+ in_evdev_allow_abs_only = 0;
Config.Xa = Config.Cdda = Config.Sio =
Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
+ Config.CdrReschedule = 0;
- iUseDither = UseFrameSkip = 0;
- dwActFixes = 1<<7;
+ pl_rearmed_cbs.frameskip = 0;
+ pl_rearmed_cbs.gpu_peops.iUseDither = 0;
+ pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
iUseReverb = 2;
iUseInterpolation = 1;
- iXAPitch = iSPUIRQWait = 0;
+ iXAPitch = 0;
+ iSPUIRQWait = 1;
iUseTimer = 2;
menu_sync_config();
#define CE_INTVAL(val) \
{ #val, sizeof(val), &val }
+#define CE_INTVAL_P(val) \
+ { #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val }
+
+// 'versioned' var, used when defaults change
+#define CE_INTVAL_V(val, ver) \
+ { #val #ver, sizeof(val), &val }
+
static const struct {
const char *name;
size_t len;
CE_CONFIG_VAL(RCntFix),
CE_CONFIG_VAL(VSyncWA),
CE_CONFIG_VAL(Cpu),
+ CE_CONFIG_VAL(CdrReschedule),
CE_INTVAL(region),
CE_INTVAL(scaling),
CE_INTVAL(g_layer_x),
CE_INTVAL(state_slot),
CE_INTVAL(cpu_clock),
CE_INTVAL(g_opts),
- CE_INTVAL(iUseDither),
- CE_INTVAL(UseFrameSkip),
- CE_INTVAL(dwActFixes),
+ CE_INTVAL(in_type_sel),
+ CE_INTVAL_P(frameskip),
+ CE_INTVAL_P(gpu_peops.iUseDither),
+ CE_INTVAL_P(gpu_peops.dwActFixes),
CE_INTVAL(iUseReverb),
- CE_INTVAL(iUseInterpolation),
CE_INTVAL(iXAPitch),
- CE_INTVAL(iSPUIRQWait),
+ CE_INTVAL_V(iUseInterpolation, 2),
+ CE_INTVAL_V(iSPUIRQWait, 2),
CE_INTVAL(iUseTimer),
+ CE_INTVAL(warned_about_bios),
+ CE_INTVAL(in_evdev_allow_abs_only),
};
static char *get_cd_label(void)
snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename);
}
+static void keys_write_all(FILE *f);
+
static int menu_write_config(int is_game)
{
char cfgfile[MAXPATHLEN];
if (!is_game)
fprintf(f, "lastcdimg = %s\n", last_selected_fname);
+ keys_write_all(f);
fclose(f);
+
return 0;
}
*tmp = 0;
}
+static void keys_load_all(const char *cfg);
+
static int menu_load_config(int is_game)
{
char cfgfile[MAXPATHLEN];
if (strcmp(Config.Spu, spu_plugins[i]) == 0)
{ spu_plugsel = i; break; }
+ keys_load_all(cfg);
ret = 0;
fail_read:
free(cfg);
// rrrr rggg gggb bbbb
static unsigned short fname2color(const char *fname)
{
- static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
- static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" };
+ 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" };
const char *ext = strrchr(fname, '.');
int i;
static void draw_savestate_bg(int slot);
+static const char *filter_exts[] = {
+ ".mp3", ".MP3", ".txt", ".htm", "html", ".jpg", ".pnd"
+};
+
#define MENU_ALIGN_LEFT
#define menu_init menu_init_common
#include "common/menu.c"
// a bit of black magic here
static void draw_savestate_bg(int slot)
{
- extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
static const int psx_widths[8] = { 256, 368, 320, 384, 512, 512, 640, 640 };
int x, y, w, h;
char fname[MAXPATHLEN];
memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
- if ((gpu->ulStatus & 0x800000) || (gpu->ulStatus & 0x200000))
- goto out; // disabled || 24bpp (NYET)
+ if (gpu->ulStatus & 0x800000)
+ goto out; // disabled
x = gpu->ulControl[5] & 0x3ff;
y = (gpu->ulControl[5] >> 10) & 0x1ff;
- s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~3);
+ s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~1);
w = psx_widths[(gpu->ulStatus >> 16) & 7];
tmp = gpu->ulControl[7];
h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
for (; h > 0; h--, d += g_menuscreen_w, s += 1024)
- bgr555_to_rgb565(d, s, w * 2);
+ if (gpu->ulStatus & 0x200000)
+ bgr888_to_rgb565(d, s, w * 3);
+ else
+ bgr555_to_rgb565(d, s, w * 2);
out:
free(gpu);
old = which;
}
+static void apply_lcdrate(int pal)
+{
+ static int old = -1;
+ char buf[128];
+
+ if (pal == old)
+ return;
+
+ snprintf(buf, sizeof(buf), "%s/op_lcdrate.sh %d",
+ pnd_script_base, pal ? 50 : 60);
+ system(buf);
+ old = pal;
+}
+
static menu_entry e_menu_gfx_options[];
static void pnd_menu_init(void)
{ "R1 ", 1 << DKEY_R1 },
{ "L2 ", 1 << DKEY_L2 },
{ "R2 ", 1 << DKEY_R2 },
+ { "L3 ", 1 << DKEY_L3 },
+ { "R3 ", 1 << DKEY_R3 },
{ "START ", 1 << DKEY_START },
{ "SELECT ", 1 << DKEY_SELECT },
{ NULL, 0 }
me_bind_action emuctrl_actions[] =
{
-/*
- { "Load State ", PEV_STATE_LOAD },
- { "Save State ", PEV_STATE_SAVE },
- { "Prev Save Slot ", PEV_SSLOT_PREV },
- { "Next Save Slot ", PEV_SSLOT_NEXT },
-*/
- { "Enter Menu ", PEV_MENU },
+ { "Save State ", 1 << SACTION_SAVE_STATE },
+ { "Load State ", 1 << SACTION_LOAD_STATE },
+ { "Prev Save Slot ", 1 << SACTION_PREV_SSLOT },
+ { "Next Save Slot ", 1 << SACTION_NEXT_SSLOT },
+ { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
+ { "Take Screenshot ", 1 << SACTION_SCREENSHOT },
+ { "Enter Menu ", 1 << SACTION_ENTER_MENU },
{ NULL, 0 }
};
+static char *mystrip(char *str)
+{
+ int i, len;
+
+ len = strlen(str);
+ for (i = 0; i < len; i++)
+ if (str[i] != ' ') break;
+ if (i > 0) memmove(str, str + i, len - i + 1);
+
+ len = strlen(str);
+ for (i = len - 1; i >= 0; i--)
+ if (str[i] != ' ') break;
+ str[i+1] = 0;
+
+ return str;
+}
+
+static void get_line(char *d, size_t size, const char *s)
+{
+ const char *pe;
+ size_t len;
+
+ for (pe = s; *pe != '\r' && *pe != '\n' && *pe != 0; pe++)
+ ;
+ len = pe - s;
+ if (len > size - 1)
+ len = size - 1;
+ strncpy(d, s, len);
+ d[len] = 0;
+
+ mystrip(d);
+}
+
+static void keys_write_all(FILE *f)
+{
+ int d;
+
+ for (d = 0; d < IN_MAX_DEVS; d++)
+ {
+ const int *binds = in_get_dev_binds(d);
+ const char *name = in_get_dev_name(d, 0, 0);
+ int k, count = 0;
+
+ if (binds == NULL || name == NULL)
+ continue;
+
+ fprintf(f, "binddev = %s\n", name);
+ in_get_config(d, IN_CFG_BIND_COUNT, &count);
+
+ for (k = 0; k < count; k++)
+ {
+ int i, kbinds, mask;
+ char act[32];
+
+ act[0] = act[31] = 0;
+ name = in_get_key_name(d, k);
+
+ kbinds = binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER12)];
+ for (i = 0; kbinds && i < ARRAY_SIZE(me_ctrl_actions) - 1; i++) {
+ mask = me_ctrl_actions[i].mask;
+ if (mask & kbinds) {
+ strncpy(act, me_ctrl_actions[i].name, 31);
+ fprintf(f, "bind %s = player1 %s\n", name, mystrip(act));
+ kbinds &= ~mask;
+ }
+ mask = me_ctrl_actions[i].mask << 16;
+ if (mask & kbinds) {
+ strncpy(act, me_ctrl_actions[i].name, 31);
+ fprintf(f, "bind %s = player2 %s\n", name, mystrip(act));
+ kbinds &= ~mask;
+ }
+ }
+
+ kbinds = binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)];
+ for (i = 0; kbinds && i < ARRAY_SIZE(emuctrl_actions) - 1; i++) {
+ mask = emuctrl_actions[i].mask;
+ if (mask & kbinds) {
+ strncpy(act, emuctrl_actions[i].name, 31);
+ fprintf(f, "bind %s = %s\n", name, mystrip(act));
+ kbinds &= ~mask;
+ }
+ }
+ }
+ }
+}
+
+static int parse_bind_val(const char *val, int *type)
+{
+ int i;
+
+ *type = IN_BINDTYPE_NONE;
+ if (val[0] == 0)
+ return 0;
+
+ if (strncasecmp(val, "player", 6) == 0)
+ {
+ int player, shift = 0;
+ player = atoi(val + 6) - 1;
+
+ if ((unsigned int)player > 1)
+ return -1;
+ if (player == 1)
+ shift = 16;
+
+ *type = IN_BINDTYPE_PLAYER12;
+ for (i = 0; me_ctrl_actions[i].name != NULL; i++) {
+ if (strncasecmp(me_ctrl_actions[i].name, val + 8, strlen(val + 8)) == 0)
+ return me_ctrl_actions[i].mask << shift;
+ }
+ }
+ for (i = 0; emuctrl_actions[i].name != NULL; i++) {
+ if (strncasecmp(emuctrl_actions[i].name, val, strlen(val)) == 0) {
+ *type = IN_BINDTYPE_EMU;
+ return emuctrl_actions[i].mask;
+ }
+ }
+
+ return -1;
+}
+
+static void keys_load_all(const char *cfg)
+{
+ char dev[256], key[128], *act;
+ const char *p;
+ int bind, bindtype;
+ int dev_id;
+
+ p = cfg;
+ while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) {
+ p += 10;
+
+ get_line(dev, sizeof(dev), p);
+ dev_id = in_config_parse_dev(dev);
+ if (dev_id < 0) {
+ printf("input: can't handle dev: %s\n", dev);
+ continue;
+ }
+
+ in_unbind_all(dev_id, -1, -1);
+ while ((p = strstr(p, "bind"))) {
+ if (strncmp(p, "binddev = ", 10) == 0)
+ break;
+
+ p += 4;
+ if (*p != ' ') {
+ printf("input: parse error: %16s..\n", p);
+ continue;
+ }
+
+ get_line(key, sizeof(key), p);
+ act = strchr(key, '=');
+ if (act == NULL) {
+ printf("parse failed: %16s..\n", p);
+ continue;
+ }
+ *act = 0;
+ act++;
+ mystrip(key);
+ mystrip(act);
+
+ bind = parse_bind_val(act, &bindtype);
+ if (bind != -1 && bind != 0) {
+ //printf("bind #%d '%s' %08x (%s)\n", dev_id, key, bind, act);
+ in_config_bind_key(dev_id, key, bind, bindtype);
+ }
+ else
+ lprintf("config: unhandled action \"%s\"\n", act);
+ }
+ }
+ in_clean_binds();
+}
+
static int key_config_loop_wrap(int id, int keys)
{
switch (id) {
return 1;
}
+static int mh_input_rescan(int id, int keys)
+{
+ //menu_sync_config();
+ pandora_rescan_inputs();
+ me_update_msg("rescan complete.");
+
+ return 0;
+}
+
+static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", NULL };
+static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change.";
+
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("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap),
-// 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_label (""),
+ mee_enum ("Controller", 0, in_type_sel, men_in_type_sel),
+ mee_onoff_h ("Nubs as buttons", 0, in_evdev_allow_abs_only, 1, h_nub_btns),
+ 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_label (""),
mee_label ("Input devices:"),
mee_label_mk (MA_CTRL_DEV_FIRST, mgn_dev_name),
static int sel = 0;
// me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
- me_loop(e_menu_keyconfig, &sel, NULL);
+ me_loop(e_menu_keyconfig, &sel);
return 0;
}
{
static int sel = 0;
- me_loop(e_menu_gfx_options, &sel, NULL);
+ me_loop(e_menu_gfx_options, &sel);
return 0;
}
static menu_entry e_menu_plugin_gpu[] =
{
- mee_enum ("Dithering", 0, iUseDither, men_gpu_dithering),
- mee_onoff_h ("Odd/even bit hack", 0, dwActFixes, 1<<0, h_gpu_0),
- mee_onoff_h ("Expand screen width", 0, dwActFixes, 1<<1, h_gpu_1),
- mee_onoff_h ("Ignore brightness color", 0, dwActFixes, 1<<2, h_gpu_2),
- mee_onoff_h ("Disable coordinate check", 0, dwActFixes, 1<<3, h_gpu_3),
- mee_onoff_h ("Lazy screen update", 0, dwActFixes, 1<<6, h_gpu_6),
- mee_onoff_h ("Old frame skipping", 0, dwActFixes, 1<<7, h_gpu_7),
- mee_onoff_h ("Repeated flat tex triangles ",0,dwActFixes, 1<<8, h_gpu_8),
- mee_onoff_h ("Draw quads with triangles", 0, dwActFixes, 1<<9, h_gpu_9),
- mee_onoff_h ("Fake 'gpu busy' states", 0, dwActFixes, 1<<10, h_gpu_10),
+ mee_enum ("Dithering", 0, pl_rearmed_cbs.gpu_peops.iUseDither, men_gpu_dithering),
+ mee_onoff_h ("Odd/even bit hack", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<0, h_gpu_0),
+ mee_onoff_h ("Expand screen width", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<1, h_gpu_1),
+ mee_onoff_h ("Ignore brightness color", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<2, h_gpu_2),
+ mee_onoff_h ("Disable coordinate check", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<3, h_gpu_3),
+ mee_onoff_h ("Lazy screen update", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<6, h_gpu_6),
+ mee_onoff_h ("Old frame skipping", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<7, h_gpu_7),
+ mee_onoff_h ("Repeated flat tex triangles ",0,pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<8, h_gpu_8),
+ mee_onoff_h ("Draw quads with triangles", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<9, h_gpu_9),
+ mee_onoff_h ("Fake 'gpu busy' states", 0, pl_rearmed_cbs.gpu_peops.dwActFixes, 1<<10, h_gpu_10),
mee_end,
};
static int menu_loop_plugin_gpu(int id, int keys)
{
static int sel = 0;
- me_loop(e_menu_plugin_gpu, &sel, NULL);
+ me_loop(e_menu_plugin_gpu, &sel);
return 0;
}
static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL };
static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
-static const char h_spu_irq_wait[] = "Wait for CPU; only useful for some games, may cause glitches";
+static const char h_spu_irq_wait[] = "Wait for CPU (recommended set to ON)";
static const char h_spu_thread[] = "Run sound emulation in main thread (recommended)";
static menu_entry e_menu_plugin_spu[] =
static int menu_loop_plugin_spu(int id, int keys)
{
static int sel = 0;
- me_loop(e_menu_plugin_spu, &sel, NULL);
+ me_loop(e_menu_plugin_spu, &sel);
return 0;
}
-static const char h_bios[] = "HLE is simulated BIOS. BIOS is saved in savestates.\n"
- "Must save config and reload the game\n"
- "for change to take effect";
+static const char h_bios[] = "HLE is simulated BIOS. BIOS selection is saved in savestates\n"
+ "and can't be changed there. Must save config and reload\n"
+ "the game for change to take effect";
static const char h_plugin_xpu[] = "Must save config and reload the game\n"
"for plugin change to take effect";
-static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17";
+static const char h_gpu[] = "Configure P.E.Op.S. SoftGL Driver V1.17";
static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7";
static menu_entry e_menu_plugin_options[] =
mee_enum_h ("BIOS", 0, bios_sel, bioses, h_bios),
mee_enum_h ("GPU plugin", 0, gpu_plugsel, gpu_plugins, h_plugin_xpu),
mee_enum_h ("SPU plugin", 0, spu_plugsel, spu_plugins, h_plugin_xpu),
- mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu, h_gpu),
+ mee_handler_h ("Configure gpu_peops plugin", menu_loop_plugin_gpu, h_gpu),
mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),
mee_end,
};
-static menu_entry e_menu_main[];
+static menu_entry e_menu_main2[];
static int menu_loop_plugin_options(int id, int keys)
{
static int sel = 0;
- me_loop(e_menu_plugin_options, &sel, NULL);
+ me_loop(e_menu_plugin_options, &sel);
// sync BIOS/plugins
snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[bios_sel]);
snprintf(Config.Gpu, sizeof(Config.Gpu), "%s", gpu_plugins[gpu_plugsel]);
snprintf(Config.Spu, sizeof(Config.Spu), "%s", spu_plugins[spu_plugsel]);
- me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0);
+ me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);
return 0;
}
// ------------ adv options menu ------------
-static const char h_cfg_cpul[] = "Shows CPU usage in %%";
+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"
+ "(green: normal, red: fmod, blue: noise)";
static const char h_cfg_fl[] = "Frame Limiter keeps the game from running too fast";
static const char h_cfg_xa[] = "Disables XA sound, which can sometimes improve performance";
static const char h_cfg_cdda[] = "Disable CD Audio for a performance boost\n"
"(proper .cue/.bin dump is needed otherwise)";
-static const char h_cfg_sio[] = "This should be enabled for certain memcards/gamepads";
-static const char h_cfg_spuirq[] = "Compatibility tweak; should probably be left off";
-static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix";
-static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix";
+static const char h_cfg_sio[] = "You should not need this, breaks games";
+static const char h_cfg_spuirq[] = "Compatibility tweak; should be left off";
+static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix\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_nodrc[] = "Disable dynamic recompiler and use interpreter\n"
"Might be useful to overcome some dynarec bugs";
static menu_entry e_menu_adv_options[] =
{
mee_onoff_h ("Show CPU load", 0, g_opts, OPT_SHOWCPU, h_cfg_cpul),
+ mee_onoff_h ("Show SPU channels", 0, g_opts, OPT_SHOWSPU, h_cfg_spu),
mee_onoff_h ("Disable Frame Limiter", 0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl),
mee_onoff_h ("Disable XA Decoding", 0, Config.Xa, 1, h_cfg_xa),
mee_onoff_h ("Disable CD Audio", 0, Config.Cdda, 1, h_cfg_cdda),
mee_onoff_h ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq),
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_onoff_h ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc),
mee_end,
};
static int menu_loop_adv_options(int id, int keys)
{
static int sel = 0;
- me_loop(e_menu_adv_options, &sel, NULL);
+ me_loop(e_menu_adv_options, &sel);
return 0;
}
*/
static const char h_restore_def[] = "Switches back to default / recommended\n"
"configuration";
+static const char h_frameskip[] = "Warning: frameskip sometimes causes glitches\n";
static menu_entry e_menu_options[] =
{
// mee_range ("Save slot", 0, state_slot, 0, 9),
// mee_enum_h ("Confirm savestate", 0, dummy, men_confirm_save, h_confirm_save),
- mee_onoff ("Frameskip", 0, UseFrameSkip, 1),
+ mee_onoff_h ("Frameskip", 0, pl_rearmed_cbs.frameskip, 1, h_frameskip),
mee_onoff ("Show FPS", 0, g_opts, OPT_SHOWFPS),
mee_enum ("Region", 0, region, men_region),
mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0;
me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
- me_loop(e_menu_options, &sel, NULL);
+ me_loop(e_menu_options, &sel);
return 0;
}
// ------------ debug menu ------------
-static void draw_frame_debug(void)
+static void draw_frame_debug(GPUFreeze_t *gpuf)
{
+ int w = min(g_menuscreen_w, 1024);
+ int h = min(g_menuscreen_h, 512);
+ u16 *d = g_menuscreen_ptr;
+ u16 *s = (u16 *)gpuf->psxVRam;
+ char buff[64];
+ int ty = 1;
+
+ gpuf->ulFreezeVersion = 1;
+ if (GPU_freeze != NULL)
+ GPU_freeze(1, gpuf);
+
+ for (; h > 0; h--, d += g_menuscreen_w, s += 1024)
+ bgr555_to_rgb565(d, s, w * 2);
+
smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
+ snprintf(buff, sizeof(buff), "GPU sr: %08x", gpuf->ulStatus);
+ smalltext_out16(4, (ty += me_sfont_h), buff, 0xe7fc);
+ snprintf(buff, sizeof(buff), "PC/SP: %08x %08x", psxRegs.pc, psxRegs.GPR.n.sp);
+ smalltext_out16(4, (ty += me_sfont_h), buff, 0xe7fc);
}
static void debug_menu_loop(void)
{
+ GPUFreeze_t *gpuf;
int inp;
+ gpuf = malloc(sizeof(*gpuf));
+ if (gpuf == NULL)
+ return;
+
while (1)
{
- menu_draw_begin(1);
- draw_frame_debug();
+ menu_draw_begin(0);
+ draw_frame_debug(gpuf);
menu_draw_end();
inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |
PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 70);
if (inp & PBTN_MBACK)
+ break;
+ }
+
+ free(gpuf);
+}
+
+// --------- memcard manager ---------
+
+static void draw_mc_icon(int dx, int dy, const u16 *s)
+{
+ u16 *d;
+ int x, y, l, p;
+
+ d = (u16 *)g_menuscreen_ptr + g_menuscreen_w * dy + dx;
+
+ for (y = 0; y < 16; y++, s += 16) {
+ for (l = 0; l < 2; l++, d += g_menuscreen_w) {
+ for (x = 0; x < 16; x++) {
+ p = s[x];
+ d[x*2] = d[x*2 + 1] = ((p & 0x7c00) >> 10)
+ | ((p & 0x03e0) << 1) | ((p & 0x1f) << 11);
+ }
+ }
+ }
+}
+
+static void draw_mc_bg(void)
+{
+ McdBlock *blocks1, *blocks2;
+ int maxicons = 15;
+ int i, y, row2;
+
+ blocks1 = malloc(15 * sizeof(blocks1[0]));
+ blocks2 = malloc(15 * sizeof(blocks1[0]));
+ if (blocks1 == NULL || blocks2 == NULL)
+ goto out;
+
+ for (i = 0; i < 15; i++) {
+ GetMcdBlockInfo(1, i + 1, &blocks1[i]);
+ GetMcdBlockInfo(2, i + 1, &blocks2[i]);
+ }
+
+ menu_draw_begin(1);
+
+ memcpy(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
+
+ y = g_menuscreen_h / 2 - 15 * 32 / 2;
+ if (y < 0) {
+ // doesn't fit..
+ y = 0;
+ maxicons = g_menuscreen_h / 32;
+ }
+
+ row2 = g_menuscreen_w / 2;
+ for (i = 0; i < maxicons; i++) {
+ draw_mc_icon(8, y + i * 32, (u16 *)blocks1[i].Icon);
+ smalltext_out16(10+32, y + i * 32 + 8, blocks1[i].sTitle, 0xf71e);
+
+ draw_mc_icon(row2 + 8, y + i * 32, (u16 *)blocks2[i].Icon);
+ smalltext_out16(row2 + 10+32, y + i * 32 + 8, blocks2[i].sTitle, 0xf71e);
+ }
+
+ menu_darken_bg(g_menubg_ptr, g_menuscreen_ptr, g_menuscreen_w * g_menuscreen_h, 0);
+
+ menu_draw_end();
+out:
+ free(blocks1);
+ free(blocks2);
+}
+
+static void handle_memcard_sel(void)
+{
+ Config.Mcd1[0] = 0;
+ if (memcard1_sel != 0)
+ snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]);
+ Config.Mcd2[0] = 0;
+ if (memcard2_sel != 0)
+ snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]);
+ LoadMcds(Config.Mcd1, Config.Mcd2);
+ draw_mc_bg();
+}
+
+static menu_entry e_memcard_options[] =
+{
+ mee_enum("Memory card 1", 0, memcard1_sel, memcards),
+ mee_enum("Memory card 2", 0, memcard2_sel, memcards),
+ mee_end,
+};
+
+static int menu_loop_memcards(int id, int keys)
+{
+ static int sel = 0;
+ char *p;
+ int i;
+
+ memcard1_sel = memcard2_sel = 0;
+ p = strrchr(Config.Mcd1, '/');
+ if (p != NULL)
+ for (i = 0; memcards[i] != NULL; i++)
+ if (strcmp(p + 1, memcards[i]) == 0)
+ { memcard1_sel = i; break; }
+ p = strrchr(Config.Mcd2, '/');
+ if (p != NULL)
+ for (i = 0; memcards[i] != NULL; i++)
+ if (strcmp(p + 1, memcards[i]) == 0)
+ { memcard2_sel = i; break; }
+
+ me_loop_d(e_memcard_options, &sel, handle_memcard_sel, NULL);
+
+ memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
+
+ return 0;
+}
+
+// --------- main menu help ----------
+
+static void menu_bios_warn(void)
+{
+ int inp;
+ static const char msg[] =
+ "You don't seem to have copied any BIOS files to\n"
+ "<SD card>/pandora/appdata/pcsx_rearmed/bios/\n\n"
+ "While many games work fine with fake (HLE) BIOS,\n"
+ "others (like MGS and FF8) require BIOS to work.\n"
+ "After copying the file, you'll also need to\n"
+ "select it in the emu's options->[BIOS/Plugins]\n\n"
+ "The file is usually named SCPH1001.BIN, but\n"
+ "other not compressed files can be used too.\n\n"
+ "Press (B) or (X) to continue";
+
+ while (1)
+ {
+ draw_menu_message(msg, NULL);
+
+ inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
+ if (inp & (PBTN_MBACK|PBTN_MOK))
return;
}
}
{
if (CdromId[0] != 0) {
char buff[64];
- snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)",
- get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC");
+ snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)",
+ get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC",
+ Config.HLE ? "HLE" : "BIOS");
smalltext_out16(4, 1, buff, 0x105f);
}
}
smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
}
-const char *plat_get_credits(void)
-{
- return "PCSX-ReARMed\n\n"
- "(C) 1999-2003 PCSX Team\n"
- "(C) 2005-2009 PCSX-df Team\n"
- "(C) 2009-2010 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-2010 Ari64\n"
- "PCSX4ALL plugins by PCSX4ALL team\n"
- " Chui, Franxis, Unai\n\n"
- "integration, optimization and\n"
- " frontend (C) 2010-2011 notaz\n";
-}
+static const char credits_text[] =
+ "PCSX-ReARMed\n\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"
+ " Chui, Franxis, Unai\n\n"
+ "integration, optimization and\n"
+ " frontend (C) 2010-2011 notaz\n";
static int reset_game(void)
{
return 0;
}
-static int run_bios(void)
+static int reload_plugins(const char *cdimg)
{
- if (bios_sel == 0)
- return -1;
-
- ready_to_go = 0;
pl_fbdev_buf = NULL;
ClosePlugins();
- set_cd_image(NULL);
+
+ set_cd_image(cdimg);
LoadPlugins();
+ pcnt_hook_plugins();
NetOpened = 0;
if (OpenPlugins() == -1) {
me_update_msg("failed to open plugins");
CdromId[0] = '\0';
CdromLabel[0] = '\0';
+ return 0;
+}
+
+static int run_bios(void)
+{
+ if (bios_sel == 0)
+ return -1;
+
+ ready_to_go = 0;
+ if (reload_plugins(NULL) != 0)
+ return -1;
SysReset();
ready_to_go = 1;
return 0;
}
-static int run_cd_image(const char *fname)
+static int run_exe(void)
{
+ const char *fname;
+
+ fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
+ if (fname == NULL)
+ return -1;
+
ready_to_go = 0;
- pl_fbdev_buf = NULL;
+ if (reload_plugins(NULL) != 0)
+ return -1;
- ClosePlugins();
- set_cd_image(fname);
- LoadPlugins();
- NetOpened = 0;
- if (OpenPlugins() == -1) {
- me_update_msg("failed to open plugins");
+ SysReset();
+ if (Load(fname) != 0) {
+ me_update_msg("exe load failed, bad file?");
+ printf("meh\n");
return -1;
}
- plugin_call_rearmed_cbs();
+
+ ready_to_go = 1;
+ return 0;
+}
+
+static int run_cd_image(const char *fname)
+{
+ ready_to_go = 0;
+ reload_plugins(fname);
if (CheckCdrom() == -1) {
// Only check the CD if we are starting the console with a CD
static int romsel_run(void)
{
int prev_gpu, prev_spu;
- char *fname;
+ const char *fname;
fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
if (fname == NULL)
printf("selected file: %s\n", fname);
+ new_dynarec_clear_full();
+
if (run_cd_image(fname) != 0)
return -1;
return 0;
}
+static int swap_cd_image(void)
+{
+ char *fname;
+
+ fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
+ if (fname == NULL)
+ return -1;
+
+ printf("selected file: %s\n", fname);
+
+ CdromId[0] = '\0';
+ CdromLabel[0] = '\0';
+
+ set_cd_image(fname);
+ if (ReloadCdromPlugin() < 0) {
+ me_update_msg("failed to load cdr plugin");
+ return -1;
+ }
+ if (CDR_open() < 0) {
+ me_update_msg("failed to open cdr plugin");
+ return -1;
+ }
+
+ SetCdOpenCaseTime(time(NULL) + 2);
+ LidInterrupt();
+
+ strcpy(last_selected_fname, rom_fname_reload);
+ return 0;
+}
+
static int main_menu_handler(int id, int keys)
{
switch (id)
if (romsel_run() == 0)
return 1;
break;
+ case MA_MAIN_SWAP_CD:
+ if (swap_cd_image() == 0)
+ return 1;
+ break;
case MA_MAIN_RUN_BIOS:
if (run_bios() == 0)
return 1;
break;
+ case MA_MAIN_RUN_EXE:
+ if (run_exe() == 0)
+ return 1;
+ break;
case MA_MAIN_CREDITS:
- draw_menu_credits(draw_frame_credits);
+ draw_menu_message(credits_text, draw_frame_credits);
in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
break;
case MA_MAIN_EXIT:
return 0;
}
+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 ("Memcard manager", menu_loop_memcards),
+ mee_end,
+};
+
+static int main_menu2_handler(int id, int keys)
+{
+ static int sel = 0;
+
+ me_enable(e_menu_main2, MA_MAIN_SWAP_CD, ready_to_go);
+ me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);
+
+ return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main);
+}
+
+static const char h_extra[] = "Change CD, manage memcards..\n";
+
static menu_entry e_menu_main[] =
{
mee_label (""),
mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler),
mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler),
mee_handler_id("Load CD image", MA_MAIN_LOAD_ROM, main_menu_handler),
- mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler),
mee_handler ("Options", menu_loop_options),
mee_handler ("Controls", menu_loop_keyconfig),
+ mee_handler_h ("Extra stuff", main_menu2_handler, h_extra),
mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler),
mee_handler_id("Exit", MA_MAIN_EXIT, main_menu_handler),
mee_end,
menu_leave_emu();
+ if (bioses[1] == NULL && !warned_about_bios) {
+ menu_bios_warn();
+ warned_about_bios = 1;
+ }
+
me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go);
me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go && CdromId[0]);
me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go && CdromId[0]);
me_enable(e_menu_main, MA_MAIN_RESET_GAME, ready_to_go);
- me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0);
in_set_config_int(0, IN_CFG_BLOCKING, 1);
do {
- me_loop(e_menu_main, &sel, draw_frame_main);
+ me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);
} while (!ready_to_go);
/* wait until menu, ok, back is released */
menu_prepare_emu();
}
+static int qsort_strcmp(const void *p1, const void *p2)
+{
+ char * const *s1 = (char * const *)p1;
+ char * const *s2 = (char * const *)p2;
+ return strcasecmp(*s1, *s2);
+}
+
static void scan_bios_plugins(void)
{
char fname[MAXPATHLEN];
struct dirent *ent;
- int bios_i, gpu_i, spu_i;
+ int bios_i, gpu_i, spu_i, mc_i;
char *p;
DIR *dir;
bioses[0] = "HLE";
gpu_plugins[0] = "builtin_gpu";
spu_plugins[0] = "builtin_spu";
- bios_i = gpu_i = spu_i = 1;
+ memcards[0] = "(none)";
+ bios_i = gpu_i = spu_i = mc_i = 1;
snprintf(fname, sizeof(fname), "%s/", Config.BiosDir);
dir = opendir(fname);
snprintf(fname, sizeof(fname), "%s/", Config.PluginsDir);
dir = opendir(fname);
if (dir == NULL) {
- perror("scan_bios_plugins opendir");
- return;
+ perror("scan_bios_plugins plugins opendir");
+ goto do_memcards;
}
while (1) {
}
closedir(dir);
+
+do_memcards:
+ dir = opendir("." MEMCARD_DIR);
+ if (dir == NULL) {
+ perror("scan_bios_plugins memcards opendir");
+ return;
+ }
+
+ while (1) {
+ struct stat st;
+
+ errno = 0;
+ ent = readdir(dir);
+ if (ent == NULL) {
+ if (errno != 0)
+ perror("readdir");
+ break;
+ }
+
+ if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+ continue;
+
+ snprintf(fname, sizeof(fname), "." MEMCARD_DIR "%s", ent->d_name);
+ if (stat(fname, &st) != 0) {
+ printf("bad memcard file: %s\n", ent->d_name);
+ continue;
+ }
+
+ if (mc_i < ARRAY_SIZE(memcards) - 1) {
+ memcards[mc_i++] = strdup(ent->d_name);
+ continue;
+ }
+
+ printf("too many memcards, dropping \"%s\"\n", ent->d_name);
+ }
+
+ if (mc_i > 2)
+ qsort(memcards + 1, mc_i - 1, sizeof(memcards[0]), qsort_strcmp);
+
+ closedir(dir);
}
void menu_init(void)
case SCALE_CUSTOM:
break;
}
- apply_filter(filter);
- apply_cpu_clock();
- stop = 0;
psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
if (psxCpu != prev_cpu)
CDR_stop();
menu_sync_config();
+ apply_lcdrate(Config.PsxType);
+ apply_filter(filter);
+ apply_cpu_clock();
+
+ // push config to GPU plugin
+ plugin_call_rearmed_cbs();
if (GPU_open != NULL) {
int ret = GPU_open(&gpuDisp, "PCSX", NULL);
if (ret)
fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
}
+
+ dfinput_activate(in_type == PSE_PAD_TYPE_ANALOGPAD);
}
void me_update_msg(const char *msg)
notaz.gp2x.de / pcsx_rearmed.git / blobdiff