sync

2 files changed, 164 insertions, 24 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 3f4d1961357..a0a41b11830 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.416 2009/02/03 10:54:23 kevlo Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.417 2009/02/18 17:14:08 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.406 2009/02/03 10:53:28 kevlo Exp 
+ *	OpenBSD: usbdevs,v 1.407 2009/02/18 17:13:58 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1032,9 +1032,12 @@
 #define	USB_PRODUCT_CTC_CW6622	0x6622		/* CW6622 */
 
 /* CMOTECH CDMA Technologies products */
+#define	USB_PRODUCT_CMOTECH_CNU510	0x5141		/* CDMA Technologies USB modem */
 #define	USB_PRODUCT_CMOTECH_CM5100P	0x5523		/* CM-5100P EVDO */
 #define	USB_PRODUCT_CMOTECH_CCU550	0x5533		/* CCU-550 EVDO */
 #define	USB_PRODUCT_CMOTECH_CNU550pro	0x5543		/* CNU-550pro EVDO */
+#define	USB_PRODUCT_CMOTECH_CGU628	0x6006		/* CGU-628 */
+#define	USB_PRODUCT_CMOTECH_CGU628_DISK	0xf000		/* CGU-628 disk mode */
 
 /* Conceptronic products */
 #define	USB_PRODUCT_CONCEPTRONIC_PRISM_GT	0x3762		/* PrismGT USB 2.0 WLAN */
@@ -1131,6 +1134,7 @@
 #define	USB_PRODUCT_DELL_BLUETOOTH350	0x8103		/* Bluetooth */
 #define	USB_PRODUCT_DELL_PRISM_GT_2	0x8104		/* PrismGT USB 2.0 WLAN */
 #define	USB_PRODUCT_DELL_W5500	0x8115		/* W5500 HSDPA */
+#define	USB_PRODUCT_DELL_U740	0x8135		/* Dell U740 CDMA */
 
 /* DeLorme products */
 #define	USB_PRODUCT_DELORME_EMUSB	0x0100		/* Earthmate GPS */
@@ -1601,6 +1605,7 @@
 #define	USB_PRODUCT_HP_568J	0x1116		/* Jornada 568 */
 #define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
 #define	USB_PRODUCT_HP_P2000U	0x1801		/* Inkjet P-2000U */
+#define	USB_PRODUCT_HP_HS2300	0x1e1d		/* HS2300 */
 #define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 #define	USB_PRODUCT_HP_HN210E	0x811c		/* HN210E Ethernet */
@@ -2157,14 +2162,21 @@
 
 /* Novatel Wireless products */
 #define	USB_PRODUCT_NOVATEL_EXPRESSCARD	0x1100		/* ExpressCard 3G */
-#define	USB_PRODUCT_NOVATEL_MERLINV620	0x1110		/* Merlin V620 */
-#define	USB_PRODUCT_NOVATEL_S720	0x1130		/* S720 */
-#define	USB_PRODUCT_NOVATEL_MERLINU740	0x1400		/* Merlin U740 */
+#define	USB_PRODUCT_NOVATEL_MERLINV620	0x1110		/* V620 */
+#define	USB_PRODUCT_NOVATEL_MERLINV740	0x1120		/* V740 */
+#define	USB_PRODUCT_NOVATEL_V720	0x1130		/* V720 */
+#define	USB_PRODUCT_NOVATEL_MERLINU740	0x1400		/* U740 */
+#define	USB_PRODUCT_NOVATEL_MERLINU740_2	0x1410		/* U740 */
+#define	USB_PRODUCT_NOVATEL_U870	0x1420		/* U870 */
 #define	USB_PRODUCT_NOVATEL_XU870	0x1430		/* XU870 */
+#define	USB_PRODUCT_NOVATEL_X950D	0x1450		/* X950D */
 #define	USB_PRODUCT_NOVATEL_ES620	0x2100		/* ES620 CDMA */
 #define	USB_PRODUCT_NOVATEL_U720	0x2110		/* U720 */
 #define	USB_PRODUCT_NOVATEL_U727	0x4100		/* U727 */
