More USB ethernet tweaks:

- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
  following improvements:
        o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
          quirk. This allows drivers to specify busy waiting only for
          certain transfers (namely control transfers for reading/writing
          registers and stuff).
        o New USBD_FORCE_SHORT_XFER flag can be used to deal with
          devices like the ADMtek Pegasus that sense the end of bulk OUT
          transfers in a special way (if a transfer is exactly a multiple
          of 64 bytes in size, you need to send an extra empty packet
          to terminate the transfer).
        o usbd_open_pipe_intr() now accepts an interval argument which
          can be used to change the rate at which the interrupt callback
          routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
          value specified in the device's config data, but drivers can
          override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
  control transfers. We no longer force the non-tsleep hack for
  bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
  need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
  usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
  when a device has been detached, and use this flag to perform
  tests to prevent the drivers from trying to do control transfers
  if this is the case. This is necessary because calling if_detach()
  with INET6 enabled will eventually result in a call to the driver's
  ioctl() routine to delete the multicast groups on the interface,
  which will result in attempts to perform control transfers. (It's
  possible this also happens even without INET6 support enabled.) This
  is pointless since we know that if the detach method has been called,
  the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
  to initialize the device states without trying to close and re-open the
  pipes. This is partly because we don't want to frob things at interrupt
  context, but also because this doesn't seem to work right and I don't
  want to panic the system just because a USB device may have stopped
  responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
  transfer is needed. Unfortunately, the design of the chip makes it hard
  to get this exactly right. Hopefully, this will go away once either
  Nick or Lennart finds the bug in the uhci driver that makes this ugly
  hack necessary.
- Also sync usbdevs with NetBSD.

1 files changed, 216 insertions, 188 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index b7a6a4c..d7df50b 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -52,7 +52,7 @@ vendor SUN		0x0430	Sun Microsystems
 vendor LEXMARK		0x043d	Lexmark International Inc.
 vendor NANAO		0x0440	NANAO Corp.
 vendor THRUST		0x044f	Thrustmaster
-vendor TI		0x0451  Texas Instruments
+vendor TI		0x0451	Texas Instruments
 vendor KYE		0x0458	KYE Systems Corp.
 vendor MICROSOFT	0x045e	Microsoft
 vendor PRIMAX		0x0461	Primax Electronics
@@ -100,22 +100,26 @@ vendor QTRONIX		0x05c7	Qtronix Corp
 vendor ELSA		0x05cc	ELSA Gmbh
 vendor EIZONANAO	0x05e7	EIZO Nanao
 vendor KLSI		0x05e9	Kawasaki LSI
-vendor PIENGINEERING	0x05f3  P.I. Engineering
+vendor PIENGINEERING	0x05f3	P.I. Engineering
 vendor CHIC		0x05fe	Chic Technology
+vendor SOLIDYEAR	0x060b	Solid Year
 vendor MACALLY		0x0618	Macally
-vendor LINKSYS		0x066B	LinkSys
+vendor LINKSYS		0x066b	Linksys Inc.
 vendor MULTITECH	0x06e0	MultiTech
 vendor ADS		0x06e1	ADS Technologies
+vendor SIRIUS		0x06ea	Sirius Technologies
 vendor SMC		0x0707	Standard Microsystems Corp
 vendor MIDIMAN		0x0763	Midiman
 vendor SANDISK		0x0781	SanDisk Corp
 vendor ADMTEK		0x07a6	ADMtek Inc.
 vendor COREGA		0x07aa	Corega
 vendor SIIG		0x07cc	SIIG
+vendor ZOOM		0x0803	Zoom Telephonics Inc.
 vendor HANDSPRING	0x082d	Handspring Inc.
-vendor ACTIVEWIRE	0x0854	ActiveWire Inc.
+vendor DIAMOND		0x0841	Diamond
 vendor NETGEAR		0x0846	BayNETGEAR Inc.
