sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-13 07:20:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

[usb] Allow for wildcard USB class IDs

Browse Source 
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>
This commit is contained in:
Michael Brown
2015-09-14 17:52:25 +01:00
parent 549a0caabb
commit 668dc73d52
9 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/include/ipxe/usb.h
View File

@@ -615,6 +615,14 @@ extern int usb_prefill ( struct usb_endpoint *ep );
extern int usb_refill ( struct usb_endpoint *ep );
extern void usb_flush ( struct usb_endpoint *ep );
/** A USB class descriptor */
union usb_class_descriptor {
/** Class */
struct usb_class class;
/** Scalar value */
uint32_t scalar;
};
/**
* A USB function descriptor
*
@@ -627,7 +635,7 @@ struct usb_function_descriptor {
/** Product ID */
uint16_t product;
/** Class */
struct usb_class class;
union usb_class_descriptor class;
/** Number of interfaces */
unsigned int count;
};
@@ -1298,19 +1306,50 @@ struct usb_device_id {
uint16_t vendor;
/** Product ID */
uint16_t product;
/** Class */
struct usb_class class;
};
/** Match-anything ID */
#define USB_ANY_ID 0xffff
/** A USB class ID */
struct usb_class_id {
/** Class */
union usb_class_descriptor class;
/** Class mask */
union usb_class_descriptor mask;
};
/** Construct USB class ID
*
* @v base Base class code (or USB_ANY_ID)
* @v subclass Subclass code (or USB_ANY_ID)
* @v protocol Protocol code (or USB_ANY_ID)
*/
#define USB_CLASS_ID( base, subclass, protocol ) { \
.class = { \
.class = { \
( (base) & 0xff ), \
( (subclass) & 0xff ), \
( (protocol) & 0xff ), \
}, \
}, \
.mask = { \
.class = { \
( ( (base) == USB_ANY_ID ) ? 0x00 : 0xff ), \
( ( (subclass) == USB_ANY_ID ) ? 0x00 : 0xff ), \
( ( (protocol) == USB_ANY_ID ) ? 0x00 : 0xff ), \
}, \
}, \
}
/** A USB driver */
struct usb_driver {
/** USB ID table */
struct usb_device_id *ids;
/** Number of entries in ID table */
unsigned int id_count;
/** Class ID */
struct usb_class_id class;
/** Driver score
*
* This is used to determine the preferred configuration for a