-#define	USB_PRODUCT_NOVATEL_MERLINX950D	0x5010		/* Merlin X950D */
+#define	USB_PRODUCT_NOVATEL_MC950D	0x4400		/* MC950D HSUPA */
+#define	USB_PRODUCT_NOVATEL_MERLINX950D	0x5010		/* X950D */
+#define	USB_PRODUCT_NOVATEL_ZEROCD2	0x5030		/* ZeroCD */
+#define	USB_PRODUCT_NOVATEL_U760	0x6000		/* U760 */
 
 /* Novatel Wireless(1) products */
 #define	USB_PRODUCT_NOVATEL1_FLEXPACKGPS	0x0100		/* NovAtel FlexPack GPS */
@@ -2612,14 +2624,29 @@
 #define	USB_PRODUCT_SIERRA_MC5720	0x0018		/* MC5720 */
 #define	USB_PRODUCT_SIERRA_AIRCARD_595	0x0019		/* AirCard 595 */
 #define	USB_PRODUCT_SIERRA_MC5725	0x0020		/* MC5725 */
-#define	USB_PRODUCT_SIERRA_MC5725_2	0x0220		/* MC5725 */
+#define	USB_PRODUCT_SIERRA_AC597E	0x0021		/* 597E */
+#define	USB_PRODUCT_SIERRA_C597	0x0023		/* Compass 597 */
+#define	USB_PRODUCT_SIERRA_AC595U	0x0120		/* 595U */
 #define	USB_PRODUCT_SIERRA_AIRCARD_580	0x0112		/* Aircard 580 EVDO */
+#define	USB_PRODUCT_SIERRA_MC5720_2	0x0218		/* MC5720 */
+#define	USB_PRODUCT_SIERRA_MC5725_2	0x0220		/* MC5725 */
+#define	USB_PRODUCT_SIERRA_TRUINSTALL	0x0fff		/* Aircard Tru Installer */
 #define	USB_PRODUCT_SIERRA_MC8755_2	0x6802		/* MC8755 */
 #define	USB_PRODUCT_SIERRA_MC8765	0x6803		/* MC8765 */
-#define	USB_PRODUCT_SIERRA_MC8755	0x6804		/* MC8755 HSDPA */
-#define	USB_PRODUCT_SIERRA_MC8775	0x6812		/* MC8775 HSDPA */
-#define	USB_PRODUCT_SIERRA_MC8755_3	0x6813		/* MC8755 HSDPA */
-#define	USB_PRODUCT_SIERRA_AIRCARD_875	0x6820		/* Aircard 875 HSDPA */
+#define	USB_PRODUCT_SIERRA_MC8755	0x6804		/* MC8755 */
+#define	USB_PRODUCT_SIERRA_MC8775	0x6812		/* MC8775 */
+#define	USB_PRODUCT_SIERRA_MC8755_3	0x6813		/* MC8755 */
+#define	USB_PRODUCT_SIERRA_MC8775_2	0x6815		/* MC8775 */
+#define	USB_PRODUCT_SIERRA_AIRCARD_875	0x6820		/* 875 */
+#define	USB_PRODUCT_SIERRA_MC8780	0x6832		/* MC8780 */
+#define	USB_PRODUCT_SIERRA_MC8781	0x6833		/* MC8781 */
+#define	USB_PRODUCT_SIERRA_AC880	0x6850		/* 880 */
+#define	USB_PRODUCT_SIERRA_AC881	0x6851		/* 881 */
+#define	USB_PRODUCT_SIERRA_AC880E	0x6852		/* 880E */
+#define	USB_PRODUCT_SIERRA_AC881E	0x6853		/* 881E */
+#define	USB_PRODUCT_SIERRA_AC880U	0x6855		/* 880U */
+#define	USB_PRODUCT_SIERRA_AC881U	0x6856		/* 881U */
+#define	USB_PRODUCT_SIERRA_AC885U	0x6880		/* 885U */
 
 /* Sigmatel products */
 #define	USB_PRODUCT_SIGMATEL_IRDA	0x4200		/* IrDA */
@@ -2972,6 +2999,7 @@
 #define	USB_PRODUCT_OPTION_SCORPION	0x6901		/* GlobeTrotter HSDPA Modem */
 #define	USB_PRODUCT_OPTION_GSICON72	0x6911		/* GlobeSurfer Icon 7.2 */
 #define	USB_PRODUCT_OPTION_GTHSDPA225	0x6971		/* GlobeTrotter HSDPA Icon 225 */
