linux-usb:Define a new macro for USB storage match rules
Subsystems (2)
PATCH 1/2 linux-usb:Define a new macro for USB storage match rules
From: fangxiaozhi <[email protected]>
1. Define a new macro for USB storage match rules:
matching with Vendor ID and interface descriptors.
--------------------------------------------------------------------
drivers/usb/storage/usb.c +12 -0
@@ -120,6 +120,17 @@ MODULE_PARM_DESC(quirks, "supplemental l .useTransport = use_transport, \ } +#define UNUSUAL_VENDOR_INTF (idVendor, cl, sc, pr, \ + vendor_name, product_name, use_protocol, use_transport, \ + init_function, Flags) \ +{ \ + .vendorName = vendor_name, \ + .productName = product_name, \ + .useProtocol = use_protocol, \ + .useTransport = use_transport, \ + .initFunction = init_function, \ +} +static struct us_unusual_dev us_unusual_dev_list[] = { # include "unusual_devs.h" { }/* Terminating entry */
@@ -131,6 +142,7 @@ static struct us_unusual_dev for_dynamic#undef UNUSUAL_DEV#undef COMPLIANT_DEV#undef USUAL_DEV +#undef UNUSUAL_VENDOR_INTF#ifdef CONFIG_LOCKDEP
drivers/usb/storage/usual-tables.c +15 -0
@@ -41,6 +41,20 @@#define USUAL_DEV (useProto, useTrans) \ { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans) } +/* Define the device is matched with Vendor ID and interface descriptors */ +#define UNUSUAL_VENDOR_INTF (id_vendor, cl, sc, pr, \ + vendorName, productName, useProtocol, useTransport, \ + initFunction, flags) \ +{ \ + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ + | USB_DEVICE_ID_MATCH_VENDOR, \ + .idVendor = (id_vendor), \ + .bInterfaceClass = (cl), \ + .bInterfaceSubClass = (sc), \ + .bInterfaceProtocol = (pr), \ + .driver_info = (flags) \ +} +struct usb_device_id usb_storage_usb_ids[] = { # include "unusual_devs.h" { }/* Terminating entry */
@@ -50,6 +64,7 @@ MODULE_DEVICE_TABLE(usb, usb_storage_usb#undef UNUSUAL_DEV#undef COMPLIANT_DEV#undef USUAL_DEV +#undef UNUSUAL_VENDOR_INTF/* * The table of devices to ignore
Greg KH
maintainerRe: [PATCH 1/2] USB: storage: Define a new macro for USB storage match rules
drivers/usb/storage/usual-tables.c line 56
Quoted 13 lines · On Mon, Feb 04, 2013 at 03:14:46PM +0800, fangxiaozhi 00110321 wrote:
drivers/usb/storage/usual-tables.c +13
-0+/* Define the device is matched with Vendor ID and interface descriptors */ +#define UNUSUAL_VENDOR_INTF (id_vendor, cl, sc, pr, \ + vendorName, productName, useProtocol, useTransport, \ + initFunction, flags) \ +{ \ + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ + | USB_DEVICE_ID_MATCH_VENDOR, \ + .idVendor = (id_vendor), \ + .bInterfaceClass = (cl), \ + .bInterfaceSubClass = (sc), \ + .bInterfaceProtocol = (pr), \ + .driver_info = (flags) \ +}
I'm not going to reject this given the number of times it has been submitted, but can't you use the USB_VENDOR_AND_INTERFACE_INFO() macro here in this definition?
If so, can you send me an add-on patch that makes that change?
thanks,
greg k-h
RE: [PATCH 1/2] USB: storage: Define a new macro for USB storage match rules
Dear Greg:
OK,thank you very much.
Best Regards,
Franko Fang
Quoted 29 lines
-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Tuesday, February 05, 2013 2:39 AM
To: Fangxiaozhi (Franko)
Cc: [email protected]; [email protected]; Xueguiying (Zihan); Linlei (Lei Lin); Yili (Neil); Wangyuhua (Roger, Credit); Huqiao (C); [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/2] USB: storage: Define a new macro for USB storage match rulesdrivers/usb/storage/usual-tables.c line 56
Quoted 13 lines · On Mon, Feb 04, 2013 at 03:14:46PM +0800, fangxiaozhi 00110321 wrote:
drivers/usb/storage/usual-tables.c +13
-0+/* Define the device is matched with Vendor ID and interface +descriptors */ #define UNUSUAL_VENDOR_INTF (id_vendor, cl, sc, pr, \ + vendorName, productName, useProtocol, useTransport, \ + initFunction, flags) \ +{ \ + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ + | USB_DEVICE_ID_MATCH_VENDOR, \ + .idVendor = (id_vendor), \ + .bInterfaceClass = (cl), \ + .bInterfaceSubClass = (sc), \ + .bInterfaceProtocol = (pr), \ + .driver_info = (flags) \ +}I'm not going to reject this given the number of times it has been submitted, but can't you use the
USB_VENDOR_AND_INTERFACE_INFO()macro here in this definition?
Quoted 5 lines
If so, can you send me an add-on patch that makes that change?
thanks,
greg k-h
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