diff options
| author | Michael Brown | 2015-09-14 18:52:25 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-09-14 22:56:40 +0200 |
| commit | 668dc73d526fa67957b9c10100f9ca5f2ab60522 (patch) | |
| tree | cf6887506d5ac016fd04497cbd568463292903de /src/drivers/net/ncm.c | |
| parent | [usb] Select preferred USB device configuration based on driver score (diff) | |
| download | ipxe-668dc73d526fa67957b9c10100f9ca5f2ab60522.tar.gz ipxe-668dc73d526fa67957b9c10100f9ca5f2ab60522.tar.xz ipxe-668dc73d526fa67957b9c10100f9ca5f2ab60522.zip | |
[usb] Allow for wildcard USB class IDs
Make the class ID a property of the USB driver (rather than a property
of the USB device ID), and allow USB drivers to specify a wildcard ID
for any of the three component IDs (class, subclass, or protocol).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/ncm.c')
| -rw-r--r-- | src/drivers/net/ncm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/drivers/net/ncm.c b/src/drivers/net/ncm.c index 3c3ab90f..afa794ea 100644 --- a/src/drivers/net/ncm.c +++ b/src/drivers/net/ncm.c @@ -655,11 +655,6 @@ static struct usb_device_id ncm_ids[] = { .name = "cdc-ncm", .vendor = USB_ANY_ID, .product = USB_ANY_ID, - .class = { - .class = USB_CLASS_CDC, - .subclass = USB_SUBCLASS_CDC_NCM, - .protocol = 0, - }, }, }; @@ -667,6 +662,7 @@ static struct usb_device_id ncm_ids[] = { struct usb_driver ncm_driver __usb_driver = { .ids = ncm_ids, .id_count = ( sizeof ( ncm_ids ) / sizeof ( ncm_ids[0] ) ), + .class = USB_CLASS_ID ( USB_CLASS_CDC, USB_SUBCLASS_CDC_NCM, 0 ), .score = USB_SCORE_NORMAL, .probe = ncm_probe, .remove = ncm_remove, |