1 files changed, 29 insertions, 7 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index bb9b841d944e..2df13c493528 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -45,6 +45,7 @@ vendor AOX		0x03e8	AOX, Inc.
 vendor ATMEL		0x03eb	Atmel Corp.
 vendor HP		0x03f0	Hewlett Packard
 vendor ADAPTEC		0x03f3	Adaptec, Inc.
+vendor NATIONAL		0x0400	National Semiconductor
 vendor ACERLABS		0x0402	Acer Labs, Inc.
 vendor FTDI		0x0403	Future Technology Devices
 vendor NEC		0x0409	NEC
@@ -226,6 +227,7 @@ vendor ACCTON		0x083a	Accton Technology Corp.
 vendor DIAMOND		0x0841	Diamond
 vendor NETGEAR		0x0846	BayNETGEAR, Inc.
 vendor ACTIVEWIRE	0x0854	ActiveWire, Inc.
+vendor METRICOM		0x0870	Metricom
 vendor ADESSOKBTEK	0x087c	ADESSO/Kbtek America, Inc.
 vendor APT		0x0880	APT Technologies, Inc.
 vendor BOCARESEARCH	0x0885	Boca Research, Inc.
@@ -270,7 +272,7 @@ vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics, Inc.
 vendor DLINK		0x2001	D-Link Corp
 vendor INTEL		0x8086	Intel
-vendor HP2		0xf003	Hewlett Packard (2nd)
+vendor HP2		0xf003	Hewlett Packard
 
 /*
  * List of known products.  Grouped by vendor.
@@ -448,6 +450,7 @@ product EPSON PRINTER3		0x0003	ISD USB Smart Cable
 product EPSON 636		0x0101	Perfection 636U / 636Photo scanner
 product EPSON 610		0x0103	Perfection 610 scanner
 product EPSON 1200		0x0104	Perfection 1200U / 1200Photo scanner
+product EPSON 1600		0x0107	Expression 1600
 
 /* e-TEK Labs products */
 product ETEK 1COM		0x8007	Serial port
@@ -467,22 +470,26 @@ product FREECOM DVD		0xfc01	Connector for DVD drive
 /* Future Technology Devices products */
 product FTDI SERIAL		0x8372	Serial converter
 
+/* Fuji photo products */
+product FUJIPHOTO MASS0100	0x0100	Mass Storage
+
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 
 /* HP products */
 product HP 4100C		0x0101	Scanjet 4100C
-product HP S20			0x0102	PhotoSmart S20
+product HP S20			0x0102	Photosmart S20
 product HP 4200C		0x0105	ScanJet 4200C
 product HP 6200C		0x0201	ScanJet 6200C
 product HP S20b			0x0202	PhotoSmart S20
 product HP 3300C		0x0205	ScanJet 3300C
-product HP 5200			0x0401	Scanjet 5200
+product HP 5200C		0x0401	Scanjet 5200C
 product HP 6300C		0x0601	Scanjet 6300C
+product HP 5300C		0x0701	Scanjet 5300C
 product HP 970CSE		0x1004	Deskjet 970Cse
-product HP P1100		0x3102	PhotoSmart P1100
+product HP P1100		0x3102	Photosmart P1100
 
-/* HP2 products */
+/* HP products */
 product HP2 C500		0x6002	PhotoSmart C500
 
 /* IBM Corporation */
@@ -524,7 +531,7 @@ product KENSINGTON ORBIT	0x1003	Orbit USB/PS2 trackball
 product KENSINGTON TURBOBALL	0x1005	TurboBall
 
 /* Kingston products */
-product KINGSTON KNU101TX	0x000A	KNU101TX USB Ethernet
+product KINGSTON KNU101TX	0x000a	KNU101TX USB Ethernet
 
 /* Kodak products */
 product KODAK DC220		0x0100	Digital Science DC220
@@ -585,6 +592,9 @@ product MCT USB232		0x0210	USB-232 Interface
 /* Melco, Inc products */
 product MELCO LUATX		0x0001	LU-ATX Ethernet
 
+/* Metricom products */
+product METRICOM RICOCHET_GS	0x0001	Ricochet GS
+
 /* Microsoft products */
 product MICROSOFT SIDEPREC	0x0008	SideWinder Precision Pro
 product MICROSOFT INTELLIMOUSE	0x0009	IntelliMouse
@@ -614,8 +624,14 @@ product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
 
 /* Mustek products */
 product MUSTEK 1200CU		0x0001	1200 CU scanner
+product MUSTEK 600CU		0x0002	600 CU scanner
+product MUSTEK 1200USB		0x0003	1200 USB scanner
+product MUSTEK 1200UB		0x0006	1200 UB scanner
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
+/* National Semiconductor */
+product NATIONAL BEARPAW	0x1000	BearPaw 1200
+
 /* NEC products */
 product NEC HUB			0x55aa	hub
 product NEC HUB_B		0x55ab	hub
@@ -653,6 +669,7 @@ product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
 product PLX TESTBOARD		0x9060	test board
 
 /* Primax products */
+product PRIMAX G2X300		0x0300	G2-200 scanner
 product PRIMAX G2E300		0x0301	G2E-300 scanner
 product PRIMAX G2300		0x0302	G2-300 scanner
 product PRIMAX G2E3002		0x0303	G2E-300 scanner
@@ -660,6 +677,7 @@ product PRIMAX 9600		0x0340	Colorado USB 9600 scanner
 product PRIMAX 600U		0x0341	Colorado 600u scanner
 product PRIMAX 19200		0x0360	Colorado USB 19200 scanner
 product PRIMAX 1200U		0x0361	Colorado 1200u scanner
+product PRIMAX G600		0x0380	G2-600 scanner
 product PRIMAX 636I		0x0381	ReadyScan 636i
 product PRIMAX G2600		0x0382	G2-600 scanner
 product PRIMAX G2E600		0x0383	G2E-600 scanner
@@ -754,8 +772,12 @@ product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
 product VISION VC6452V002	0x0002	CPiA Camera
 
 /* Visioneer products */
-product VISIONEER 5300		0x0221	OneTouch 5300 / 7600
+product VISIONEER 7600		0x0211	OneTouch 7600
+product VISIONEER 5300		0x0221	OneTouch 5300
 product VISIONEER 6100		0x0231	OneTouch 6100
+product VISIONEER 6200		0x0311	OneTouch 6200
+product VISIONEER 8100		0x0321	OneTouch 8100
+product VISIONEER 8600		0x0331	OneTouch 8600
 
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet