aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2012-12-27 04:34:56 +0200
committernotaz2013-01-03 01:06:42 +0200
commit535ea62fdb1f9fd5bb22af1d3683adf03d6f1fc3 (patch)
tree2952e650445eeb3f8124d9144f3c3c1f742b343e
parenta34a244536185a4b7caa53f3ea7267feb969db85 (diff)
downloadpcsx_rearmed-535ea62fdb1f9fd5bb22af1d3683adf03d6f1fc3.tar.gz
pcsx_rearmed-535ea62fdb1f9fd5bb22af1d3683adf03d6f1fc3.tar.bz2
pcsx_rearmed-535ea62fdb1f9fd5bb22af1d3683adf03d6f1fc3.zip
frontend: remove unneeded hack options
-rw-r--r--frontend/main.c1
-rw-r--r--frontend/menu.c8
-rw-r--r--libpcsxcore/psxcommon.h1
3 files changed, 2 insertions, 8 deletions
diff --git a/frontend/main.c b/frontend/main.c
index d46e536..c8841b9 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -146,7 +146,6 @@ void emu_set_default_config(void)
// try to set sane config on which most games work
Config.Xa = Config.Cdda = Config.Sio =
Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
- Config.CdrReschedule = 0;
Config.PsxAuto = 1;
pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
diff --git a/frontend/menu.c b/frontend/menu.c
index 9cfa171..7bec49a 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -278,7 +278,7 @@ static const struct {
CE_CONFIG_STR(Spu),
// CE_CONFIG_STR(Cdr),
CE_CONFIG_VAL(Xa),
- CE_CONFIG_VAL(Sio),
+// CE_CONFIG_VAL(Sio),
CE_CONFIG_VAL(Mdec),
CE_CONFIG_VAL(Cdda),
CE_CONFIG_VAL(Debug),
@@ -287,7 +287,6 @@ static const struct {
CE_CONFIG_VAL(RCntFix),
CE_CONFIG_VAL(VSyncWA),
CE_CONFIG_VAL(Cpu),
- CE_CONFIG_VAL(CdrReschedule),
CE_INTVAL(region),
CE_INTVAL_V(g_scaler, 2),
CE_INTVAL(g_layer_x),
@@ -1369,7 +1368,6 @@ static int menu_loop_speed_hacks(int id, int keys)
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"
"(green: normal, red: fmod, blue: noise)";
@@ -1383,7 +1381,6 @@ 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 (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"
@@ -1396,11 +1393,10 @@ static menu_entry e_menu_adv_options[] =
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 ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio),
+ //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 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,
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 59212f3..9f5444e 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -125,7 +125,6 @@ typedef struct {
boolean RCntFix;
boolean UseNet;
boolean VSyncWA;
- boolean CdrReschedule;
u8 Cpu; // CPU_DYNAREC or CPU_INTERPRETER
u8 PsxType; // PSX_TYPE_NTSC or PSX_TYPE_PAL
#ifdef _WIN32