2 files changed, 79 insertions, 58 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index fe246f663dac..0c393fc60375 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.20 2002/02/14 02:52:50 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.22 2002/04/08 10:26:34 joe Exp 
  */
 
 /*
@@ -187,7 +187,7 @@
 #define	USB_VENDOR_QUICKSHOT	0x057f		/* Quickshot */
 #define	USB_VENDOR_ROLAND	0x0582		/* Roland */
 #define	USB_VENDOR_ROCKFIRE	0x0583		/* Rockfire */
-#define	USB_VENDOR_RATOC	0x0584		/* RATOC Systems,Inc. */
+#define	USB_VENDOR_RATOC	0x0584		/* RATOC Systems, Inc. */
 #define	USB_VENDOR_ZYXEL	0x0586		/* ZyXEL Communication */
 #define	USB_VENDOR_ALCOR	0x058f		/* Alcor Micro */
 #define	USB_VENDOR_IOMEGA	0x059b		/* Iomega */
@@ -405,9 +405,6 @@
 #define	USB_PRODUCT_AGFA_SNAPSCANE26	0x2097		/* SnapScan e26 */
 #define	USB_PRODUCT_AGFA_SNAPSCANE52	0x20fd		/* SnapScan e52 */
 
-/* Agiler products */
-#define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
-
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
@@ -508,13 +505,6 @@
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
 #define	USB_PRODUCT_CYPRESS_FMRADIO	0x1002		/* FM Radio */
 
-/* D-Link products */
-/*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
-#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet adapter */
-#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet adapter */
-#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
-#define	USB_PRODUCT_DLINK_DSB650	0xABC1		/* 10/100 ethernet adapter */
-
 /* Daisy Technology products */
 #define	USB_PRODUCT_DAISY_DMC	0x6901		/* PhotoClip Camera */
 
@@ -529,10 +519,20 @@
 #define	USB_PRODUCT_DIGI_ACCELEPORT4	0x0004		/* AccelePort USB 4 */
 #define	USB_PRODUCT_DIGI_ACCELEPORT8	0x0008		/* AccelePort USB 8 */
 
+/* D-Link products */
+/*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
+#define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet adapter */
+#define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet adapter */
+#define	USB_PRODUCT_DLINK_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
+#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 ethernet adapter */
+
 /* EIZO products */
 #define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
 
+/* Elecom products */
+#define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* mouse 29UO */
+
 /* Elsa products */
 #define	USB_PRODUCT_ELSA_MODEM1	0x2265		/* ELSA Modem Board */
 
@@ -612,18 +612,21 @@
 #define	USB_PRODUCT_HP_815C	0x0204		/* DeskJet 815C */
 #define	USB_PRODUCT_HP_3300C	0x0205		/* ScanJet 3300C */
 #define	USB_PRODUCT_HP_CDW8200	0x0207		/* CD-Writer Plus 8200e */
+#define	USB_PRODUCT_HP_1220C	0x0212		/* DeskJet 1220C */
 #define	USB_PRODUCT_HP_810C	0x0304		/* DeskJet 810C/812C */
 #define	USB_PRODUCT_HP_4300C	0x0305		/* Scanjet 4300C */
 #define	USB_PRODUCT_HP_G85XI	0x0311		/* OfficeJet G85xi */
+#define	USB_PRODUCT_HP_1200	0x0317		/* LaserJet 1200 */
 #define	USB_PRODUCT_HP_5200C	0x0401		/* Scanjet 5200C */
 #define	USB_PRODUCT_HP_830C	0x0404		/* DeskJet 830C */
 #define	USB_PRODUCT_HP_3400CSE	0x0405		/* ScanJet 3400cse */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
 #define	USB_PRODUCT_HP_840C	0x0604		/* DeskJet 840c */
 #define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
-#define	USB_PRODUCT_HP_5400C	0x1105		/* Scanjet 5400C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
+#define	USB_PRODUCT_HP_5400C	0x1005		/* Scanjet 5400C */
 #define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
+#define	USB_PRODUCT_HP_P2000U	0x1801		/* Inkjet P-2000U */
 #define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
@@ -1031,13 +1034,13 @@
 /* Y-E Data products */
 #define	USB_PRODUCT_YEDATA_FLASHBUSTERU	0x0000		/* Flashbuster-U */
 
-/* Yano products */
-#define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
-
 /* Yamaha products */
 #define	USB_PRODUCT_YAMAHA_UX256	0x1000		/* UX256 MIDI I/F */
 #define	USB_PRODUCT_YAMAHA_UX96	0x1008		/* UX96 MIDI I/F */
 
+/* Yano products */
+#define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
+
 /* Zoom Telephonics, Inc. products */
 #define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 0a9f2a2d5fad..499eb6ed898b 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.11.2.20 2002/02/14 02:52:50 joe Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.22 2002/04/08 10:26:34 joe Exp 
  */
 
 /*
@@ -226,12 +226,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "SnapScan e52",
 	},
 	{
-	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
-	    0,
-	    "Elecom",
-	    "mouse 29UO",
-	},
-	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
 	    "Aladdin Knowledge Systems",
@@ -508,30 +502,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "FM Radio",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
-	    0,
-	    "D-Link",
-	    "10Mbps ethernet adapter",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
-	    0,
-	    "D-Link",
-	    "10/100 ethernet adapter",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
-	    0,
-	    "D-Link",
-	    "1/10/100 ethernet adapter",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
-	    0,
-	    "D-Link",
-	    "10/100 ethernet adapter",
-	},
-	{
 	    USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
 	    0,
 	    "Daisy Technology",
@@ -568,6 +538,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "AccelePort USB 8",
 	},
 	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
+	    0,
+	    "D-Link",
+	    "10Mbps ethernet adapter",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX,
+	    0,
+	    "D-Link",
+	    "10/100 ethernet adapter",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA,
+	    0,
+	    "D-Link",
+	    "1/10/100 ethernet adapter",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
+	    0,
+	    "D-Link",
+	    "10/100 ethernet adapter",
+	},
+	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
 	    "EIZO",
@@ -580,6 +574,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "monitor",
 	},
 	{
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
+	    0,
+	    "Elecom",
+	    "mouse 29UO",
+	},
+	{
 	    USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1,
 	    0,
 	    "ELSA",
@@ -868,6 +868,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "CD-Writer Plus 8200e",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_1220C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 1220C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_810C,
 	    0,
 	    "Hewlett Packard",
@@ -886,6 +892,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "OfficeJet G85xi",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_1200,
+	    0,
+	    "Hewlett Packard",
+	    "LaserJet 1200",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
 	    0,
 	    "Hewlett Packard",
@@ -922,16 +934,16 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 5300C",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_5400C,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
 	    0,
 	    "Hewlett Packard",
-	    "Scanjet 5400C",
+	    "Deskjet 970Cse",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5400C,
 	    0,
 	    "Hewlett Packard",
-	    "Deskjet 970Cse",
+	    "Scanjet 5400C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
@@ -940,6 +952,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "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",
@@ -2326,12 +2344,6 @@ 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",
@@ -2344,6 +2356,12 @@ 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",
@@ -3006,7 +3024,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_RATOC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "RATOC Systems,Inc.",
+	    "RATOC Systems, Inc.",
 	    NULL,
 	},
 	{