Attachment 188286 Details for Bug 192345 – E3272, E3372

[patch] E3272, E3372

u3g.patch (text/plain), 2.05 KB, created by rozhuk.im on 2017-11-26 02:21:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rozhuk.im

Created: 2017-11-26 02:21:51 UTC

Size: 2.05 KB

patch

obsolete

>Index: /usr/src/sys/dev/usb/serial/u3g.c
>===================================================================
>--- /usr/src/sys/dev/usb/serial/u3g.c	(revision 326218)
>+++ /usr/src/sys/dev/usb/serial/u3g.c	(working copy)
>@@ -306,7 +306,7 @@
> 	U3G_DEV(HUAWEI, E173, 0),
> 	U3G_DEV(HUAWEI, E173_INIT, U3GINIT_HUAWEISCSI),
> 	U3G_DEV(HUAWEI, E3131, 0),
>-	U3G_DEV(HUAWEI, E3131_INIT, U3GINIT_HUAWEISCSI),
>+	U3G_DEV(HUAWEI, E3131_INIT, U3GINIT_HUAWEISCSI2),
> 	U3G_DEV(HUAWEI, E180V, U3GINIT_HUAWEI),
> 	U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI),
> 	U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI),
>@@ -324,6 +324,8 @@
> 	U3G_DEV(HUAWEI, K3770_INIT, U3GINIT_HUAWEISCSI),
> 	U3G_DEV(HUAWEI, K4505, U3GINIT_HUAWEI),
> 	U3G_DEV(HUAWEI, K4505_INIT, U3GINIT_HUAWEISCSI),
>+	U3G_DEV(HUAWEI, E3272_INIT, U3GINIT_HUAWEISCSI),
>+	U3G_DEV(HUAWEI, E3272, 0),
> 	U3G_DEV(HUAWEI, ETS2055, U3GINIT_HUAWEI),
> 	U3G_DEV(KYOCERA2, CDMA_MSM_K, 0),
> 	U3G_DEV(KYOCERA2, KPC680, 0),
>@@ -590,6 +592,15 @@
> MODULE_VERSION(u3g, 1);
> USB_PNP_HOST_INFO(u3g_devs);
> 
>+/* Huawei specific: see if_cdce.c for more ids. */
>+#define U3G_HUAWEI_IS_CDC(info, iface_descr)				\
>+	((info)->idVendor == USB_VENDOR_HUAWEI &&			\
>+	(iface_descr)->bInterfaceClass == UICLASS_VENDOR &&		\
>+	(iface_descr)->bInterfaceSubClass == 0x02 &&			\
>+	((iface_descr)->bInterfaceProtocol == 0x16 ||			\
>+	(iface_descr)->bInterfaceProtocol == 0x46 ||			\
>+	(iface_descr)->bInterfaceProtocol == 0x76))
>+
> static int
> u3g_sierra_init(struct usb_device *udev)
> {
>@@ -839,6 +850,10 @@
> 	if (uaa->info.bInterfaceClass != UICLASS_VENDOR) {
> 		return (ENXIO);
> 	}
>+	/* Huawei specific: skip cdce devices. */
>+	if (U3G_HUAWEI_IS_CDC(&uaa->info, &uaa->info)) {
>+		return (ENXIO);
>+	}
> 	return (usbd_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa));
> }
> 
>@@ -882,6 +897,9 @@
> 		id = usbd_get_interface_descriptor(iface);
> 		if (id == NULL || id->bInterfaceClass != UICLASS_VENDOR)
> 			continue;
>+		/* Huawei specific: skip cdce devices. */
>+		if (U3G_HUAWEI_IS_CDC(&uaa->info, id))
>+			continue;
> 		usbd_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex);
> 		iface_valid |= (1<<i);
> 	}

Actions: View | Diff

Attachments on bug 192345: 145259 | 145278 | 145289 | 145319 | 145389 | 188286 | 188288 | 188479 | 188484 | 188485