-vendor BILLIONTON	0x08DD	Billionton Systems
+vendor ACTIVEWIRE	0x0854	ActiveWire Inc.
+vendor BILLIONTON	0x08dd	Billionton Systems Inc.
 vendor MOTOROLA		0x1063	Motorola
 vendor PLX		0x10b5	PLX
 vendor INSIDEOUT	0x1608	Inside Out Networks
@@ -127,187 +131,176 @@ vendor INTEL		0x8086	Intel
  * List of known products.  Grouped by vendor.
  */
 
-/* AOX Inc. products */
-product AOX USB101		0x0008	USB ethernet controller engine
+/* 3Com products */
+product 3COM HOMECONN		0x009d	HomeConnect USB Camera
+product 3COM 3C19250		0x03E8	3C19250 Ethernet adapter
+product 3COM USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 
-/* HP products */
-product HP 4100C		0x0101	Scanjet 4100C
-product HP 6300C		0x0601	Scanjet 6300C
+product 3COMUSR USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 
-/* NEC products */
-product NEC HUB			0x55aa	hub
-product NEC HUB_B		0x55ab	hub
+/* Acer products */
+product ACER ACERSCAN_C310U	0x12a6	Acerscan C310U
 
-/* Kodak products */
-product KODAK DC260		0x0110	Digital Science DC260
-product KODAK DC240		0x0120	Digital Science DC240
-product KODAK DC280		0x0130	Digital Science DC280
+/* ActiveWire Inc. products */
+product ACTIVEWIRE IOBOARD	0x0100	I/O Board
+product ACTIVEWIRE IOBOARD_FW1	0x0101	I/O Board, rev. 1 firmware
 
-/* Melco products */
-product MELCO LUATX		0x0001	LU-ATX Ethernet adapter
+/* ADMtek products */
+product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet adapter
 
-/* CATC products */
-product CATC ANDROMEDA		0x1237	Andromeda hub
-product CATC NETMATE		0x000a	Netmate ethernet adapter
-product CATC NETMATE2		0x000c	Netmate2 ethernet adapter
-product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
+/* ADS products */
+product ADS UBS10BT		0x0008	UBS-10BT Ethernet adapter
 
-/* Gravis products */
-product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
+/* Agiler products */
+product ELECOM MOUSE29UO	0x0002	mouse 29UO
 
-/* Sun Microsystems products */
-product SUN KEYBOARD		0x0005	Type 6 USB
-/* XXX The above is a North American PC style keyboard possibly */
+/* AKS products */
+product AKS USBHASP		0x0001	USB-HASP 0.06
 
-/* Lexmark products */
-product LEXMARK S2450		0x0009	Optra S 2450
+/* Altec Lansing products */
+product ALTEC ASC495		0xff05	ASC495 Speakers
 
-/* Thrustmaster products */
-product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
+/* American Power Conversion products */
+product APC UPSPRO500		0x0002	Back-UPS Pro 500
 
-/* Texas Intel products */
-product TI UTUSB41		0x1446	UT-USB41 hub
+/* Anchor products */
+product ANCHOR EZUSB		0x2131	EZUSB
 
-/* (KYE) Genius products */
-product KYE NICHE		0x0001	Niche mouse
-product KYE FLIGHT2000		0x1004	Flight 2000 joystick
+/* AOX Inc. products */
+product AOX USB101		0x0008	USB ethernet controller engine
 
-/* Microsoft products */
-product MICROSOFT INTELLIMOUSE	0x0009	IntelliMouse
-product MICROSOFT NATURALKBD	0x000b	Natural Keyboard Elite
-product MICROSOFT DDS80		0x0014	Digital Sound System 80
+/* ATen products */
+product ATEN UC1284		0x2001	Parallel printer adapter
+product ATEN UC10T		0x2002	10Mbps ethernet adapter
 
