sync

1 files changed, 134 insertions, 14 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 7109ea2f0f0..6237561abbf 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.59 2002/09/27 18:42:35 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.60 2002/11/10 18:55:48 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.56 2002/09/27 18:41:57 nate Exp 
+ *	OpenBSD: usbdevs,v 1.57 2002/11/10 18:55:14 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.261 2002/07/16 09:19:29 abs Exp $ */
+/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -419,6 +419,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Speakers",
 	},
 	{
+	    USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230,
+	    0,
+	    "Asahi Optical",
+	    "PENTAX Optio230",
+	},
+	{
 	    USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA,
 	    0,
 	    "Asante",
@@ -527,6 +533,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USBE100",
 	},
 	{
+	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033,
+	    0,
+	    "Broadcom",
+	    "BCM2033",
+	},
+	{
+	    USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033NF,
+	    0,
+	    "Broadcom",
+	    "BCM2033 (no fw)",
+	},
+	{
 	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
 	    0,
 	    "Brother Industries",
@@ -551,12 +569,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "PowerShot S10",
 	},
 	{
-	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100,
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S20,
+	    0,
+	    "Canon",
+	    "PowerShot S20",
+	},
+	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100_US,
+	    0,
+	    "Canon",
+	    "PowerShot S100",
+	},
+	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S100_EU,
 	    0,
 	    "Canon",
 	    "PowerShot S100",
 	},
 	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_G1,
+	    0,
+	    "Canon",
+	    "PowerShot G1",
+	},
+	{
+	    USB_VENDOR_CANON, USB_PRODUCT_CANON_A20,
+	    0,
+	    "Canon",
+	    "PowerShot A20",
+	},
+	{
 	    USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE,
 	    0,
 	    "Computer Access Technology",
@@ -707,13 +749,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FEther USB-TXS",
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_II,
+	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
 	    0,
 	    "Creative Labs",
 	    "Nomad II",
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_IIMG,
+	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_IIMG,
 	    0,
 	    "Creative Labs",
 	    "Nomad II MG",
@@ -737,6 +779,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "thermometer",
 	},
 	{
+	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_KBDHUB,
+	    0,
+	    "Cypress Semiconductor",
+	    "Keyboard/Hub",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_FMRADIO,
 	    0,
 	    "Cypress Semiconductor",
@@ -800,7 +848,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    0,
 	    "D-Link",
-	    "10Mbps Ethernet",
+	    "10Mbps ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1,
@@ -812,13 +860,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
 	    0,
 	    "D-Link",
-	    "10/100 Ethernet",
+	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
 	    0,
 	    "D-Link",
-	    "1/10/100 Ethernet",
+	    "1/10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3,
@@ -836,7 +884,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
 	    0,
 	    "D-Link",
-	    "10/100 Ethernet",
+	    "10/100 ethernet",
 	},
 	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
@@ -1109,12 +1157,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "GeneLink Host-Host Bridge",
 	},
 	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650,
+	    0,
+	    "Genesys Logic",
+	    "GL650 Hub",
+	},
+	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
 	    0,
 	    "Genesys Logic",
 	    "GL641USB CompactFlash",
 	},
 	{
+	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
+	    0,
+	    "GoHubs",
+	    "GoCOM232 Serial converter",
+	},
+	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
 	    0,
 	    "Advanced Gravis Computer",
@@ -1517,6 +1577,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ATAPI adapter",
 	},
 	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_IDEUSB2,
+	    0,
+	    "In-System Design",
+	    "USB2 Storage Adapter",
+	},
+	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
 	    0,
 	    "In-System Design",
@@ -2006,13 +2072,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
 	    "Logitech",
-	    "M2452",
+	    "M2452 keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
 	    0,
 	    "Logitech",
-	    "M4848",
+	    "M4848 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_PAGESCAN,
@@ -2045,6 +2111,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "QuickCam",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO3k,
+	    0,
+	    "Logitech",
+	    "QuickCam Pro 3000",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
 	    0,
 	    "Logitech",
@@ -2207,6 +2279,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LUA-KTX Ethernet",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KS11G,
+	    0,
+	    "Melco",
+	    "WLI-USB-KS11G USB-wlan",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -2384,7 +2462,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS,
 	    0,
 	    "MultiTech",
-	    "MT5634ZBA",
+	    "MT5634ZBA modem",
 	},
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU,
@@ -2477,6 +2555,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB2.0 Hub",
 	},
 	{
+	    USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010,
+	    0,
+	    "Neodio",
+	    "Multi-format Flash Controller",
+	},
+	{
 	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT,
 	    0,
 	    "NetChip Technology",
@@ -2615,6 +2699,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Palm m505",
 	},
 	{
+	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M515,
+	    0,
+	    "Palm Computing",
+	    "Palm m515",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M125,
 	    0,
 	    "Palm Computing",
@@ -2783,6 +2873,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Express Ethernet",
 	},
 	{
+	    USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH,
+	    0,
+	    "PQI",
+	    "Travel Flash Drive",
+	},
+	{
 	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
 	    0,
 	    "Primax Electronics",
@@ -3551,6 +3647,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Intuos A5",
 	},
 	{
+	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
+	    0,
+	    "Xirlink",
+	    "Imaging Device",
+	},
+	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
 	    0,
 	    "Xirlink",
@@ -3671,7 +3773,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_CREATIVELABS, 0,
+	    USB_VENDOR_CREATIVE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Creative Labs",
 	    NULL,
@@ -5039,6 +5141,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GOHUBS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "GoHubs",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BIOMETRIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "American Biometric Company",
@@ -5201,6 +5309,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_NEODIO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Neodio",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_TODOS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Todos Data System",
@@ -5351,6 +5465,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PQI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "PQI",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_DAISY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Daisy Technology",