From 777732475d7a2c8298ba3b2c0be3cf4b6a139561 Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Fri, 5 Apr 2019 18:51:02 +0800
Subject: [PATCH] Remove DS3 BT pairing customization.

---
 input.cpp | 8 --------
 input.h   | 1 -
 menu.cpp  | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/input.cpp b/input.cpp
index 9cea8e2..be50d8e 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1504,20 +1504,12 @@ static void joy_analog(int num, int axis, int offset)
 	}
 }
 
-static int ps3_sel = 0;
-int is_ps3_sel()
-{
-	return ps3_sel;
-}
-
 static int ds_ver = 0;
 
 static void input_cb(struct input_event *ev, struct input_absinfo *absinfo, int dev)
 {
 	static int key_mapped = 0;
 
-	if (ev->type == EV_KEY && input[dev].vid == 0x054c && input[dev].pid == 0x0268 && ev->code == 0x13a) ps3_sel = ev->value;
-
 	if (ev->type == EV_KEY && mapping && mapping_type == 3 && ev->code == input[dev].mmap[17]) ev->code = KEY_ENTER;
 
 	int map_skip = (ev->type == EV_KEY && ev->code == KEY_SPACE && ((mapping_dev >= 0 && mapping_type==1) || mapping_button<0));
diff --git a/input.h b/input.h
index 44d8658..6b497b5 100644
--- a/input.h
+++ b/input.h
@@ -36,7 +36,6 @@ int  toggle_kbdled(int mask);
 void input_notify_mode();
 int input_poll(int getchar);
 int is_key_pressed(int key);
-int is_ps3_sel();
 
 void start_map_setting(int cnt);
 int get_map_button();
diff --git a/menu.cpp b/menu.cpp
index b9fda78..b414ac7 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -3502,7 +3502,7 @@ void HandleUI(void)
 		for (int i = 0; i < script_lines; i++) strcpy(script_output[i], "");
 		script_line=0;
 		script_exited = false;
-		script_pipe=popen((parentstate != MENU_BTPAIR) ? getFullPath(SelectedPath) : is_ps3_sel() ? "/usr/sbin/btpair sixaxis" : "/usr/sbin/btpair", "r");
+		script_pipe=popen((parentstate != MENU_BTPAIR) ? getFullPath(SelectedPath) : "/usr/sbin/btpair", "r");
 		script_file = fileno(script_pipe);
 		fcntl(script_file, F_SETFL, O_NONBLOCK);
 		break;