summaryrefslogtreecommitdiff
path: root/android-project
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2019-12-17 12:03:57 -0800
committerSam Lantinga <slouken@libsdl.org>2019-12-17 12:03:57 -0800
commit12bc16f0f41d2f40d71b9b56ed9f2e306286f453 (patch)
tree39369369026c040452cd9d2d85dee45090cc61c0 /android-project
parent572b72a8959e598e49c388209dfbb35a386ae0fd (diff)
downloadsdl-12bc16f0f41d2f40d71b9b56ed9f2e306286f453.tar.gz
Added Android support for the Hyperkin X91 and the SteelSeries Stratus Duo
Diffstat (limited to 'android-project')
-rw-r--r--android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
index 241775d46..4a54ef7b3 100644
--- a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -275,8 +275,9 @@ public class HIDDeviceManager {
0x06a3, // Saitek
0x0738, // Mad Catz
0x07ff, // Mad Catz
- 0x0e6f, // Unknown
+ 0x0e6f, // PDP
0x0f0d, // Hori
+ 0x1038, // SteelSeries
0x11c9, // Nacon
0x12ab, // Unknown
0x1430, // RedOctane
@@ -289,7 +290,8 @@ public class HIDDeviceManager {
0x24c6, // PowerA
};
- if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+ if (usbInterface.getId() == 0 &&
+ usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
usbInterface.getInterfaceSubclass() == XB360_IFACE_SUBCLASS &&
usbInterface.getInterfaceProtocol() == XB360_IFACE_PROTOCOL) {
int vendor_id = usbDevice.getVendorId();
@@ -308,13 +310,15 @@ public class HIDDeviceManager {
final int[] SUPPORTED_VENDORS = {
0x045e, // Microsoft
0x0738, // Mad Catz
- 0x0e6f, // Unknown
+ 0x0e6f, // PDP
0x0f0d, // Hori
0x1532, // Razer Wildcat
0x24c6, // PowerA
+ 0x2e24, // Hyperkin
};
- if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
+ if (usbInterface.getId() == 0 &&
+ usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
usbInterface.getInterfaceSubclass() == XB1_IFACE_SUBCLASS &&
usbInterface.getInterfaceProtocol() == XB1_IFACE_PROTOCOL) {
int vendor_id = usbDevice.getVendorId();