+#define	USB_PRODUCT_OPTION_GTICON322	0xd033		/* GlobeTrotter Icon322 storage */
 
 /* WCH/QinHeng Electronics */
 #define	USB_PRODUCT_WCH_CH341	0x5523		/* CH341 serial/parallel */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 1fc3d43ec0d..a0821d40fef 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.410 2009/02/03 10:54:23 kevlo Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.411 2009/02/18 17:14:08 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.406 2009/02/03 10:53:28 kevlo Exp 
+ *	OpenBSD: usbdevs,v 1.407 2009/02/18 17:13:58 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1226,6 +1226,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CW6622",
 	},
 	{
+	    USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU510,
+	    "CDMA Technologies USB modem",
+	},
+	{
 	    USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CM5100P,
 	    "CM-5100P EVDO",
 	},
@@ -1238,6 +1242,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "CNU-550pro EVDO",
 	},
 	{
+	    USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CGU628,
+	    "CGU-628",
+	},
+	{
+	    USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CGU628_DISK,
+	    "CGU-628 disk mode",
+	},
+	{
 	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_PRISM_GT,
 	    "PrismGT USB 2.0 WLAN",
 	},
@@ -1502,6 +1514,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "W5500 HSDPA",
 	},
 	{
+	    USB_VENDOR_DELL, USB_PRODUCT_DELL_U740,
+	    "Dell U740 CDMA",
+	},
+	{
 	    USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EMUSB,
 	    "Earthmate GPS",
 	},
@@ -2914,6 +2930,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Inkjet P-2000U",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_HS2300,
+	    "HS2300",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
 	    "DeskJet 640c",
 	},
@@ -4451,21 +4471,37 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINV620,
-	    "Merlin V620",
+	    "V620",
+	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINV740,
+	    "V740",
 	},
 	{
-	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_S720,
-	    "S720",
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720,
+	    "V720",
 	},
 	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740,
-	    "Merlin U740",
+	    "U740",
+	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740_2,
+	    "U740",
+	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870,
+	    "U870",
 	},
 	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870,
 	    "XU870",
 	},
 	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D,
+	    "X950D",
+	},
+	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620,
 	    "ES620 CDMA",
 	},
@@ -4478,8 +4514,20 @@ const struct usb_known_product usb_known_products[] = {
 	    "U727",
 	},
 	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D,
+	    "MC950D HSUPA",
+	},
+	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINX950D,
-	    "Merlin X950D",
+	    "X950D",
+	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ZEROCD2,
+	    "ZeroCD",
+	},
+	{
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U760,
+	    "U760",
 	},
 	{
 	    USB_VENDOR_NOVATEL1, USB_PRODUCT_NOVATEL1_FLEXPACKGPS,
@@ -5738,14 +5786,34 @@ const struct usb_known_product usb_known_products[] = {
 	    "MC5725",
 	},
 	{
-	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725_2,
-	    "MC5725",
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E,
+	    "597E",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597,
+	    "Compass 597",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U,
+	    "595U",
 	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD_580,
 	    "Aircard 580 EVDO",
 	},
 	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2,
+	    "MC5720",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725_2,
+	    "MC5725",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL,
+	    "Aircard Tru Installer",
+	},
+	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2,
 	    "MC8755",
 	},
@@ -5755,19 +5823,59 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755,
-	    "MC8755 HSDPA",
+	    "MC8755",
 	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775,
-	    "MC8775 HSDPA",
+	    "MC8775",
 	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3,
-	    "MC8755 HSDPA",
+	    "MC8755",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2,
+	    "MC8775",
 	},
 	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD_875,
-	    "Aircard 875 HSDPA",
+	    "875",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780,
+	    "MC8780",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781,
+	    "MC8781",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880,
+	    "880",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881,
+	    "881",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E,
+	    "880E",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E,
+	    "881E",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U,
+	    "880U",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U,
+	    "881U",
+	},
+	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC885U,
+	    "885U",
 	},
 	{
 	    USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
@@ -6638,6 +6746,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GlobeTrotter HSDPA Icon 225",
 	},
 	{
+	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTICON322,
+	    "GlobeTrotter Icon322 storage",
+	},
+	{
 	    USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341,
 	    "CH341 serial/parallel",
 	},