#include "omap.h"
#include "pandora.h"
#include "pcnt.h"
-#include "arm_utils.h"
+#include "cspace.h"
#include "common/plat.h"
#include "common/input.h"
#include "linux/in_evdev.h"
};
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;
}
iVolume = 768 + 128 * volume_boost;
+ pl_rearmed_cbs.frameskip = frameskip - 1;
pl_timing_prepare(Config.PsxType);
}
g_opts = 0;
scaling = SCALE_4_3;
volume_boost = 0;
+ frameskip = 0;
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 =
#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_INTVAL(g_opts),
CE_INTVAL(in_type_sel1),
CE_INTVAL(in_type_sel2),
- CE_INTVAL_P(frameskip),
+ CE_INTVAL_V(frameskip, 2),
CE_INTVAL_P(gpu_peops.iUseDither),
CE_INTVAL_P(gpu_peops.dwActFixes),
CE_INTVAL_P(gpu_unai.abe_hack),
CE_INTVAL_P(gpu_unai.no_light),
CE_INTVAL_P(gpu_unai.no_blend),
- CE_INTVAL(iUseReverb),
- CE_INTVAL(iXAPitch),
- CE_INTVAL_V(iUseInterpolation, 2),
- CE_INTVAL_V(iSPUIRQWait, 2),
- CE_INTVAL(iUseTimer),
+ 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),
old = pal;
}
+static int get_bat_capacity(void)
+{
+ FILE *f;
+ int ret = 0;
+ f = fopen("/sys/class/power_supply/bq27500-0/capacity", "r");
+ if (f) {
+ fscanf(f, "%d", &ret);
+ fclose(f);
+ }
+ return ret;
+}
+
static menu_entry e_menu_gfx_options[];
static void pnd_menu_init(void)
}
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),
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, get_bat_capacity());
+ smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f);
+ }
}
static void draw_frame_credits(void)
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();