sync

1 files changed, 125 insertions, 13 deletions

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",
 	},