-/* Primax products */
-product PRIMAX COMFORT		0x4d01	Comfort
-product PRIMAX MOUSEINABOX	0x4d02	Mouse-in-a-Box
+/* Belkin products */
+/*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
 
-/* Cherry products */
-product CHERRY MY3000KBD	0x0001	My3000 keyboard
-product CHERRY MY3000HUB	0x0003	My3000 hub
+/* Billionton products */
+product BILLIONTON USB100	0x0986	USB100N 10/100 FastEthernet Adapter
+
+/* Brother Industries products */
+product BROTHER HL1050		0x0002	HL-1050 laser printer
 
 /* Behavior Technology Computer products */
 product BTC BTC7932		0x6782	Keyboard with mouse port
 
-/* Philips products */
-product PHILIPS DSS350		0x0101	DSS 350 Digital Speaker System
-product PHILIPS DSS		0x0104	DSS XXX Digital Speaker System
-product PHILIPS HUB		0x0201	hub
-product PHILIPS DSS150		0x0471	DSS XXX Digital Speaker System
-
-/* Connectix products */
-product CONNECTIX QUICKCAM	0x0001	QuickCam
-
-/* Lucent products */
-product LUCENT EVALKIT		0x1001	USS-720 evaluation kit
-
-/* STMicroelectronics products */
-product STMICRO COMMUNICATOR	0x7554	USB Communicator
-
-/* Acer products */
-product ACER ACERSCAN_C310U	0x12a6	Acerscan C310U
-
 /* Canon Inc. products */
 product CANON S10		0x3041	PowerShot S10
 
-/* Cypress Semiconductor products */
-product CYPRESS MOUSE		0x0001	mouse
-product CYPRESS THERMO		0x0002	thermometer
-
-/* Epson products */
-product EPSON PRINTER2		0x0002	ISD USB Smart Cable for Mac
-product EPSON PRINTER3		0x0003	ISD USB Smart Cable
-
-/* 3Com products */
-product 3COMUSR USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
-
-/* Konica Corp. Products */
-product KONICA CAMERA		0x0720	Digital Color Camera
+/* CATC products */
+product CATC NETMATE		0x000a	Netmate ethernet adapter
+product CATC NETMATE2		0x000c	Netmate2 ethernet adapter
+product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
+product CATC ANDROMEDA		0x1237	Andromeda hub
 
-/* Altec Lansing products */
-product	ALTEC ASC495		0xff05	ASC495 Speakers
+/* Cherry products */
+product CHERRY MY3000KBD	0x0001	My3000 keyboard
+product CHERRY MY3000HUB	0x0003	My3000 hub
 
-/* Shuttle Technology products */
-product SHUTTLE EUSB		0x0001	E-USB Bridge
+/* Chic Technology products */
+product CHIC MOUSE1		0x0001	mouse
 
 /* Chicony products */
 product CHICONY KB8933		0x0001	KB-8933 keyboard
 
-/* Brother Industries products */
-product	BROTHER HL1050		0x0002	HL-1050 laser printer
-
-/* Dallas Semiconductor products */
-product DALLAS J6502		0x4201	J-6502 speakers
-
-/* 3Com products */
-product 3COM 3C19250		0x03E8	3C19250 Ethernet adapter
+/* Connectix products */
+product CONNECTIX QUICKCAM	0x0001	QuickCam
 
-/* Kawatsu products */
-product KAWATSU MH4000P		0x0003	MiniHub 4000P
+/* Corega products */
+product COREGA ETHER_USB_T	0x0001	Ether USB-T
 
-/* American Power Conversion products */
-product APC UPSPRO500		0x0002	Back-UPS Pro 500
+/* Cypress Semiconductor products */
+product CYPRESS MOUSE		0x0001	mouse
+product CYPRESS THERMO		0x0002	thermometer
 
-/* NetChip Technology Products */
-product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
+/* D-Link products */
+/*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
+product DLINK DSB650C		0x4000	10Mbps ethernet adapter
+product DLINK DSB650TX		0x4002	10/100 ethernet adapter
+product DLINK DSB650TX_PNA	0x4003	1/10/100 ethernet adapter
 
-/* AKS products */
-product AKS USBHASP		0x0001	USB-HASP 0.06
+/* Dallas Semiconductor products */
+product DALLAS J6502		0x4201	J-6502 speakers
 
