X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=frontend%2Fmenu.c;h=f5d0415ebdac0a487dff8da17dc9ec9870017cf0;hb=b944a30eda75c36c94ef71e7768497801887612b;hp=af9b9f1d18f65e4f1f095bf778da6b4b59866635;hpb=47232ea4c27983ff2cffd3f697d66c6c0058c88c;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index af9b9f1d..f5d0415e 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -58,6 +58,7 @@ typedef enum
 	MA_CTRL_DEV_NEXT,
 	MA_CTRL_NUBS_BTNS,
 	MA_CTRL_DEADZONE,
+	MA_CTRL_VIBRATION,
 	MA_CTRL_DONE,
 	MA_OPT_SAVECFG,
 	MA_OPT_SAVECFG_GAME,
@@ -171,7 +172,7 @@ static void menu_sync_config(void)
 	default: in_type2 = PSE_PAD_TYPE_STANDARD;
 	}
 	if (in_evdev_allow_abs_only != allow_abs_only_old) {
-		plat_rescan_inputs();
+		in_probe();
 		allow_abs_only_old = in_evdev_allow_abs_only;
 	}
 
@@ -269,6 +270,7 @@ static const struct {
 	CE_INTVAL(volume_boost),
 	CE_INTVAL(psx_clock),
 	CE_INTVAL(new_dynarec_hacks),
+	CE_INTVAL(in_enable_vibration),
 };
 
 static char *get_cd_label(void)
@@ -960,7 +962,7 @@ static int mh_savecfg(int id, int keys)
 static int mh_input_rescan(int id, int keys)
 {
 	//menu_sync_config();
-	plat_rescan_inputs();
+	in_probe();
 	me_update_msg("rescan complete.");
 
 	return 0;
@@ -973,7 +975,8 @@ static const char *men_in_type_sel[] = {
 	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_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[] =
 {
@@ -984,6 +987,7 @@ static menu_entry e_menu_keyconfig[] =
 	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),
@@ -2044,6 +2048,7 @@ void menu_init(void)
 	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
 }