From b6b2fdfaa6eb0030fc952f1bd4d8294122197e20 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 25 May 2016 00:47:01 -0500 Subject: [PATCH] comment out xbox 360 & dualshock hacks that are not needed anymore, friendly labels can be applied on the autoconf files instead --- input/drivers/android_input.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 6b9125923f..fab791dfc7 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -840,16 +840,17 @@ static void handle_hotplug(android_input_data_t *android_data, else if (*port == 1) strlcpy(name_buf, "TTT THT Arcade (User 2)", sizeof(name_buf)); } - - else if (strstr(device_name, "360 Wireless")) - strlcpy(name_buf, "XBox 360 Wireless", sizeof(name_buf)); - - else if (strstr(device_name, "Microsoft")) +/* + else if (strstr(device_name, "Microsoft") ) { if (strstr(device_name, "Dual Strike")) strlcpy(device_name, "SideWinder Dual Strike", sizeof(device_name)); else if (strstr(device_name, "SideWinder")) strlcpy(name_buf, "SideWinder Classic", sizeof(name_buf)); + else if (strstr(device_name, "X-Box 360 pad")) + strlcpy(name_buf, "XBox 360 Controller", sizeof(name_buf)); + else if (strstr(device_name, "360 Wireless")) + strlcpy(name_buf, "XBox 360 Wireless Controller", sizeof(name_buf)); } else if ( @@ -857,8 +858,8 @@ static void handle_hotplug(android_input_data_t *android_data, strstr(device_name, "Dualshock3") || strstr(device_name, "Sixaxis") ) - strlcpy(name_buf, "PlayStation3", sizeof(name_buf)); - + strlcpy(name_buf, "PlayStation 3 Controller", sizeof(name_buf)); +*/ else if (strstr(device_name, "MOGA")) strlcpy(name_buf, "Moga IME", sizeof(name_buf));