Author: hselasky
Date: Mon Mar 12 18:13:59 2012
New Revision: 232873
URL: http://svn.freebsd.org/changeset/base/232873

Log:
  MFC r230238 and r232684:
  Add new USB device ID's.

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

Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/9/sys/dev/usb/quirk/usb_quirk.c      Mon Mar 12 18:10:01 2012        
(r232872)
+++ stable/9/sys/dev/usb/quirk/usb_quirk.c      Mon Mar 12 18:13:59 2012        
(r232873)
@@ -134,6 +134,7 @@ static struct usb_quirk_entry usb_quirks
        USB_QUIRK(QUALCOMM2, CDMA_MSM, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
        USB_QUIRK(CURITEL, UM150, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
        USB_QUIRK(CURITEL, UM175, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
+       USB_QUIRK(VERTEX, VW110L, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
 
        /* USB Mass Storage Class Quirks */
        USB_QUIRK_VP(USB_VENDOR_ASAHIOPTICAL, 0, UQ_MSC_NO_RS_CLEAR_UA,

Modified: stable/9/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/9/sys/dev/usb/serial/u3g.c   Mon Mar 12 18:10:01 2012        
(r232872)
+++ stable/9/sys/dev/usb/serial/u3g.c   Mon Mar 12 18:13:59 2012        
(r232873)
@@ -354,6 +354,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
        U3G_DEV(QISDA, H21_2, 0),
        U3G_DEV(QUALCOMM2, AC8700, 0),
        U3G_DEV(QUALCOMM2, MF330, 0),
+       U3G_DEV(QUALCOMM2, VW110L, U3GINIT_SCSIEJECT),
        U3G_DEV(QUALCOMMINC, AC2726, 0),
        U3G_DEV(QUALCOMMINC, AC8700, 0),
        U3G_DEV(QUALCOMMINC, AC8710, 0),
@@ -422,6 +423,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
        U3G_DEV(QUALCOMMINC, SURFSTICK, 0),
        U3G_DEV(QUALCOMMINC, E2002, 0),
        U3G_DEV(QUALCOMMINC, E2003, 0),
+       U3G_DEV(QUALCOMMINC, K3772_Z, U3GINIT_SCSIEJECT),
        U3G_DEV(QUALCOMMINC, MF626, 0),
        U3G_DEV(QUALCOMMINC, MF628, 0),
        U3G_DEV(QUALCOMMINC, MF633R, 0),

Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs        Mon Mar 12 18:10:01 2012        
(r232872)
+++ stable/9/sys/dev/usb/usbdevs        Mon Mar 12 18:13:59 2012        
(r232873)
@@ -679,6 +679,7 @@ vendor QISDA                0x1da5  Qisda
 vendor METAGEEK2       0x1dd5  MetaGeek
 vendor ALINK           0x1e0e  Alink
 vendor AIRTIES         0x1eda  AirTies
+vendor VERTEX          0x1fe7  Vertex Wireless Co., Ltd.
 vendor DLINK           0x2001  D-Link
 vendor PLANEX2         0x2019  Planex Communications
 vendor HAUPPAUGE2      0x2040  Hauppauge Computer Works
@@ -2677,6 +2678,7 @@ product QUALCOMM2 MF330           0x6613  MF330
 product QUALCOMM2 RWT_FCT      0x3100  RWT FCT-CDMA 2000 1xRTT modem
 product QUALCOMM2 CDMA_MSM     0x3196  CDMA Technologies MSM modem
 product QUALCOMM2 AC8700       0x6000  AC8700
+product QUALCOMM2 VW110L       0x1000  Vertex Wireless 110L modem
 product QUALCOMMINC CDMA_MSM   0x0001  CDMA Technologies MSM modem
 product QUALCOMMINC E0002      0x0002  3G modem
 product QUALCOMMINC E0003      0x0003  3G modem
@@ -2744,6 +2746,7 @@ product QUALCOMMINC E0078 0x0078  3G mode
 product QUALCOMMINC E0082      0x0082  3G modem
 product QUALCOMMINC E0086      0x0086  3G modem
 product QUALCOMMINC SURFSTICK  0x0117  1&1 Surf Stick
+product QUALCOMMINC K3772_Z    0x1179  3G modem
 product QUALCOMMINC ZTE_STOR   0x2000  USB ZTE Storage
 product QUALCOMMINC E2002      0x2002  3G modem
 product QUALCOMMINC E2003      0x2003  3G modem
@@ -3373,6 +3376,9 @@ product VIA USB2IDEBRIDGE 0x6204  USB 2.0
 /* Vaisala products */
 product VAISALA CABLE          0x0200  USB Interface cable
 
+/* Vertex products */
+product VERTEX VW110L          0x0100  Vertex VW110L modem
+
 /* VidzMedia products */
 product VIDZMEDIA MONSTERTV    0x4fb1  MonsterTV P2H
 
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to