Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d81a5d19 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

USB: add USB_VENDOR_AND_INTERFACE_INFO() macro 



A lot of Broadcom Bluetooth devices provides vendor specific interface
class and we are getting flooded by patches adding new device support.
This change will help us enable support for any other Broadcom with vendor
specific device that arrives in the future.

Only the product id changes for those devices, so this macro would be
perfect for us:

{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Acked-by: default avatarHenrik Rydberg <rydberg@bitmath.se>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 925aa46b

include/linux/usb.h

+21 −0
Original line number Diff line number Diff line
@@ -861,6 +861,27 @@ static inline int usb_make_path(struct usb_device *dev, char *buf, size_t size) 
	.bInterfaceSubClass = (sc), \

	.bInterfaceProtocol = (pr)



/**

 * USB_VENDOR_AND_INTERFACE_INFO - describe a specific usb vendor with a class of usb interfaces

 * @vend: the 16 bit USB Vendor ID

 * @cl: bInterfaceClass value

 * @sc: bInterfaceSubClass value

 * @pr: bInterfaceProtocol value

 *

 * This macro is used to create a struct usb_device_id that matches a

 * specific vendor with a specific class of interfaces.

 *

 * This is especially useful when explicitly matching devices that have

 * vendor specific bDeviceClass values, but standards-compliant interfaces.

 */

#define USB_VENDOR_AND_INTERFACE_INFO(vend, cl, sc, pr) \

	.match_flags = USB_DEVICE_ID_MATCH_INT_INFO \

		| USB_DEVICE_ID_MATCH_VENDOR, \

	.idVendor = (vend), \

	.bInterfaceClass = (cl), \

	.bInterfaceSubClass = (sc), \

	.bInterfaceProtocol = (pr)



/* ----------------------------------------------------------------------- */



/* Stuff for dynamic usb ids */