Commit c84dea0943abb390783a92cca6b0bcb76e856195
2022-08-03T22:12:21
Fixed detecting the controller type of controllers over USB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
diff --git a/src/joystick/hidapi/SDL_hidapi_switch.c b/src/joystick/hidapi/SDL_hidapi_switch.c
index 185335b..71e9eba 100644
--- a/src/joystick/hidapi/SDL_hidapi_switch.c
+++ b/src/joystick/hidapi/SDL_hidapi_switch.c
@@ -653,6 +653,36 @@ static SDL_bool WriteProprietary(SDL_DriverSwitch_Context *ctx, ESwitchProprieta
return SDL_FALSE;
}
+static SDL_bool
+WriteProprietarySync(SDL_DriverSwitch_Context *ctx, ESwitchProprietaryCommandIDs ucCommand, Uint8 *pBuf, Uint8 ucLen, SDL_bool waitForReply)
+{
+ int nRetries = 10;
+
+ while (nRetries--) {
+ SwitchProprietaryOutputPacket_t packet;
+
+ if ((!pBuf && ucLen > 0) || ucLen > sizeof(packet.rgucProprietaryData)) {
+ return SDL_FALSE;
+ }
+
+ SDL_zero(packet);
+ packet.ucPacketType = k_eSwitchOutputReportIDs_Proprietary;
+ packet.ucProprietaryID = ucCommand;
+ if (pBuf) {
+ SDL_memcpy(packet.rgucProprietaryData, pBuf, ucLen);
+ }
+
+ if (!WritePacketSync(ctx, &packet, sizeof(packet))) {
+ continue;
+ }
+
+ if (!waitForReply || ReadProprietaryReply(ctx, ucCommand)) {
+ return SDL_TRUE;
+ }
+ }
+ return SDL_FALSE;
+}
+
static Uint8 EncodeRumbleHighAmplitude(Uint16 amplitude) {
/* More information about these values can be found here:
* https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/rumble_data_table.md
@@ -766,6 +796,13 @@ static SDL_bool BReadDeviceInfo(SDL_DriverSwitch_Context *ctx)
size_t i;
ctx->m_eControllerType = (ESwitchDeviceInfoControllerType)status->ucDeviceType;
+
+ /* The N64 controller reports as a Pro controller over USB */
+ if (ctx->m_eControllerType == k_eSwitchDeviceInfoControllerType_ProController &&
+ ctx->device->product_id == USB_PRODUCT_NINTENDO_N64_CONTROLLER) {
+ ctx->m_eControllerType = k_eSwitchDeviceInfoControllerType_N64;
+ }
+
for (i = 0; i < sizeof (ctx->m_rgucMACAddress); ++i)
ctx->m_rgucMACAddress[i] = status->rgucMACAddress[ sizeof(ctx->m_rgucMACAddress) - i - 1 ];
@@ -1075,16 +1112,29 @@ ReadJoyConControllerType(SDL_HIDAPI_Device *device)
/* Create enough of a context to read the controller type from the device */
SDL_DriverSwitch_Context *ctx = (SDL_DriverSwitch_Context *)SDL_calloc(1, sizeof(*ctx));
if (ctx) {
- SwitchSubcommandInputPacket_t *reply = NULL;
-
ctx->device = device;
- ctx->m_bUsingBluetooth = SDL_TRUE;
device->dev = SDL_hid_open_path(device->path, 0);
if (device->dev) {
- if (WriteSubcommandSync(ctx, k_eSwitchSubcommandIDs_RequestDeviceInfo, NULL, 0, &reply)) {
- // Byte 2: Controller ID (1=LJC, 2=RJC, 3=Pro)
- eControllerType = (ESwitchDeviceInfoControllerType) reply->deviceInfo.ucDeviceType;
+ SwitchSubcommandInputPacket_t *reply = NULL;
+
+ if (WriteProprietarySync(ctx, k_eSwitchProprietaryCommandIDs_Status, NULL, 0, SDL_TRUE)) {
+ SwitchProprietaryStatusPacket_t *status = (SwitchProprietaryStatusPacket_t *)&ctx->m_rgucReadBuffer[0];
+
+ eControllerType = (ESwitchDeviceInfoControllerType) status->ucDeviceType;
+
+ /* The N64 controller reports as a Pro controller over USB */
+ if (eControllerType == k_eSwitchDeviceInfoControllerType_ProController &&
+ device->product_id == USB_PRODUCT_NINTENDO_N64_CONTROLLER) {
+ eControllerType = k_eSwitchDeviceInfoControllerType_N64;
+ }
+ } else {
+ SwitchSubcommandInputPacket_t *reply = NULL;
+
+ ctx->m_bUsingBluetooth = SDL_TRUE;
+ if (WriteSubcommandSync(ctx, k_eSwitchSubcommandIDs_RequestDeviceInfo, NULL, 0, &reply)) {
+ eControllerType = (ESwitchDeviceInfoControllerType)reply->deviceInfo.ucDeviceType;
+ }
}
SDL_hid_close(device->dev);
device->dev = NULL;