From ff9401303b387cb11b97cf5984a9ab7672f487fc Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 3 Dec 2025 09:39:22 +0100 Subject: [PATCH] hidapi: switch to official libusb remote --- .gitmodules | 2 +- 3rdparty/hidapi/hidapi | 2 +- rpcs3/Input/ds3_pad_handler.cpp | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6f0cd78a5b..77fae5cf55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,7 @@ ignore = dirty [submodule "3rdparty/hidapi"] path = 3rdparty/hidapi/hidapi - url = ../../RPCS3/hidapi.git + url = ../../libusb/hidapi.git branch = master ignore = dirty [submodule "3rdparty/pugixml"] diff --git a/3rdparty/hidapi/hidapi b/3rdparty/hidapi/hidapi index f42423643e..d6b2a97460 160000 --- a/3rdparty/hidapi/hidapi +++ b/3rdparty/hidapi/hidapi @@ -1 +1 @@ -Subproject commit f42423643ec9011c98cccc0bb790722bbbd3f30b +Subproject commit d6b2a974608dec3b76fb1e36c189f22b9cf3650c diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp index 0495ef1c05..8d8318ce45 100644 --- a/rpcs3/Input/ds3_pad_handler.cpp +++ b/rpcs3/Input/ds3_pad_handler.cpp @@ -266,14 +266,6 @@ void ds3_pad_handler::check_add_device(hid_device* hidDevice, hid_enumerated_dev } device->report_id = buf[0]; -#elif defined (__APPLE__) - int res = hid_init_sixaxis_usb(hidDevice); - if (res < 0) - { - ds3_log.error("check_add_device: hid_init_sixaxis_usb failed! (result=%d, error=%s)", res, hid_error(hidDevice)); - HidDevice::close(hidDevice); - return; - } #endif for (wchar_t ch : wide_serial)