Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/hidapi/SDL_hidapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ static const struct {
{ USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH2_JOYCON_LEFT },
{ USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH2_JOYCON_RIGHT },
{ USB_VENDOR_NINTENDO, USB_PRODUCT_NINTENDO_SWITCH2_PRO },
{ USB_VENDOR_NACON, USB_PRODUCT_NACON_COMPACT_PS4_WIRED },
};

static bool RequiresLibUSB(Uint16 vendor, Uint16 product)
Expand Down
6 changes: 6 additions & 0 deletions src/joystick/hidapi/SDL_hidapi_xbox360.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "../../SDL_hints_c.h"
#include "../../misc/SDL_libusb.h"
#include "../../hidapi/SDL_hidapi_c.h"
#include "../SDL_sysjoystick.h"
#include "SDL_hidapijoystick_c.h"
#include "SDL_hidapi_rumble.h"
Expand Down Expand Up @@ -215,6 +216,11 @@ static bool HIDAPI_DriverXbox360_IsSupportedDevice(SDL_HIDAPI_Device *device, co
if (SDL_IsJoystickSteamVirtualGamepad(vendor_id, product_id, version)) {
// GCController support doesn't work with the Steam Virtual Gamepad
return true;
} else if (SDL_HIDAPI_ShouldIgnoreDevice(SDL_HID_API_BUS_USB, vendor_id, product_id, 0, 0, false)) {
// Devices in the libusb-required whitelist use XInput protocol over
// vendor-specific USB interfaces (not HID). macOS GCController/MFI
// cannot see these devices, so we must handle them via HIDAPI/libusb.
return (type == SDL_GAMEPAD_TYPE_XBOX360);
} else {
// On macOS when it isn't controlled by the 360Controller driver and
// it doesn't look like a Steam virtual gamepad we should rely on
Expand Down
1 change: 1 addition & 0 deletions src/joystick/usb_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
#define USB_PRODUCT_LOGITECH_F310 0xc216
#define USB_PRODUCT_LOGITECH_CHILLSTREAM 0xcad1
#define USB_PRODUCT_MADCATZ_SAITEK_SIDE_PANEL_CONTROL_DECK 0x2218
#define USB_PRODUCT_NACON_COMPACT_PS4_WIRED 0x0603
#define USB_PRODUCT_NACON_REVOLUTION_5_PRO_PS4_WIRELESS 0x0d16
#define USB_PRODUCT_NACON_REVOLUTION_5_PRO_PS4_WIRED 0x0d17
#define USB_PRODUCT_NACON_REVOLUTION_5_PRO_PS5_WIRELESS 0x0d18
Expand Down
Loading