#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 "../plugins/dfinput/main.h"
#include "revision.h"
-#define MENU_X2 1
#define array_size(x) (sizeof(x) / sizeof(x[0]))
typedef enum
MA_CTRL_EMU,
MA_CTRL_DEV_FIRST,
MA_CTRL_DEV_NEXT,
+ MA_CTRL_NUBS_BTNS,
+ MA_CTRL_DEADZONE,
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, volume_boost;
+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_sel1, in_type_sel2;
+static int psx_clock;
static int memcard1_sel, memcard2_sel;
-int g_opts;
+int g_opts, analog_deadzone;
+
+#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;
Config.PsxAuto = 0;
Config.PsxType = region - 1;
}
+ 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_type2 = PSE_PAD_TYPE_STANDARD;
}
if (in_evdev_allow_abs_only != allow_abs_only_old) {
- pandora_rescan_inputs();
+ plat_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
- 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)
g_opts = 0;
scaling = SCALE_4_3;
volume_boost = 0;
+ frameskip = 0;
+ analog_deadzone = 70;
+ psx_clock = DEFAULT_PSX_CLOCK;
region = 0;
in_type_sel1 = in_type_sel2 = 0;
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;
+ 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();
}
#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;
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),
CE_INTVAL(g_opts),
CE_INTVAL(in_type_sel1),
CE_INTVAL(in_type_sel2),
- CE_INTVAL_P(frameskip),
+ CE_INTVAL(analog_deadzone),
+ CE_INTVAL_V(frameskip, 2),
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.abe_hack),
+ CE_INTVAL_P(gpu_unai.no_light),
+ CE_INTVAL_P(gpu_unai.no_blend),
+ 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),
};
static char *get_cd_label(void)
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);
}
}
+ keys_load_all(cfg);
+ ret = 0;
+fail_read:
+ free(cfg);
+fail:
+ if (f != NULL)
+ fclose(f);
+
menu_sync_config();
// sync plugins
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;
}
};
#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
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;
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) {
void menu_finish(void)
{
- cpu_clock = cpu_clock_st;
- apply_cpu_clock();
+ plat_cpu_clock_apply(cpu_clock_st);
}
// -------------- key config --------------
static int mh_input_rescan(int id, int keys)
{
//menu_sync_config();
- pandora_rescan_inputs();
+ plat_rescan_inputs();
me_update_msg("rescan complete.");
return 0;
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", 0, in_evdev_allow_abs_only, 1, h_nub_btns),
+ mee_onoff_h ("Nubs as buttons", MA_CTRL_NUBS_BTNS, in_evdev_allow_abs_only, 1, h_nub_btns),
+ 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),
// ------------ 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 };
// ------------ bios/plugins ------------
+static menu_entry e_menu_plugin_gpu_unai[] =
+{
+ 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_1[] = "Capcom fighting games";
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_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;
}
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[] =
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),
+ 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,
};
"(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_nodrc[] = "Disable dynamic recompiler and use interpreter\n"
"Might be useful to overcome some dynarec bugs";
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_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_end,
};
}
static const char *men_region[] = { "Auto", "NTSC", "PAL", NULL };
+static const char *men_frameskip[] = { "Auto", "Off", "1", 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"
{
// 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),
{
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
"<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"
+#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)
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)
static int reload_plugins(const char *cdimg)
{
- pl_fbdev_buf = NULL;
+ pl_vout_buf = NULL;
ClosePlugins();
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();
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_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)
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)
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)
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();