i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_disk: Probe by USB configuration instead of attributes.

Browse Source 
In the case of devices where the mass-storage interface is not the
first one, we will miss it unless we were to check all attributes
one at a time in order. Instead of doing that, just fetch the configuration
and enumerate it directly.
This commit is contained in:
Augustin Cavalier
2023-05-30 15:32:49 -04:00
parent e1e2a82dd2
commit ca40d4ab5c
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
+26 -19
View File
@@ -1931,30 +1931,37 @@ usb_disk_supports_device(device_node *parent)
if (strcmp(bus, "usb") != 0) if (strcmp(bus, "usb") != 0)
return 0.0; return 0.0;
uint8 baseClass = 0, subclass = 0, protocol = 0; usb_device device;
if (gDeviceManager->get_attr_uint8(parent, USB_DEVICE_CLASS, &baseClass, false) != B_OK) if (gDeviceManager->get_attr_uint32(parent, USB_DEVICE_ID_ITEM, &device, true) != B_OK)
return 0.0; return -1;
if (gDeviceManager->get_attr_uint8(parent, USB_DEVICE_SUBCLASS, &subclass, false) != B_OK)
return 0.0; const usb_configuration_info *configuration = gUSBModule->get_configuration(device);
if (gDeviceManager->get_attr_uint8(parent, USB_DEVICE_PROTOCOL, &protocol, false) != B_OK) if (configuration == NULL)
return 0.0; return -1;
static usb_support_descriptor supportedDevices[] = { static usb_support_descriptor supportedDevices[] = {
{ 0x08 /* mass storage */, 0x06 /* SCSI */, 0x50 /* bulk */, 0, 0 }, { USB_MASS_STORAGE_DEVICE_CLASS, 0x06 /* SCSI */, 0x50 /* bulk */, 0, 0 },
{ 0x08 /* mass storage */, 0x02 /* ATAPI */, 0x50 /* bulk */, 0, 0 }, { USB_MASS_STORAGE_DEVICE_CLASS, 0x02 /* ATAPI */, 0x50 /* bulk */, 0, 0 },
{ 0x08 /* mass storage */, 0x05 /* ATAPI */, 0x50 /* bulk */, 0, 0 }, { USB_MASS_STORAGE_DEVICE_CLASS, 0x05 /* ATAPI */, 0x50 /* bulk */, 0, 0 },
{ 0x08 /* mass storage */, 0x04 /* UFI */, 0x00, 0, 0 } { USB_MASS_STORAGE_DEVICE_CLASS, 0x04 /* UFI */, 0x00, 0, 0 }
}; };
for (size_t i = 0; i < B_COUNT_OF(supportedDevices); i++) {
if (baseClass != supportedDevices[i].dev_class) for (size_t i = 0; i < configuration->interface_count; i++) {
continue; usb_interface_info *interface = configuration->interface[i].active;
if (subclass != supportedDevices[i].dev_subclass) if (interface == NULL)
continue;
if (supportedDevices[i].dev_protocol != 0 && protocol != supportedDevices[i].dev_protocol)
continue; continue;
TRACE("USB disk device found!\n"); for (size_t i = 0; i < B_COUNT_OF(supportedDevices); i++) {
return 0.6; if (interface->descr->interface_class != supportedDevices[i].dev_class)
continue;
if (interface->descr->interface_subclass != supportedDevices[i].dev_subclass)
continue;
if (interface->descr->interface_protocol != supportedDevices[i].dev_protocol)
continue;
TRACE("USB disk device found!\n");
return 0.6;
}
} }
return 0.0; return 0.0;