-/* Universal Access products */
-product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
+/* Diamond products */
+product DIAMOND RIO500USB	0x0001	Rio 500 USB
 
-/* Anchor products */
-product ANCHOR EZUSB		0x2131	EZUSB
+/* EIZO products */
+product EIZO HUB		0x0000	hub
+product EIZO MONITOR		0x0001	monitor
 
-/* Vision products */
-product VISION VC6452V002	0x0002	VC6452V002 Camera
+/* Elsa products */
+product ELSA MODEM1		0x2265	ELSA Modem Board
 
-/* ATen products */
-product ATEN UC1284		0x2001	Parallel printer adapter
-product ATEN UC10T		0x2002	10Mbps ethernet adapter
+/* Entrega products */
+product ENTREGA 1S		0x0001	1S serial connector
+product ENTREGA 2S		0x0002	2S serial connector
+product ENTREGA 1S25		0x0003	1S25 serial connector
+product ENTREGA 4S		0x0004	4S serial connector
+product ENTREGA E45		0x0005	E45 Ethernet adapter
+product ENTREGA CENTRONICS	0x0006	Centronics connector
+product ENTREGA 1S9		0x0093	1S9 serial connector
+product ENTREGA EZUSB		0x8000	EZ-USB
+/*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
+/*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
-/* Mustek products */
-product MUSTEK MDC800		0xa800	MDC-800 digital camera
+/* e-TEK Labs products */
+product ETEK 1COM		0x8007	Serial port
 
-/* Telex Communications products */
-product TELEX MIC1		0x0001	Enhanced USB Microphone
+/* Epson products */
+product EPSON PRINTER2		0x0002	ISD USB Smart Cable for Mac
+product EPSON PRINTER3		0x0003	ISD USB Smart Cable
 
-/* Peracom products */
-product PERACOM SERIAL1		0x0001	Serial Converter
-product PERACOM ENET		0x0002	Ethernet adapter
-product PERACOM ENET2		0x0005	Ethernet adapter
+/* Gravis products */
+product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
 
-/* Wacom products */
-product WACOM CT0405U		0x0000	CT-0405-U Tablet
+/* Handspring Inc. */
+product HANDSPRING VISOR	0x0100	Handspring Visor
 
-/* e-TEK Labs products */
-product ETEK 1COM		0x8007	Serial port
+/* HP products */
+product HP 4100C		0x0101	Scanjet 4100C
+product HP S20			0x0102	Photosmart S20
+product HP 5200			0x0401	Scanjet 5200
+product HP 6300C		0x0601	Scanjet 6300C
+product HP 970CSE		0x1004	Deskjet 970Cse
+product HP P1100		0x3102	Photosmart P1100
 
-/* EIZO products */
-product EIZO HUB		0x0000	hub
-product EIZO MONITOR		0x0001	monitor
+/* Inside Out Networks products */
+product INSIDEOUT EDGEPORT4	0x0001	EdgePort/4 serial ports
 
-/* Agiler products */
-product ELECOM MOUSE29UO	0x0002	mouse 29UO
+/* In-System products */
+product INSYSTEM F5U002		0x0002	Parallel printer adapter
+product INSYSTEM ISD110		0x0200  IDE adapter
 
-/* Rockfire products */
-product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
+/* Intel products */
+product INTEL TESTBOARD		0x9890	82930 test board
 
 /* Iomega products */
 product IOMEGA ZIP100		0x0001	Zip 100
 
-/* OmniVision Technologies Inc. products */
-product OMNIVISION OV511	0x0511	OV511 Camera
+/* Kawatsu products */
+product KAWATSU MH4000P		0x0003	MiniHub 4000P
 
