encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed combined Joy-Cons after aa2e2f4843 (thanks @happyharryh!)

This commit is contained in:
Sam Lantinga 2022-10-02 08:48:38 -07:00
parent bac54b3d26
commit 0672dc8d8f
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -358,14 +358,16 @@ HIDAPI_SetupDeviceDriver(SDL_HIDAPI_Device *device)
} }
/* Make sure we can open the device and leave it open for the driver */ /* Make sure we can open the device and leave it open for the driver */
device->dev = SDL_hid_open_path(device->path, 0); if (device->num_children == 0) {
if (!device->dev) { device->dev = SDL_hid_open_path(device->path, 0);
SDL_LogDebug(SDL_LOG_CATEGORY_INPUT, if (!device->dev) {
"HIDAPI_SetupDeviceDriver() couldn't open %s: %s\n", SDL_LogDebug(SDL_LOG_CATEGORY_INPUT,
device->path, SDL_GetError()); "HIDAPI_SetupDeviceDriver() couldn't open %s: %s\n",
return; device->path, SDL_GetError());
return;
}
SDL_hid_set_nonblocking(device->dev, 1);
} }
SDL_hid_set_nonblocking(device->dev, 1);
device->driver = HIDAPI_GetDeviceDriver(device); device->driver = HIDAPI_GetDeviceDriver(device);
@ -774,6 +776,7 @@ static void
HIDAPI_DelDevice(SDL_HIDAPI_Device *device) HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
{ {
SDL_HIDAPI_Device *curr, *last; SDL_HIDAPI_Device *curr, *last;
int i;
#ifdef DEBUG_HIDAPI #ifdef DEBUG_HIDAPI
SDL_Log("Removing HIDAPI device '%s' VID 0x%.4x, PID 0x%.4x, version %d, serial %s, interface %d, interface_class %d, interface_subclass %d, interface_protocol %d, usage page 0x%.4x, usage 0x%.4x, path = %s, driver = %s (%s)\n", device->name, device->vendor_id, device->product_id, device->version, device->serial ? device->serial : "NONE", device->interface_number, device->interface_class, device->interface_subclass, device->interface_protocol, device->usage_page, device->usage, device->path, device->driver ? device->driver->name : "NONE", device->driver && device->driver->enabled ? "ENABLED" : "DISABLED"); SDL_Log("Removing HIDAPI device '%s' VID 0x%.4x, PID 0x%.4x, version %d, serial %s, interface %d, interface_class %d, interface_subclass %d, interface_protocol %d, usage page 0x%.4x, usage 0x%.4x, path = %s, driver = %s (%s)\n", device->name, device->vendor_id, device->product_id, device->version, device->serial ? device->serial : "NONE", device->interface_number, device->interface_class, device->interface_subclass, device->interface_protocol, device->usage_page, device->usage, device->path, device->driver ? device->driver->name : "NONE", device->driver && device->driver->enabled ? "ENABLED" : "DISABLED");
@ -794,6 +797,10 @@ HIDAPI_DelDevice(SDL_HIDAPI_Device *device)
SDL_Delay(10); SDL_Delay(10);
} }
for (i = 0; i < device->num_children; ++i) {
device->children[i]->parent = NULL;
}
SDL_DestroyMutex(device->dev_lock); SDL_DestroyMutex(device->dev_lock);
SDL_free(device->serial); SDL_free(device->serial);
SDL_free(device->name); SDL_free(device->name);
@ -864,7 +871,9 @@ HIDAPI_CreateCombinedJoyCons()
if (combined && combined->driver) { if (combined && combined->driver) {
return SDL_TRUE; return SDL_TRUE;
} else { } else {
if (!combined) { if (combined) {
HIDAPI_DelDevice(combined);
} else {
SDL_free(children); SDL_free(children);
} }
return SDL_FALSE; return SDL_FALSE;