From 1ea26b29b66a805800f21b598789f94e673ad160 Mon Sep 17 00:00:00 2001 From: Josef Karthauser Date: Sat, 6 Apr 2002 13:01:39 +0000 Subject: [PATCH] Synchronise with NetBSD for order and formatting; no functional changes. --- sys/dev/usb/usbdevs | 76 +++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 5f5a603f0c54..6ef19b79bcb8 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -181,7 +181,7 @@ vendor AVM 0x057c AVM GmbH vendor QUICKSHOT 0x057f Quickshot vendor ROLAND 0x0582 Roland vendor ROCKFIRE 0x0583 Rockfire -vendor RATOC 0x0584 RATOC Systems,Inc. +vendor RATOC 0x0584 RATOC Systems, Inc. vendor ZYXEL 0x0586 ZyXEL Communication vendor ALCOR 0x058f Alcor Micro vendor IOMEGA 0x059b Iomega @@ -357,19 +357,19 @@ vendor HP2 0xf003 Hewlett Packard 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 +product 3COM 3C460 0x11f8 HomeConnect 3C460 +product 3COM 3C460B 0x4601 HomeConnect 3C460B product 3COMUSR OFFICECONN 0x0082 3Com OfficeConnect Analog Modem product 3COMUSR USRISDN 0x008f 3Com U.S. Robotics Pro ISDN TA product 3COMUSR HOMECONN 0x009d 3Com HomeConnect camera product 3COMUSR USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro -product 3COM 3C460 0x11f8 HomeConnect 3C460 -product 3COM 3C460B 0x4601 HomeConnect 3C460B /* AboCom products */ product ABOCOM XX1 0x110c XX1 product ABOCOM XX2 0x200c XX2 product ABOCOM URE450 0x4000 URE450 Ethernet Adapter -product ABOCOM UFE1000 0x4002 UFE1000 Fast Ethernet Adapter +product ABOCOM UFE1000 0x4002 UFE1000 Fast Ethernet Adapter product ABOCOM DSB650TX_PNA 0x4003 1/10/100 ethernet adapter product ABOCOM XX4 0x4004 XX4 product ABOCOM XX5 0x4007 XX5 @@ -381,7 +381,7 @@ product ABOCOM XX10 0xabc1 XX10 /* Accton products */ product ACCTON USB320_EC 0x1046 USB320-EC Ethernet Adapter -product ACCTON SS1001 0x5046 SpeedStream Ethernet Adapter +product ACCTON SS1001 0x5046 SpeedStream Ethernet Adapter /* Acer Peripherals, Inc. products */ product ACERP ACERSCAN_C310U 0x12a6 Acerscan C310U @@ -415,13 +415,6 @@ product AGFA SNAPSCANE25 0x2095 SnapScan e25 product AGFA SNAPSCANE26 0x2097 SnapScan e26 product AGFA SNAPSCANE52 0x20fd SnapScan e52 -/* Agiler products */ -product ELECOM MOUSE29UO 0x0002 mouse 29UO -product ELECOM LDUSBTX0 0x200c LD-USB/TX -product ELECOM LDUSBTX1 0x4002 LD-USB/TX -product ELECOM LDUSBTX2 0x400b LD-USB/TX -product ELECOM LDUSBTX3 0xabc1 LD-USB/TX - /* AKS products */ product AKS USBHASP 0x0001 USB-HASP 0.06 @@ -513,7 +506,7 @@ product CONNECTIX QUICKCAM 0x0001 QuickCam /* Corega products */ product COREGA ETHER_USB_T 0x0001 Ether USB-T product COREGA FETHER_USB_TX 0x0004 FEther USB-TX -product COREGA FETHER_USB_TXS 0x000d FEther USB-TXS +product COREGA FETHER_USB_TXS 0x000d FEther USB-TXS /* Creative products */ product CREATIVE NOMAD_II 0x1002 Nomad II MP3 player @@ -526,17 +519,6 @@ product CYPRESS MOUSE 0x0001 mouse product CYPRESS THERMO 0x0002 thermometer product CYPRESS FMRADIO 0x1002 FM Radio -/* D-Link products */ -/*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ -product DLINK DSB650TX4 0x200c 10/100 ethernet adapter -product DLINK DSB650C 0x4000 10Mbps ethernet adapter -product DLINK DSB650TX1 0x4001 10/100 ethernet adapter -product DLINK DSB650TX 0x4002 10/100 ethernet adapter -product DLINK DSB650TX_PNA 0x4003 1/10/100 ethernet adapter -product DLINK DSB650TX3 0x400b 10/100 ethernet adapter -product DLINK DSB650TX2 0x4102 10/100 ethernet adapter -product DLINK DSB650 0xabc1 10/100 ethernet adapter - /* Daisy Technology products */ product DAISY DMC 0x6901 PhotoClip Camera @@ -551,10 +533,28 @@ product DIGI ACCELEPORT2 0x0002 AccelePort USB 2 product DIGI ACCELEPORT4 0x0004 AccelePort USB 4 product DIGI ACCELEPORT8 0x0008 AccelePort USB 8 +/* D-Link products */ +/*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ +product DLINK DSB650TX4 0x200c 10/100 ethernet adapter +product DLINK DSB650C 0x4000 10Mbps ethernet adapter +product DLINK DSB650TX1 0x4001 10/100 ethernet adapter +product DLINK DSB650TX 0x4002 10/100 ethernet adapter +product DLINK DSB650TX_PNA 0x4003 1/10/100 ethernet adapter +product DLINK DSB650TX3 0x400b 10/100 ethernet adapter +product DLINK DSB650TX2 0x4102 10/100 ethernet adapter +product DLINK DSB650 0xabc1 10/100 ethernet adapter + /* EIZO products */ product EIZO HUB 0x0000 hub product EIZO MONITOR 0x0001 monitor +/* Elecom products */ +product ELECOM MOUSE29UO 0x0002 mouse 29UO +product ELECOM LDUSBTX0 0x200c LD-USB/TX +product ELECOM LDUSBTX1 0x4002 LD-USB/TX +product ELECOM LDUSBTX2 0x400b LD-USB/TX +product ELECOM LDUSBTX3 0xabc1 LD-USB/TX + /* Elsa products */ product ELSA MODEM1 0x2265 ELSA Modem Board product ELSA USB2ETHERNET 0x3000 Microlink USB2Ethernet @@ -740,7 +740,7 @@ product LINKSYS USB10T 0x2202 USB10T Ethernet product LINKSYS USB100TX 0x2203 USB100TX Ethernet product LINKSYS USB100H1 0x2204 USB100H1 Ethernet/HPNA product LINKSYS USB10TA 0x2206 USB10TA Ethernet -product LINKSYS USB10TX2 0x400b USB10TX +product LINKSYS USB10TX2 0x400b USB10TX /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard @@ -810,14 +810,14 @@ product MICROTEK V6UL 0x80ac ScanMaker V6UL /* Midiman products */ product MIDIMAN MIDISPORT2X2 0x1001 Midisport 2x2 -/* Mitsumi products */ -product MITSUMI CDRRW 0x0000 CD-R/RW Drive - /* Minolta Co., Ltd. */ product MINOLTA 2300 0x4001 Dimage 2300 product MINOLTA S304 0x4007 Dimage S304 product MINOLTA X 0x4009 Dimage X +/* Mitsumi products */ +product MITSUMI CDRRW 0x0000 CD-R/RW Drive + /* Motorola products */ product MOTOROLA MC141555 0x1555 MC141555 hub controller @@ -932,11 +932,13 @@ product RAINBOW IKEY2000 0x1200 i-Key 2000 /* Roland products */ product ROLAND UM1 0x0009 UM-1 MIDI I/F +product ROLAND UM880N 0x0014 EDIROL UM-880 MIDI I/F (native) +product ROLAND UM880G 0x0015 EDIROL UM-880 MIDI I/F (generic) /* Rockfire products */ product ROCKFIRE GAMEPAD 0x2033 gamepad 203USB -/* RATOC Systems, Inc. */ +/* RATOC Systems products */ product RATOC REXUSB60 0xb000 USB serial adapter REX-USB60 /* SanDisk products */ @@ -961,7 +963,7 @@ product SHUTTLE EUSCSI_C 0x000c eUSCSI Bridge product SHUTTLE CDRW 0x0101 CD-RW Device /* Siemens products */ -product SIEMENS SPEEDSTREAM 0x1001 SpeedStream USB +product SIEMENS SPEEDSTREAM 0x1001 SpeedStream USB /* SIIG products */ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader @@ -999,15 +1001,15 @@ product STMICRO COMMUNICATOR 0x7554 USB Communicator /* STSN products */ product STSN STSN0001 0x0001 Internet Access Device +/* SUN Corporation products */ +product SUNTAC PS64P1 0x0005 SUNTAC U-Cable type P1 +product SUNTAC VS10U 0x0009 SUNTAC Slipper U + /* Sun Microsystems products */ product SUN KEYBOARD 0x0005 Type 6 USB keyboard /* XXX The above is a North American PC style keyboard possibly */ product SUN MOUSE 0x0100 Type 6 USB mouse -/* SUN Corporation */ -product SUNTAC PS64P1 0x0005 SUNTAC U-Cable type P1 -product SUNTAC VS10U 0x0009 SUNTAC Slipper U - /* Supra products */ product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem product DIAMOND2 SUPRA2890 0x0b4a SupraMax 2890 56K Modem @@ -1075,13 +1077,13 @@ product XIRLINK PCCAM 0x8080 IBM PC Camera /* Y-E Data products */ product YEDATA FLASHBUSTERU 0x0000 Flashbuster-U -/* Yano products */ -product YANO U640MO 0x0101 U640MO-03 - /* Yamaha products */ product YAMAHA UX256 0x1000 UX256 MIDI I/F product YAMAHA UX96 0x1008 UX96 MIDI I/F +/* Yano products */ +product YANO U640MO 0x0101 U640MO-03 + /* Zoom Telephonics, Inc. products */ product ZOOM 2986L 0x9700 2986L Fax modem