Regenerate.

1 files changed, 144 insertions, 90 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 3fad36d..da43149 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.81 2002/03/31 21:38:05 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.84 2002/04/06 13:06:07 joe Exp 
  */
 
 /*
@@ -64,6 +64,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
+	    0,
+	    "3Com",
+	    "HomeConnect 3C460",
+	},
+	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B,
+	    0,
+	    "3Com",
+	    "HomeConnect 3C460B",
+	},
+	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
 	    0,
 	    "U.S. Robotics",
@@ -88,18 +100,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
-	    0,
-	    "3Com",
-	    "HomeConnect 3C460",
-	},
-	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B,
-	    0,
-	    "3Com",
-	    "HomeConnect 3C460B",
-	},
-	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1,
 	    0,
 	    "AboCom Systems",
@@ -304,36 +304,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SnapScan e52",
 	},
 	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
-	    0,
-	    "Elecom",
-	    "mouse 29UO",
-	},
-	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0,
-	    0,
-	    "Elecom",
-	    "LD-USB/TX",
-	},
-	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1,
-	    0,
-	    "Elecom",
-	    "LD-USB/TX",
-	},
-	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2,
-	    0,
-	    "Elecom",
-	    "LD-USB/TX",
-	},
-	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3,
-	    0,
-	    "Elecom",
-	    "LD-USB/TX",
-	},
-	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
 	    "Aladdin Knowledge Systems",
@@ -634,6 +604,42 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FM Radio",
 	},
 	{
+	    USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
+	    0,
+	    "Daisy Technology",
+	    "PhotoClip Camera",
+	},
+	{
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
+	    0,
+	    "Dallas Semiconductor",
+	    "J-6502 speakers",
+	},
+	{
+	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
+	    0,
+	    "Diamond",
+	    "Rio 500 USB",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 2",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 4",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 8",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4,
 	    0,
 	    "D-Link",
@@ -682,52 +688,46 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100 ethernet adapter",
 	},
 	{
-	    USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
-	    0,
-	    "Daisy Technology",
-	    "PhotoClip Camera",
-	},
-	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
+	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
-	    "Dallas Semiconductor",
-	    "J-6502 speakers",
+	    "EIZO",
+	    "hub",
 	},
 	{
-	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
+	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
 	    0,
-	    "Diamond",
-	    "Rio 500 USB",
+	    "EIZO",
+	    "monitor",
 	},
 	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
 	    0,
-	    "Digi International",
-	    "AccelePort USB 2",
+	    "Elecom",
+	    "mouse 29UO",
 	},
 	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0,
 	    0,
-	    "Digi International",
-	    "AccelePort USB 4",
+	    "Elecom",
+	    "LD-USB/TX",
 	},
 	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1,
 	    0,
-	    "Digi International",
-	    "AccelePort USB 8",
+	    "Elecom",
+	    "LD-USB/TX",
 	},
 	{
-	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2,
 	    0,
-	    "EIZO",
-	    "hub",
+	    "Elecom",
+	    "LD-USB/TX",
 	},
 	{
-	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_MONITOR,
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3,
 	    0,
-	    "EIZO",
-	    "monitor",
+	    "Elecom",
+	    "LD-USB/TX",
 	},
 	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
@@ -1024,6 +1024,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CD-Writer Plus 8200e",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_1200C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 1220C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_810C,
 	    0,
 	    "Hewlett Packard",
@@ -1090,12 +1096,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Deskjet 970Cse",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5400C,
+	    0,
+	    "Hewlett Packard",
+	    "Scanjet 5400C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
 	    0,
 	    "Hewlett Packard",
 	    "DeskJet 930c",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_P2000U,
+	    0,
+	    "Hewlett Packard",
+	    "Inkjet P-2000U",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
 	    0,
 	    "Hewlett Packard",
@@ -1696,6 +1714,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Midisport 2x2",
 	},
 	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_2300,
+	    0,
+	    "Minolta",
+	    "Dimage 2300",
+	},
+	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304,
+	    0,
+	    "Minolta",
+	    "Dimage S304",
+	},
+	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X,
+	    0,
+	    "Minolta",
+	    "Dimage X",
+	},
+	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
 	    0,
 	    "Mitsumi",
@@ -2092,6 +2128,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UM-1 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880N,
+	    0,
+	    "Roland",
+	    "EDIROL UM-880 MIDI I/F (native)",
+	},
+	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM880G,
+	    0,
+	    "Roland",
+	    "EDIROL UM-880 MIDI I/F (generic)",
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    0,
 	    "Rockfire",
@@ -2100,7 +2148,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    0,
-	    "RATOC Systems,Inc.",
+	    "RATOC Systems, Inc.",
 	    "USB serial adapter REX-USB60",
 	},
 	{
@@ -2296,18 +2344,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Access Device",
 	},
 	{
-	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
-	    0,
-	    "Sun Microsystems",
-	    "Type 6 USB keyboard",
-	},
-	{
-	    USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE,
-	    0,
-	    "Sun Microsystems",
-	    "Type 6 USB mouse",
-	},
-	{
 	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
 	    0,
 	    "SUN Corporation",
@@ -2320,6 +2356,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SUNTAC Slipper U",
 	},
 	{
+	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
+	    0,
+	    "Sun Microsystems",
+	    "Type 6 USB keyboard",
+	},
+	{
+	    USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE,
+	    0,
+	    "Sun Microsystems",
+	    "Type 6 USB mouse",
+	},
+	{
 	    USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
 	    0,
 	    "Diamond (Supra)",
@@ -2530,12 +2578,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Flashbuster-U",
 	},
 	{
-	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
-	    0,
-	    "Yano",
-	    "U640MO-03",
-	},
-	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
 	    0,
 	    "YAMAHA",
@@ -2548,6 +2590,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UX96 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
+	    0,
+	    "Yano",
+	    "U640MO-03",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics",
@@ -3216,7 +3264,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_RATOC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "RATOC Systems,Inc.",
+	    "RATOC Systems, Inc.",
 	    NULL,
 	},
 	{
@@ -3508,6 +3556,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MINOLTA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Minolta",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CTX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Chuntex",