-/* In-System products */
-product INSYSTEM F5U002		0x0002	Parallel printer adapter
-product INSYSTEM ISD110		0x0200  IDE adapter
+/* Kodak products */
+product KODAK DC260		0x0110	Digital Science DC260
+product KODAK DC265		0x0111	Digital Science DC265
+product KODAK DC290		0x0111	Digital Science DC290
+product KODAK DC240		0x0120	Digital Science DC240
+product KODAK DC280		0x0130	Digital Science DC280
 
-/* Qtronix products */
-product QTRONIX 980N		0x2011	Scorpion-980N keyboard
+/* Konica Corp. Products */
+product KONICA CAMERA		0x0720	Digital Color Camera
 
-/* Elsa products */
-product ELSA MODEM1		0x2265	ELSA Modem Board
+/* KYE products */
+product KYE NICHE		0x0001	Niche mouse
+product KYE FLIGHT2000		0x1004	Flight 2000 joystick
+
+/* Lexmark products */
+product LEXMARK S2450		0x0009	Optra S 2450
+
+/* Linksys products */
+product LINKSYS USB100TX	0x2203	USB100TX Ethernet
 
 /* Logitech products */
 product LOGITECH M2452		0x0203	M2452 keyboard
@@ -317,81 +310,116 @@ product LOGITECH QUICKCAMPRO	0x0810	QuickCam Pro
 product LOGITECH N48		0xc001	N48 mouse
 product LOGITECH MBA47		0xc002	M-BA47 mouse
 
-/* P.I. Engineering products */
-product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
-
-/* Chic Technology products */
-product CHIC MOUSE1		0x0001	mouse
+/* Lucent products */
+product LUCENT EVALKIT		0x1001	USS-720 evaluation kit
 
 /* Macally products */
 product MACALLY MOUSE1		0x0101	mouse
 
-/* LinkSys products */
-product LINKSYS USB100TX	0x2203	10/100 ethernet adapter
+/* Melco Inc products */
+product MELCO LUATX		0x0001	LU-ATX Ethernet
+
+/* Microsoft products */
+product MICROSOFT INTELLIMOUSE	0x0009	IntelliMouse
+product MICROSOFT NATURALKBD	0x000b	Natural Keyboard Elite
+product MICROSOFT DDS80		0x0014	Digital Sound System 80
+product MICROSOFT SIDEWINDER	0x001a	Sidewinder Precision Racing Wheel
+
+/* Midiman products */
+product MIDIMAN MIDISPORT2X2	0x1001	Midisport 2x2
+
+/* Motorola products */
+product MOTOROLA MC141555	0x1555	MC141555 hub controller
 
 /* MultiTech products */
 product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
 
-/* ADS products */
-product ADS ENET		0x0008	Ethernet adapter
+/* Mustek products */
+product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
-/* SMC products */
-product SMC 2102USB		0x0100	10Mbps ethernet adapter
-product SMC 2202USB		0x0200	10/100 ethernet adapter
+/* NEC products */
+product NEC HUB			0x55aa	hub
+product NEC HUB_B		0x55ab	hub
 
-/* Entrega products */
-product ENTREGA 1S		0x0001	1S serial connector
-product ENTREGA 2S		0x0002	2S serial connector
-product ENTREGA 1S25		0x0003	1S25 serial connector
-product ENTREGA 4S		0x0004	4S serial connector
-product ENTREGA E45		0x0005	E45 Ethernet adapter
-product ENTREGA CENTRONICS	0x0006	Centronics connector
-product ENTREGA 1S9		0x0093	1S9 serial connector
-product ENTREGA EZUSB		0x8000	EZ-USB
-product ENTREGA SERIAL		0x8001	DB25 Serial connector
-product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector
+/* NetChip Technology Products */
+product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
 
-/* Midiman products */
-product MIDIMAN MIDISPORT2X2	0x1001	Midisport 2x2
+/* Netgear products */
+product NETGEAR EA101		0x1001	Ethernet adapter
 
