svn commit: r280569 - in stable/10/sys/dev/usb: . quirk serial

[Hans Petter Selasky]

Author: hselasky
Date: Wed Mar 25 11:12:48 2015
New Revision: 280569
URL: https://svnweb.freebsd.org/changeset/base/280569

Log:
  MFC r279725:
  Add more USB IDs.
  
  PR:		197753

Modified:
  stable/10/sys/dev/usb/quirk/usb_quirk.c
  stable/10/sys/dev/usb/serial/u3g.c
  stable/10/sys/dev/usb/usbdevs
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/10/sys/dev/usb/quirk/usb_quirk.c	Wed Mar 25 11:10:56 2015	(r280568)
+++ stable/10/sys/dev/usb/quirk/usb_quirk.c	Wed Mar 25 11:12:48 2015	(r280569)
@@ -483,7 +483,8 @@ static struct usb_quirk_entry usb_quirks
 	USB_QUIRK(TOSHIBA, TRANSMEMORY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE,
 	    UQ_MSC_NO_PREVENT_ALLOW),
 	USB_QUIRK(VIALABS, USB30SATABRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
-
+	USB_QUIRK(QUALCOMMINC, ZTE_MF730M, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN,
+	    UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0),
 	/* Non-standard USB MIDI devices */
 	USB_QUIRK(ROLAND, UM1, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS),
 	USB_QUIRK(ROLAND, SC8850, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS),

Modified: stable/10/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/10/sys/dev/usb/serial/u3g.c	Wed Mar 25 11:10:56 2015	(r280568)
+++ stable/10/sys/dev/usb/serial/u3g.c	Wed Mar 25 11:12:48 2015	(r280569)
@@ -481,6 +481,8 @@ static const STRUCT_USB_HOST_ID u3g_devs
 	U3G_DEV(QUALCOMMINC, MF626, 0),
 	U3G_DEV(QUALCOMMINC, MF628, 0),
 	U3G_DEV(QUALCOMMINC, MF633R, 0),
+	/* the following is a RNDIS device, no modem features */
+	U3G_DEV(QUALCOMMINC, ZTE_MF730M, U3GINIT_SCSIEJECT),
 	U3G_DEV(QUANTA, GKE, 0),
 	U3G_DEV(QUANTA, GLE, 0),
 	U3G_DEV(QUANTA, GLX, 0),

Modified: stable/10/sys/dev/usb/usbdevs
==============================================================================
--- stable/10/sys/dev/usb/usbdevs	Wed Mar 25 11:10:56 2015	(r280568)
+++ stable/10/sys/dev/usb/usbdevs	Wed Mar 25 11:12:48 2015	(r280569)
@@ -3649,6 +3649,7 @@ product QUALCOMMINC E0086	0x0086	3G mode
 product QUALCOMMINC SURFSTICK	0x0117	1&1 Surf Stick
 product QUALCOMMINC K3772_Z_INIT	0x1179	K3772-Z Initial
 product QUALCOMMINC K3772_Z	0x1181	K3772-Z
+product QUALCOMMINC ZTE_MF730M	0x1420	3G modem
 product QUALCOMMINC MF195E_INIT	0x1514	MF195E initial
 product QUALCOMMINC MF195E	0x1516	MF195E
 product QUALCOMMINC ZTE_STOR	0x2000	USB ZTE Storage