Skip to content

Commit 62de496

Browse files
committed
Remove unreachable codes for vhci
Old vhci gave unnecessary null check for descriptors in pluginfo which are statically allocated. Those unreachable codes are removed. See #251 (comment)
1 parent 397b75d commit 62de496

1 file changed

Lines changed: 8 additions & 25 deletions

File tree

driver/vhci/vhci_plugin.c

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,36 +50,19 @@ vhci_init_vpdo(pvpdo_dev_t vpdo)
5050
static void
5151
setup_vpdo_with_dsc_dev(pvpdo_dev_t vpdo, PUSB_DEVICE_DESCRIPTOR dsc_dev)
5252
{
53-
if (dsc_dev) {
54-
vpdo->vendor = dsc_dev->idVendor;
55-
vpdo->product = dsc_dev->idProduct;
56-
vpdo->revision = dsc_dev->bcdDevice;
57-
vpdo->usbclass = dsc_dev->bDeviceClass;
58-
vpdo->subclass = dsc_dev->bDeviceSubClass;
59-
vpdo->protocol = dsc_dev->bDeviceProtocol;
60-
vpdo->speed = (UCHAR)get_usb_speed(dsc_dev->bcdUSB);
61-
vpdo->num_configurations = dsc_dev->bNumConfigurations;
62-
} else {
63-
/* TODO: can happen? */
64-
vpdo->vendor = 0;
65-
vpdo->product = 0;
66-
vpdo->revision = 0;
67-
vpdo->usbclass = 0;
68-
vpdo->subclass = 0;
69-
vpdo->protocol = 0;
70-
vpdo->speed = USB_SPEED_LOW;
71-
vpdo->num_configurations = 1;
72-
}
53+
vpdo->vendor = dsc_dev->idVendor;
54+
vpdo->product = dsc_dev->idProduct;
55+
vpdo->revision = dsc_dev->bcdDevice;
56+
vpdo->usbclass = dsc_dev->bDeviceClass;
57+
vpdo->subclass = dsc_dev->bDeviceSubClass;
58+
vpdo->protocol = dsc_dev->bDeviceProtocol;
59+
vpdo->speed = (UCHAR)get_usb_speed(dsc_dev->bcdUSB);
60+
vpdo->num_configurations = dsc_dev->bNumConfigurations;
7361
}
7462

7563
static void
7664
setup_vpdo_with_dsc_conf(pvpdo_dev_t vpdo, PUSB_CONFIGURATION_DESCRIPTOR dsc_conf)
7765
{
78-
if (!dsc_conf) {
79-
vpdo->inum = 0;
80-
return;
81-
}
82-
8366
vpdo->inum = dsc_conf->bNumInterfaces;
8467

8568
/* Many devices have 0 usb class number in a device descriptor.

0 commit comments

Comments
 (0)