o Add several CDMA-2000 terminals.

PR:		usb/109838
Submitted by:	R.Mahmatkhanov
MFC after:	1 month

2 files changed, 24 insertions, 2 deletions

diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 508b653..a3a1e6f 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -80,7 +80,18 @@ static const struct usbd_quirk_entry {
  { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE,
    						    0x100, { UQ_AU_INP_ASYNC }},
  { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN53B, ANY, { UQ_NO_STRINGS }},
- { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMAMODEM, ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU510,
+	 ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU550,
+	 ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_HX550C,
+	 ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_HX57XB,
+	 ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_UBIQUAM, USB_PRODUCT_UBIQUAM_UALL,
+	 ANY, { UQ_ASSUME_CM_OVER_DATA }},
+ { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_RWT_FCT,
+	 ANY, { UQ_ASSUME_CM_OVER_DATA }},
  /* XXX These should have a revision number, but I don't know what they are. */
  { USB_VENDOR_HP, USB_PRODUCT_HP_895C,		    ANY,   { UQ_BROKEN_BIDIR }},
  { USB_VENDOR_HP, USB_PRODUCT_HP_880C,		    ANY,   { UQ_BROKEN_BIDIR }},
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 394aa87..677e862 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -525,6 +525,7 @@ vendor RALINK		0x148f	Ralink Technology
 vendor IMAGINATION	0x149a	Imagination Technologies
 vendor CONCEPTRONIC2	0x14b2	Conceptronic
 vendor SILICONPORTALS	0x1527	Silicon Portals
+vendor UBIQUAM		0x1529	UBIQUAM Co., Ltd.
 vendor PNY		0x154b	PNY
 vendor SOHOWARE		0x15e8	SOHOware
 vendor UMAX		0x1606	UMAX
@@ -791,7 +792,8 @@ product CHIC CYPRESS		0x0003	Cypress USB Mouse
 product CHICONY KB8933		0x0001	KB-8933 keyboard
 
 /* CMOTECH products */
-product CMOTECH CDMAMODEM	0x5141	CMOTECH CDMA Technologies USB modem
+product CMOTECH CNU510		0x5141	CMOTECH CDMA Technologies USB modem
+product CMOTECH CNU550		0x5543	CDMA 2000 1xRTT/1xEVDO USB modem
 
 /* Compaq products */
 product COMPAQ IPAQPOCKETPC	0x0003	iPAQ PocketPC
@@ -835,6 +837,8 @@ product CONCEPTRONIC2 C54RU2	0x3c22	C54RU
 product CTX EX1300		0x9999	Ex1300 hub
 
 /* Curitel products */
+product CURITEL HX550C		0x1101	CDMA 2000 1xRTT USB modem (HX-550C)
+product CURITEL HX57XB		0x2101	CDMA 2000 1xRTT USB modem (HX-570/575B)
 product CURITEL PC5740		0x3701	Broadband wireless modem
 
 /* Cypress Semiconductor products */
@@ -1507,6 +1511,7 @@ product PROLIFIC2 WSIM		0x2001  Willcom WSIM
 product PUTERCOM UPA100		0x047e	USB-1284 BRIDGE
 
 /* Qualcomm products */
+product QUALCOMM RWT_FCT	0x3100	RWT FCT-CDMA 2000 1xRTT modem
 product QUALCOMM CDMA_MSM	0x3196	CDMA Technologies MSM modem
 product QUALCOMM2 CDMA_MSM	0x6000	CDMA Technologies MSM phone
 
@@ -1540,6 +1545,9 @@ product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
 /* RATOC Systems products */
 product RATOC REXUSB60		0xb000	REX-USB60
 
+/* Sagem products */
+product SAGEM USBSERIAL		0x0027	USB-Serial Controller
+
 /* Samsung products */
 product SAMSUNG ML6060		0x3008	ML-6060 laser printer
 
@@ -1717,6 +1725,9 @@ product TRUMPION C3310		0x1100	Comotron C3310 MP3 player
 /* TwinMOS */
 product TWINMOS MDIV		0x1325	Memory Disk IV
 
+/* Ubiquam products */
+product UBIQUAM UALL		0x3100	CDMA 1xRTT USB Modem (U-100/105/200/300)
+
 /* U-MEDIA Communications products */
 product UMEDIA AR5523_1		0x3006	AR5523
 product UMEDIA AR5523_1_NF	0x3007	AR5523 (no firmware)