Oliver Neukum <oneukum@xxxxxxxx> writes:
> This introduces the common parser for extra CDC headers now that it no longer
> depends on usbnet.
>
> Signed-off-by: Oliver Neukum <ONeukum@xxxxxxxx>
> ---
> drivers/usb/class/cdc-acm.c | 60 +++------------------------------------------
> 1 file changed, 3 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
> index a6c4a1b..6d82257 100644
> --- a/drivers/usb/class/cdc-acm.c
> +++ b/drivers/usb/class/cdc-acm.c
> @@ -1155,18 +1155,17 @@ static int acm_probe(struct usb_interface *intf,
> struct usb_endpoint_descriptor *epread = NULL;
> struct usb_endpoint_descriptor *epwrite = NULL;
> struct usb_device *usb_dev = interface_to_usbdev(intf);
> + struct usb_cdc_parsed_header hdr;
> struct acm *acm;
> int minor;
> int ctrlsize, readsize;
> u8 *buf;
> u8 ac_management_function = 0;
> - u8 call_management_function = 0;
> int call_interface_num = -1;
> int data_interface_num = -1;
> unsigned long quirks;
> int num_rx_buf;
> int i;
> - unsigned int elength = 0;
> int combined_interfaces = 0;
> struct device *tty_dev;
> int rv = -ENOMEM;
> @@ -1210,61 +1209,8 @@ static int acm_probe(struct usb_interface *intf,
> }
> }
>
> - while (buflen > 0) {
> - elength = buffer[0];
> - if (!elength) {
> - dev_err(&intf->dev, "skipping garbage byte\n");
> - elength = 1;
> - goto next_desc;
> - }
> - if (buffer[1] != USB_DT_CS_INTERFACE) {
> - dev_err(&intf->dev, "skipping garbage\n");
> - goto next_desc;
> - }
> -
> - switch (buffer[2]) {
> - case USB_CDC_UNION_TYPE: /* we've found it */
> - if (elength < sizeof(struct usb_cdc_union_desc))
> - goto next_desc;
> - if (union_header) {
> - dev_err(&intf->dev, "More than one "
> - "union descriptor, skipping ...\n");
> - goto next_desc;
> - }
> - union_header = (struct usb_cdc_union_desc *)buffer;
> - break;
> - case USB_CDC_COUNTRY_TYPE: /* export through sysfs*/
> - if (elength < sizeof(struct usb_cdc_country_functional_desc))
> - goto next_desc;
> - cfd = (struct usb_cdc_country_functional_desc *)buffer;
> - break;
> - case USB_CDC_HEADER_TYPE: /* maybe check version */
> - break; /* for now we ignore it */
> - case USB_CDC_ACM_TYPE:
> - if (elength < 4)
> - goto next_desc;
> - ac_management_function = buffer[3];
> - break;
> - case USB_CDC_CALL_MANAGEMENT_TYPE:
> - if (elength < 5)
> - goto next_desc;
> - call_management_function = buffer[3];
> - call_interface_num = buffer[4];
> - break;
> - default:
> - /*
> - * there are LOTS more CDC descriptors that
> - * could legitimately be found here.
> - */
> - dev_dbg(&intf->dev, "Ignoring descriptor: "
> - "type %02x, length %ud\n",
> - buffer[2], elength);
> - break;
> - }
> -next_desc:
> - buflen -= elength;
> - buffer += elength;
> - }
> + cdc_parse_cdc_header(&hdr, intf, buffer, buflen);
> + union_header = hdr.usb_cdc_union_desc;
>
> if (!union_header) {
> if (call_interface_num > 0) {
This won't work, will it? The old code sets way more than just
union_header.
I think the common parser need
Bjørn
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
