X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=a8d2e48714ea3414fe5d1dff2565d5c74c168d7d;hp=1bfac1d40a0ea0e8568bd7438d7fb9557ca7730e;hb=3ce7adebe576fbdf8c6ccab6404f573f7be541a2;hpb=381ea10346ab85b2f2d46f33d28461211e239c0a diff --git a/frontend/menu.c b/frontend/menu.c index 1bfac1d4..a8d2e487 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -13,6 +13,9 @@ #include #include #include +#include +#include +#include #include "main.h" #include "menu.h" @@ -20,20 +23,22 @@ #include "plugin.h" #include "plugin_lib.h" #include "omap.h" -#include "pandora.h" +#include "plat.h" #include "pcnt.h" -#include "arm_utils.h" +#include "cspace.h" #include "common/plat.h" #include "common/input.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/pad.h" +#include "../plugins/dfinput/main.h" #include "revision.h" -#define MENU_X2 1 +#define REARMED_BIRTHDAY_TIME 1293306830 /* 25 Dec 2010 */ + #define array_size(x) (sizeof(x) / sizeof(x[0])) typedef enum @@ -45,6 +50,7 @@ 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, @@ -52,30 +58,46 @@ typedef enum 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, MA_OPT_CPU_CLOCKS, MA_OPT_FILTERING, + MA_OPT_DISP_OPTS, } menu_id; enum { SCALE_1_1, SCALE_4_3, + SCALE_4_3v2, SCALE_FULLSCREEN, SCALE_CUSTOM, }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, cpu_clock, cpu_clock_st; +static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; -static int warned_about_bios, region, in_type_sel; +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; +int analog_deadzone; // for Caanoo + +#ifdef __ARM_ARCH_7A__ +#define DEFAULT_PSX_CLOCK 57 +#define DEFAULT_PSX_CLOCK_S "57" +#else +#define DEFAULT_PSX_CLOCK 50 +#define DEFAULT_PSX_CLOCK_S "50" +#endif // sound plugin extern int iUseReverb; @@ -83,6 +105,7 @@ extern int iUseInterpolation; extern int iXAPitch; extern int iSPUIRQWait; extern int iUseTimer; +extern int iVolume; static const char *bioses[24]; static const char *gpu_plugins[16]; @@ -106,10 +129,30 @@ void emu_make_path(char *buff, const char *end, int size) 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) @@ -142,40 +185,42 @@ static void menu_sync_config(void) Config.PsxAuto = 0; Config.PsxType = region - 1; } - in_type = in_type_sel ? PSE_PAD_TYPE_ANALOGPAD : PSE_PAD_TYPE_STANDARD; + cycle_multiplier = 10000 / psx_clock; + + switch (in_type_sel1) { + case 1: in_type1 = PSE_PAD_TYPE_ANALOGPAD; break; + case 2: in_type1 = PSE_PAD_TYPE_GUNCON; break; + default: in_type1 = PSE_PAD_TYPE_STANDARD; + } + switch (in_type_sel2) { + case 1: in_type2 = PSE_PAD_TYPE_ANALOGPAD; break; + case 2: in_type2 = PSE_PAD_TYPE_GUNCON; break; + default: in_type2 = PSE_PAD_TYPE_STANDARD; + } if (in_evdev_allow_abs_only != allow_abs_only_old) { - pandora_rescan_inputs(); + in_probe(); allow_abs_only_old = in_evdev_allow_abs_only; } - pl_frame_interval = Config.PsxType ? 20000 : 16667; - // used by P.E.Op.S. frameskip code - 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)); + iVolume = 768 + 128 * volume_boost; + pl_rearmed_cbs.frameskip = frameskip - 1; + pl_timing_prepare(Config.PsxType); } static void menu_set_defconfig(void) { + emu_set_default_config(); + g_opts = 0; scaling = SCALE_4_3; + volume_boost = 0; + frameskip = 0; + analog_deadzone = 50; + psx_clock = DEFAULT_PSX_CLOCK; region = 0; - in_type_sel = 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.frameskip = 0; - pl_rearmed_cbs.gpu_peops.iUseDither = 0; - pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; - - iUseReverb = 2; - iUseInterpolation = 1; - iXAPitch = 0; - iSPUIRQWait = 1; - iUseTimer = 2; menu_sync_config(); } @@ -196,16 +241,22 @@ static void menu_set_defconfig(void) { #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 } +#define CE_INTVAL_PV(val, ver) \ + { #val #ver, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val } + static const struct { const char *name; size_t len; 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), @@ -220,7 +271,7 @@ static const struct { CE_CONFIG_VAL(Cpu), CE_CONFIG_VAL(CdrReschedule), CE_INTVAL(region), - CE_INTVAL(scaling), + CE_INTVAL_V(scaling, 2), CE_INTVAL(g_layer_x), CE_INTVAL(g_layer_y), CE_INTVAL(g_layer_w), @@ -229,17 +280,28 @@ static const struct { CE_INTVAL(state_slot), CE_INTVAL(cpu_clock), CE_INTVAL(g_opts), - CE_INTVAL(in_type_sel), - CE_INTVAL_P(frameskip), + CE_INTVAL(in_type_sel1), + CE_INTVAL(in_type_sel2), + CE_INTVAL(analog_deadzone), + CE_INTVAL_V(frameskip, 3), CE_INTVAL_P(gpu_peops.iUseDither), CE_INTVAL_P(gpu_peops.dwActFixes), - CE_INTVAL(iUseReverb), - CE_INTVAL(iXAPitch), - CE_INTVAL_V(iUseInterpolation, 2), - CE_INTVAL_V(iSPUIRQWait, 2), - CE_INTVAL(iUseTimer), + 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_P(gpu_neon.allow_interlace), + CE_INTVAL_V(iUseReverb, 3), + CE_INTVAL_V(iXAPitch, 3), + CE_INTVAL_V(iUseInterpolation, 3), + CE_INTVAL_V(iSPUIRQWait, 3), + CE_INTVAL_V(iUseTimer, 3), CE_INTVAL(warned_about_bios), 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) @@ -336,7 +398,7 @@ static int menu_load_config(int is_game) f = fopen(cfgfile, "r"); if (f == NULL) { printf("menu_load_config: failed to open: %s\n", cfgfile); - return -1; + goto fail; } fseek(f, 0, SEEK_END); @@ -404,6 +466,14 @@ static int menu_load_config(int is_game) } } + keys_load_all(cfg); + ret = 0; +fail_read: + free(cfg); +fail: + if (f != NULL) + fclose(f); + menu_sync_config(); // sync plugins @@ -419,20 +489,16 @@ static int menu_load_config(int is_game) if (strcmp(Config.Spu, spu_plugins[i]) == 0) { spu_plugsel = i; break; } - keys_load_all(cfg); - ret = 0; -fail_read: - free(cfg); -fail: - fclose(f); return ret; } // 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; @@ -454,6 +520,12 @@ static const char *filter_exts[] = { }; #define MENU_ALIGN_LEFT +#ifdef __ARM_ARCH_7A__ // assume hires device +#define MENU_X2 1 +#else +#define MENU_X2 0 +#endif + #define menu_init menu_init_common #include "common/menu.c" #undef menu_init @@ -517,44 +589,26 @@ static void draw_savestate_bg(int slot) h = min(g_menuscreen_h, h); d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - for (; h > 0; h--, d += g_menuscreen_w, s += 1024) + for (; h > 0; h--, d += g_menuscreen_w, s += 1024) { if (gpu->ulStatus & 0x200000) bgr888_to_rgb565(d, s, w * 3); else bgr555_to_rgb565(d, s, w * 2); +#ifndef __ARM_ARCH_7A__ + // better darken this on small screens + menu_darken_bg(d, d, w * 2, 0); +#endif + } out: free(gpu); } -// ---------- pandora specific ----------- +// ---------- XXX: pandora specific ----------- static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; static char **pnd_filter_list; -static int get_cpu_clock(void) -{ - FILE *f; - int ret = 0; - f = fopen("/proc/pandora/cpu_mhz_max", "r"); - if (f) { - fscanf(f, "%d", &ret); - fclose(f); - } - return ret; -} - -static void apply_cpu_clock(void) -{ - char buf[128]; - - if (cpu_clock != 0 && cpu_clock != get_cpu_clock()) { - snprintf(buf, sizeof(buf), "unset DISPLAY; echo y | %s/op_cpuspeed.sh %d", - pnd_script_base, cpu_clock); - system(buf); - } -} - static void apply_filter(int which) { static int old = -1; @@ -600,7 +654,7 @@ static void pnd_menu_init(void) char buff[64]; DIR *dir; - cpu_clock_st = cpu_clock = get_cpu_clock(); + cpu_clock_st = cpu_clock = plat_cpu_clock_get(); dir = opendir("/etc/pandora/conf/dss_fir"); if (dir == NULL) { @@ -667,8 +721,7 @@ static void pnd_menu_init(void) void menu_finish(void) { - cpu_clock = cpu_clock_st; - apply_cpu_clock(); + plat_cpu_clock_apply(cpu_clock_st); } // -------------- key config -------------- @@ -703,6 +756,17 @@ me_bind_action emuctrl_actions[] = { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP }, { "Take Screenshot ", 1 << SACTION_SCREENSHOT }, { "Enter Menu ", 1 << SACTION_ENTER_MENU }, +#ifdef __ARM_ARCH_7A__ /* XXX */ + { "Minimize ", 1 << SACTION_MINIMIZE }, +#endif + { "Gun Trigger ", 1 << SACTION_GUN_TRIGGER }, + { "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 } }; @@ -780,7 +844,7 @@ static void keys_write_all(FILE *f) } 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); @@ -789,6 +853,12 @@ static void keys_write_all(FILE *f) } } } + + for (k = 0; k < array_size(in_adev); k++) + { + if (in_adev[k] == d) + fprintf(f, "bind_analog = %d\n", k); + } } } @@ -831,7 +901,7 @@ static void keys_load_all(const char *cfg) 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) { @@ -849,6 +919,21 @@ static void keys_load_all(const char *cfg) 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); @@ -896,6 +981,57 @@ static int key_config_loop_wrap(int id, int keys) 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; @@ -932,28 +1068,39 @@ static int mh_savecfg(int id, int keys) static int mh_input_rescan(int id, int keys) { //menu_sync_config(); - pandora_rescan_inputs(); + in_probe(); me_update_msg("rescan complete."); return 0; } -static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", NULL }; +static const char *men_in_type_sel[] = { + "Standard (SCPH-1080)", + "Analog (SCPH-1150)", + "GunCon", + 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_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("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap), + 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 ("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_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), @@ -975,7 +1122,7 @@ static int menu_loop_keyconfig(int id, int keys) // ------------ gfx options menu ------------ -static const char *men_scaler[] = { "1x1", "scaled 4:3", "fullscreen", "custom", NULL }; +static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL }; static const char h_cscaler[] = "Displays the scaler layer, you can resize it\n" "using d-pad or move it using R+d-pad"; static const char *men_dummy[] = { NULL }; @@ -1050,45 +1197,83 @@ static int menu_loop_gfx_options(int id, int keys) // ------------ bios/plugins ------------ +#ifdef __ARM_NEON__ + +static const char h_gpu_neon[] = "Configure built-in NEON GPU plugin"; +static const char *men_gpu_interlace[] = { "Off", "On", "Auto", NULL }; + +static menu_entry e_menu_plugin_gpu_neon[] = +{ + mee_enum ("Enable interlace mode", 0, pl_rearmed_cbs.gpu_neon.allow_interlace, men_gpu_interlace), + mee_end, +}; + +static int menu_loop_plugin_gpu_neon(int id, int keys) +{ + int sel = 0; + me_loop(e_menu_plugin_gpu_neon, &sel); + return 0; +} + +#endif + +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), + mee_end, +}; + +static int menu_loop_plugin_gpu_unai(int id, int keys) +{ + int sel = 0; + me_loop(e_menu_plugin_gpu_unai, &sel); + return 0; +} + static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL }; -static const char h_gpu_0[] = "Needed for Chrono Cross"; +//static const char h_gpu_0[] = "Needed for Chrono Cross"; static const char h_gpu_1[] = "Capcom fighting games"; static const char h_gpu_2[] = "Black screens in Lunar"; static const char h_gpu_3[] = "Compatibility mode"; static const char h_gpu_6[] = "Pandemonium 2"; -static const char h_gpu_7[] = "Skip every second frame"; +//static const char h_gpu_7[] = "Skip every second frame"; static const char h_gpu_8[] = "Needed by Dark Forces"; static const char h_gpu_9[] = "better g-colors, worse textures"; static const char h_gpu_10[] = "Toggle busy flags after drawing"; -static menu_entry e_menu_plugin_gpu[] = +static menu_entry e_menu_plugin_gpu_peops[] = { 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 ("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 ("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 menu_loop_plugin_gpu_peops(int id, int keys) { static int sel = 0; - me_loop(e_menu_plugin_gpu, &sel); + me_loop(e_menu_plugin_gpu_peops, &sel); return 0; } static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL }; +static const char h_spu_volboost[] = "Large values cause distortion"; 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[] = { + mee_range_h ("Volume boost", 0, volume_boost, -5, 30, h_spu_volboost), mee_onoff ("Reverb", 0, iUseReverb, 2), mee_enum ("Interpolation", 0, iUseInterpolation, men_spu_interp), mee_onoff ("Adjust XA pitch", 0, iXAPitch, 1), @@ -1104,12 +1289,13 @@ static int menu_loop_plugin_spu(int id, int keys) return 0; } -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_bios[] = "HLE is simulated BIOS. BIOS selection is saved in\n" + "savestates and can't be changed there. Must save\n" + "config and reload 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 P.E.Op.S. SoftGL Driver V1.17"; +static const char h_gpu_peops[] = "Configure P.E.Op.S. SoftGL Driver V1.17"; +static const char h_gpu_unai[] = "Configure Unai/PCSX4ALL Team GPU plugin"; static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7"; static menu_entry e_menu_plugin_options[] = @@ -1117,7 +1303,11 @@ 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 gpu_peops plugin", menu_loop_plugin_gpu, h_gpu), +#ifdef __ARM_NEON__ + mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu_neon, h_gpu_neon), +#endif + mee_handler_h ("Configure gpu_peops plugin", menu_loop_plugin_gpu_peops, h_gpu_peops), + mee_handler_h ("Configure PCSX4ALL GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai), mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu), mee_end, }; @@ -1140,6 +1330,27 @@ static int menu_loop_plugin_options(int id, int keys) // ------------ 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" @@ -1154,10 +1365,11 @@ 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_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[] = { @@ -1168,10 +1380,11 @@ static menu_entry e_menu_adv_options[] = mee_onoff_h ("Disable CD Audio", 0, Config.Cdda, 1, h_cfg_cdda), mee_onoff_h ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio), 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", 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_handler_h ("[Speed hacks]", menu_loop_speed_hacks, h_cfg_shacks), mee_end, }; @@ -1192,6 +1405,7 @@ static int mh_restore_defaults(int id, int keys) } static const char *men_region[] = { "Auto", "NTSC", "PAL", 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" @@ -1205,11 +1419,11 @@ 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_h ("Frameskip", 0, pl_rearmed_cbs.frameskip, 1, h_frameskip), + mee_enum_h ("Frameskip", 0, frameskip, men_frameskip, 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), - mee_handler ("[Display]", menu_loop_gfx_options), + mee_handler_id("[Display]", MA_OPT_DISP_OPTS, menu_loop_gfx_options), mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options), mee_handler ("[Advanced]", menu_loop_adv_options), mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), @@ -1395,14 +1609,22 @@ static void menu_bios_warn(void) { int inp; static const char msg[] = - "You don't seem to have copied any BIOS files to\n" + "You don't seem to have copied any BIOS\n" + "files to\n" +#ifdef __ARM_ARCH_7A__ // XXX "/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" +#else + "pcsx_rearmed/bios/\n\n" +#endif + "While many games work fine with fake\n" + "(HLE) BIOS, others (like MGS and FF8)\n" + "require BIOS to work.\n" + "After copying the file, you'll also need\n" + "to select it in the emu's menu:\n" + "options->[BIOS/Plugins]\n\n" + "The file is usually named SCPH1001.BIN,\n" + "but other not compressed files can be\n" + "used too.\n\n" "Press (B) or (X) to continue"; while (1) @@ -1421,18 +1643,30 @@ void OnFile_Exit(); static void draw_frame_main(void) { + struct tm *tmp; + time_t ltime; + char ltime_s[16]; + char buff[64]; + if (CdromId[0] != 0) { - char buff[64]; 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); } + + if (ready_to_go) { + ltime = time(NULL); + tmp = localtime(<ime); + strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp); + snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, plat_get_bat_capacity()); + smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f); + } } static void draw_frame_credits(void) { - smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc); + smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__ " " REV, 0xe7fc); } static const char credits_text[] = @@ -1440,13 +1674,16 @@ static const char credits_text[] = "(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-2012 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"; + " frontend (C) 2010-2012 notaz\n"; static int reset_game(void) { @@ -1465,7 +1702,7 @@ static int reset_game(void) static int reload_plugins(const char *cdimg) { - pl_fbdev_buf = NULL; + pl_vout_buf = NULL; ClosePlugins(); @@ -1479,6 +1716,7 @@ static int reload_plugins(const char *cdimg) } plugin_call_rearmed_cbs(); + cdrIsoMultidiskCount = 1; CdromId[0] = '\0'; CdromLabel[0] = '\0'; @@ -1527,6 +1765,9 @@ static int run_cd_image(const char *fname) ready_to_go = 0; reload_plugins(fname); + // always autodetect, menu_sync_config will override as needed + Config.PsxAuto = 1; + if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD ClosePlugins(); @@ -1544,6 +1785,8 @@ static int run_cd_image(const char *fname) } ready_to_go = 1; + snprintf(hud_msg, sizeof(hud_msg), "Booting up..."); + hud_new_msg = 2; return 0; } @@ -1576,6 +1819,9 @@ static int romsel_run(void) return -1; } + if (Config.HLE) + printf("note: running without BIOS, expect compatibility problems\n"); + strcpy(last_selected_fname, rom_fname_reload); return 0; } @@ -1610,6 +1856,24 @@ static int swap_cd_image(void) 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) @@ -1638,6 +1902,10 @@ static int main_menu_handler(int id, int keys) 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; @@ -1663,9 +1931,10 @@ static int main_menu_handler(int id, int keys) 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, }; @@ -1675,6 +1944,7 @@ 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_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); @@ -1906,18 +2176,69 @@ void menu_init(void) exit(1); emu_make_path(buff, "skin/background.png", sizeof(buff)); readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h); + +#ifndef __ARM_ARCH_7A__ /* XXX */ + 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 } void menu_notify_mode_change(int w, int h, int bpp) { + float mult; + int imult; + last_psx_w = w; last_psx_h = h; last_psx_bpp = bpp; - if (scaling == SCALE_1_1) { - g_layer_x = 800/2 - w/2; g_layer_y = 480/2 - h/2; + switch (scaling) { + case SCALE_1_1: g_layer_w = w; g_layer_h = h; + break; + + case SCALE_4_3v2: + if (h > g_menuscreen_h || (240 < h && h <= 360)) + goto fractional_4_3; + + // 4:3 that prefers integer scaling + imult = g_menuscreen_h / h; + g_layer_w = w * imult; + g_layer_h = h * imult; + mult = (float)g_layer_w / (float)g_layer_h; + if (mult < 1.25f || mult > 1.666f) + g_layer_w = 4.0f/3.0f * (float)g_layer_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + fractional_4_3: + case SCALE_4_3: + mult = 240.0f / (float)h * 4.0f / 3.0f; + if (h > 256) + mult *= 2.0f; + g_layer_w = mult * (float)g_menuscreen_h; + g_layer_h = g_menuscreen_h; + printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult); + break; + + case SCALE_FULLSCREEN: + g_layer_w = g_menuscreen_w; + g_layer_h = g_menuscreen_h; + break; + + default: + break; } + + g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2; + g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2; + if (g_layer_x < 0) g_layer_x = 0; + if (g_layer_y < 0) g_layer_y = 0; + if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w; + if (g_layer_h > g_menuscreen_h) g_layer_w = g_menuscreen_h; } static void menu_leave_emu(void) @@ -1928,23 +2249,23 @@ static void menu_leave_emu(void) fprintf(stderr, "Warning: GPU_close returned %d\n", ret); } + plat_video_menu_enter(ready_to_go); + memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); - if (pl_fbdev_buf != NULL && ready_to_go && last_psx_bpp == 16) { + if (pl_vout_buf != NULL && ready_to_go && last_psx_bpp == 16) { int x = max(0, g_menuscreen_w - last_psx_w); int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2); int w = min(g_menuscreen_w, last_psx_w); int h = min(g_menuscreen_h, last_psx_h); u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - u16 *s = pl_fbdev_buf; + u16 *s = pl_vout_buf; for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w) menu_darken_bg(d, s, w, 0); } if (ready_to_go) - cpu_clock = get_cpu_clock(); - - plat_video_menu_enter(ready_to_go); + cpu_clock = plat_cpu_clock_get(); } void menu_prepare_emu(void) @@ -1953,21 +2274,7 @@ void menu_prepare_emu(void) plat_video_menu_leave(); - switch (scaling) { - case SCALE_1_1: - menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); - break; - case SCALE_4_3: - g_layer_x = 80; g_layer_y = 0; - g_layer_w = 640; g_layer_h = 480; - break; - case SCALE_FULLSCREEN: - g_layer_x = 0; g_layer_y = 0; - g_layer_w = 800; g_layer_h = 480; - break; - case SCALE_CUSTOM: - break; - } + menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; if (psxCpu != prev_cpu) @@ -1982,7 +2289,7 @@ void menu_prepare_emu(void) menu_sync_config(); apply_lcdrate(Config.PsxType); apply_filter(filter); - apply_cpu_clock(); + plat_cpu_clock_apply(cpu_clock); // push config to GPU plugin plugin_call_rearmed_cbs(); @@ -1993,7 +2300,7 @@ void menu_prepare_emu(void) fprintf(stderr, "Warning: GPU_open returned %d\n", ret); } - dfinput_activate(in_type == PSE_PAD_TYPE_ANALOGPAD); + dfinput_activate(); } void me_update_msg(const char *msg)