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

usb_disk: Use get_attr_uint8 instead of a loop to get class/subclass/protocol.

Browse Source 
Suggested by axeld. The original logic was copied from the USB-ECM
driver, which may also be able to be simplified here.
This commit is contained in:
Augustin Cavalier
2023-05-30 14:19:07 -04:00
parent 9b1ff49d87
commit dd6e7cb90d
1 changed files with 7 additions and 17 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
+7 -17
View File
@@ -1840,26 +1840,16 @@ usb_disk_supports_device(device_node *parent)
// make sure parent is really the usb bus manager // make sure parent is really the usb bus manager
if (gDeviceManager->get_attr_string(parent, B_DEVICE_BUS, &bus, false)) if (gDeviceManager->get_attr_string(parent, B_DEVICE_BUS, &bus, false))
return -1; return -1;
if (strcmp(bus, "usb") != 0)
if (strcmp(bus, "usb"))
return 0.0; return 0.0;
device_attr *attr = NULL;
uint8 baseClass = 0, subclass = 0, protocol = 0; uint8 baseClass = 0, subclass = 0, protocol = 0;
while (gDeviceManager->get_next_attr(parent, &attr) == B_OK) { if (gDeviceManager->get_attr_uint8(parent, USB_DEVICE_CLASS, &baseClass, false) != B_OK)
if (attr->type != B_UINT8_TYPE) return 0.0;
continue; if (gDeviceManager->get_attr_uint8(parent, USB_DEVICE_SUBCLASS, &subclass, false) != B_OK)
return 0.0;
if (!strcmp(attr->name, USB_DEVICE_CLASS)) if (gDeviceManager->get_attr_uint8(parent, USB_DEVICE_PROTOCOL, &protocol, false) != B_OK)
baseClass = attr->value.ui8; return 0.0;
if (!strcmp(attr->name, USB_DEVICE_SUBCLASS))
subclass = attr->value.ui8;
if (!strcmp(attr->name, USB_DEVICE_PROTOCOL))
protocol = attr->value.ui8;
if (baseClass != 0 && subclass != 0 && protocol != 0)
break;
}
static usb_support_descriptor supportedDevices[] = { static usb_support_descriptor supportedDevices[] = {
{ 0x08 /* mass storage */, 0x06 /* SCSI */, 0x50 /* bulk */, 0, 0 }, { 0x08 /* mass storage */, 0x06 /* SCSI */, 0x50 /* bulk */, 0, 0 },