-/* SanDisk products */
-product	SANDISK IMAGEMATE	0x0001	USB ImageMate
+/* OmniVision Technologies Inc. products */
+product OMNIVISION OV511	0x0511	OV511 Camera
 
-/* ADMtek products */
-product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet adapter
+/* Peracom products */
+product PERACOM SERIAL1		0x0001	Serial Converter
+product PERACOM ENET		0x0002	Ethernet adapter
+product PERACOM ENET2		0x0005	Ethernet adapter
 
-/* Corega products */
-product COREGA USB_T		0x0001	USB ethernet adapter
+/* Philips products */
+product PHILIPS DSS350		0x0101	DSS 350 Digital Speaker System
+product PHILIPS DSS		0x0104	DSS XXX Digital Speaker System
+product PHILIPS HUB		0x0201	hub
+product PHILIPS DSS150		0x0471	DSS XXX Digital Speaker System
+
+/* P.I. Engineering products */
+product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
+
+/* PLX products */
+product PLX TESTBOARD		0x9060	test board
+
+/* Primax products */
+product PRIMAX COMFORT		0x4d01	Comfort
+product PRIMAX MOUSEINABOX	0x4d02	Mouse-in-a-Box
+
+/* Rockfire products */
+product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
+
+/* Qtronix products */
+product QTRONIX 980N		0x2011	Scorpion-980N keyboard
+
+/* SanDisk products */
+product SANDISK IMAGEMATE	0x0001	USB ImageMate
+
+/* Shuttle Technology products */
+product SHUTTLE EUSB		0x0001	E-USB Bridge
 
 /* SIIG products */
 product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
 
-/* Handspring Inc. */
-product	HANDSPRING VISOR	0x0100	Handspring Visor
+/* Sirius Technologies products */
+product SIRIUS ROADSTER		0x0001	NetComm Roadster II 56 USB
 
-/* ActiveWire Inc. products */
-product ACTIVEWIRE IOBOARD	0x0100	I/O Board
-product ACTIVEWIRE IOBOARD_FW1	0x0101	I/O Board, rev. 1 firmware
+/* SMC products */
+product SMC 2102USB		0x0100	10Mbps ethernet adapter
+product SMC 2202USB		0x0200	10/100 ethernet adapter
 
-/* Netgear products */
-product NETGEAR EA101		0x1001	Ethernet adapter
+/* SOLID YEAR products */
+product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
 
-/* Billionton products */
-product BILLIONTON USB100	0x0986	USB100 Ethernet adapter
+/* STMicroelectronics products */
+product STMICRO COMMUNICATOR	0x7554	USB Communicator
 
-/* Motorola products */
-product	MOTOROLA MC141555	0x1555	MC141555 hub controller
+/* Sun Microsystems products */
+product SUN KEYBOARD		0x0005	Type 6 USB
+/* XXX The above is a North American PC style keyboard possibly */
 
-/* PLX products */
-product PLX TESTBOARD		0x9060	test board
+/* Telex Communications products */
+product TELEX MIC1		0x0001	Enhanced USB Microphone
 
-/* Inside Out Networks products */
-product INSIDEOUT EDGEPORT4	0x0001	EdgePort/4 serial ports
+/* Texas Intel products */
+product TI UTUSB41		0x1446	UT-USB41 hub
 
-/* D-Link products */
-product DLINK DSB650C		0x4000	10Mbps ethernet adapter
-product DLINK DSB650TX		0x4002	10/100 ethernet adapter
-product DLINK DSB650TX_PNA	0x4003	1/10/100 ethernet adapter
+/* Thrustmaster products */
+product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
 
-/* Intel products */
-product INTEL TESTBOARD		0x9890	82930 test board
+/* Universal Access products */
+product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
+
+/* Vision products */
+product VISION VC6452V002	0x0002	VC6452V002 Camera
+
+/* Wacom products */
+product WACOM CT0405U		0x0000	CT-0405-U Tablet
+
+/* Zoom Telephonics Inc. products */
+product ZOOM 2986L		0x9700	2986L Fax modem