- update pci.ids, usb.ids

diff --git a/pci.ids b/pci.ids
index 61d9f5e2259f8a139740b6200fc6b9523e2d0ef9..93a56650eff9b41c6d9648fce4ae260c57bbda14 100644 (file)
--- a/pci.ids
+++ b/pci.ids
@@ -11,7 +11,7 @@
 #      This file can be distributed under either the GNU General Public License
 #      (version 2 or higher) or the 3-clause BSD License.
 #
-#      Daily snapshot on Wed 2008-06-11 01:05:02
+#      Daily snapshot on Tue 2008-06-24 01:05:02
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -6478,6 +6478,46 @@
        0003  IDT77222/77252 155Mbps ATM MICRO ABR SAR Controller
        0004  IDT77V252 155Mbps ATM MICRO ABR SAR Controller
        0005  IDT77V222 155Mbps ATM MICRO ABR SAR Controller
+       8018  PES12N3A PCI Express Switch
+       801c  PES24N3A PCI Express Switch
+       8028  PES4T4 PCI Express Switch
+       802b  PES8T5A PCI Express Switch
+       802c  PES16T4 PCI Express Switch
+       802d  PES16T7 PCI Express Switch
+       802e  PES24T6 PCI Express Switch
+       802f  PES32T8 PCI Express Switch
+       8032  PES48T12 PCI Express Switch
+       8034  PES16/22/34H16 PCI Express Switch
+       8035  PES32H8 PCI Express Switch
+       8036  PES48H12 PCI Express Switch
+       8037  PES64H16 PCI Express Switch
+       8039  PES3T3 PCI Express Switch
+       803a  PES4T4 PCI Express Switch
+       803c  PES5T5 PCI Express Switch
+       803d  PES6T5 PCI Express Switch
+       8048  PES8NT2 PCI Express Switch
+       8049  PES8NT2 PCI Express Switch
+       804a  PES8NT2 PCI Express Internal NTB
+       804b  PES8NT2 PCI Express External NTB
+       804c  PES16NT2 PCI Express Switch
+       804d  PES16NT2 PCI Express Switch
+       804e  PES16NT2 PCI Express Internal NTB
+       804f  PES16NT2 PCI Express External NTB
+       8058  PES12NT3 PCI Express Switch
+       8059  PES12NT3 PCI Express Switch
+       805a  PES12NT3 PCI Express Internal NTB
+       805b  PES12NT3 PCI Express External NTB
+       805c  PES24NT3 PCI Express Switch
+       805d  PES24NT3 PCI Express Switch
+       805e  PES24NT3 PCI Express Internal NTB
+       805f  PES24NT3 PCI Express External NTB
+       8060  PES16T4G2 PCI Express Gen2 Switch
+       8061  PES12T3G2 PCI Express Gen2 Switch
+       8068  PES6T6G2 PCI Express Gen2 Switch
+       806a  PES24T3G2 PCI Express Gen2 Switch
+       806c  PES16T4A/4T4G2 PCI Express Gen2 Switch
+       806e  PES24T6G2 PCI Express Gen2 Switch
+       806f  HIO524G2 PCI Express Gen2 Switch
 111e  Eldec
 111f  Precision Digital Images
        4a47  Precision MX Video engine interface
@@ -10803,6 +10843,7 @@
        12d7  5LS172.61 B&R Dual CAN Interface Card
        20ad  5ACPCI.MFIO-K01 Profibus DP / K-Feldbus / COM
 1678  NetEffect
+       0100  NE020 10Gb Accelerated Ethernet Adapter (iWARP RNIC)
 1679  Tokyo Electron Device Ltd.
 167b  ZyDAS Technology Corp.
        2102  ZyDAS ZD1202
@@ -12190,6 +12231,7 @@
        1095  PRO/100 VE Network Connection
        1096  80003ES2LAN Gigabit Ethernet Controller (Copper)
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        1097  631xESB/632xESB DPT LAN Controller (Fiber)
        1098  80003ES2LAN Gigabit Ethernet Controller (Serdes)
        1099  82546GB Gigabit Ethernet Controller (Copper)
@@ -12261,6 +12303,8 @@
        10cc  82567LM-2 Gigabit Network Connection
        10cd  82567LF-2 Gigabit Network Connection
        10ce  82567V-2 Gigabit Network Connection
+       10d3  82574L Gigabit Network Connection
+               8086 a01f  Gigabit CT Desktop Adapter
        10d5  82571PT Gigabit PT Quad Port Server ExpressModule
        10d6  82575GB Gigabit Network Connection
                8086 10d6  Gigabit VT Quad Port Server Adapter
@@ -12270,8 +12314,11 @@
        10da  82571EB Quad Port Gigabit Mezzanine Adapter
                103c 1717  NC364m Quad Port 1GbE BL-c Adapter
        10dd  82598EB 10 Gigabit AT CX4 Network Connection
+       10de  82567LM-3 Gigabit Network Connection
+       10df  82567LF-3 Gigabit Network Connection
        10e2  82575GB Gigabit Network Connection
                8086 10e2  Gigabit VT Quad Port Server Adapter
+       10e5  82567LM-4 Gigabit Network Connection
        10ec  10 Gigabit AT CX4 Network Connection
                8086 a01f  10 Gigabit CX4 Dual Port Server Adapter
                8086 a11f  10 Gigabit CX4 Dual Port Server Adapter
@@ -12530,6 +12577,7 @@
        1a31  82845 845 [Brookdale] Chipset AGP Bridge
        1a38  5000 Series Chipset DMA Engine
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        1a48  82597EX 10GbE Ethernet Controller
                8086 a01f  PRO/10GbE SR Server Adapter
                8086 a11f  PRO/10GbE SR Server Adapter
@@ -12613,6 +12661,7 @@
 # (rev d3) (prog-if (rev d3) (prog-if 01 [Subtractive decode])
                103c 0934  HP Compaq nw8240 Mobile Workstation
                103c 099c  NX6110/NC6120
+               103c 309f  HP Compaq nx9420
                103c 30a3  Compaq nw8440
                103c 30c1  Compaq 6910p
                144d c00c  P30 notebook
@@ -13252,6 +13301,7 @@
        25d4  5000V Chipset Memory Controller Hub
                15d9 8680  X7DVL-E-O motherboard
        25d8  5000P Chipset Memory Controller Hub
+               8086 3476  Intel S5000PSLSATA Server Board
        25e2  5000 Series Chipset PCI Express x4 Port 2
        25e3  5000 Series Chipset PCI Express x4 Port 3
        25e4  5000 Series Chipset PCI Express x4 Port 4
@@ -13260,14 +13310,19 @@
        25e7  5000 Series Chipset PCI Express x4 Port 7
        25f0  5000 Series Chipset FSB Registers
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        25f1  5000 Series Chipset Reserved Registers
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        25f3  5000 Series Chipset Reserved Registers
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        25f5  5000 Series Chipset FBD Registers
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        25f6  5000 Series Chipset FBD Registers
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        25f7  5000 Series Chipset PCI Express x8 Port 2-3
        25f8  5000 Series Chipset PCI Express x8 Port 4-5
        25f9  5000 Series Chipset PCI Express x8 Port 6-7
@@ -13457,21 +13512,28 @@
                e4bf 58b1  XB1
        2670  631xESB/632xESB/3100 Chipset LPC Interface Controller
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        2680  631xESB/632xESB/3100 Chipset SATA IDE Controller
        2681  631xESB/632xESB SATA AHCI Controller
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        2682  631xESB/632xESB SATA RAID Controller
        2683  631xESB/632xESB SATA RAID Controller
        2688  631xESB/632xESB/3100 Chipset UHCI USB Controller #1
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        2689  631xESB/632xESB/3100 Chipset UHCI USB Controller #2
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        268a  631xESB/632xESB/3100 Chipset UHCI USB Controller #3
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        268b  631xESB/632xESB/3100 Chipset UHCI USB Controller #4
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        268c  631xESB/632xESB/3100 Chipset EHCI USB2 Controller
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        2690  631xESB/632xESB/3100 Chipset PCI Express Root Port 1
        2692  631xESB/632xESB/3100 Chipset PCI Express Root Port 2
        2694  631xESB/632xESB/3100 Chipset PCI Express Root Port 3
@@ -13481,6 +13543,7 @@
        269a  631xESB/632xESB High Definition Audio Controller
        269b  631xESB/632xESB/3100 Chipset SMBus Controller
                15d9 8680  X7DVL-E-O motherboard
+               8086 3476  Intel S5000PSLSATA Server Board
        269e  631xESB/632xESB IDE Controller
                15d9 8680  X7DVL-E-O motherboard
        2770  82945G/GZ/P/PL Memory Controller Hub
@@ -13535,6 +13598,7 @@
                107b 5048  E4500
                8086 544e  DeskTop Board D945GTP
        27b9  82801GBM (ICH7-M) LPC Interface Bridge
+               103c 309f  HP Compaq nx9420
                103c 30a1  NC2400
                103c 30a3  Compaq nw8440
                10f7 8338  Panasonic CF-Y5 laptop
@@ -13789,6 +13853,7 @@
                1028 01da  OptiPlex 745
                1028 01f3  Inspiron 1420
                1028 01f9  Dell Latitude D630
+               1028 01ff  Dell Precision M4300
                103c 2802  HP Compaq dc7700p
                103c 30c0  Compaq 6710b
                103c 30c1  Compaq 6910p

diff --git a/usb.ids b/usb.ids
index ec8cc3b3b07ff139b21277591bf42cabd91e23fb..e192a2ef4d5b5c443f06f2964371b35c5b83230c 100644 (file)
--- a/usb.ids
+++ b/usb.ids
@@ -7,7 +7,7 @@
 #      The latest version can be obtained from
 #              http://www.linux-usb.org/usb.ids
 #
-# $Id: usb.ids,v 1.357 2008/06/09 12:08:46 gowdy Exp $
+# $Id: usb.ids,v 1.361 2008/06/20 12:39:54 gowdy Exp $
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -1550,7 +1550,7 @@
        00da  eHome Infrared Receiver
        00db  Natural Ergonomic Keyboard 4000 V1.0
        00e1  Wireless Laser Mouse 6000 Reciever
-       00f4  LifeCam VX-6000.
+       00f4  LifeCam VX-6000 (SN9C20x + OV9650)
        00f5  LifeCam VX-3000.
        00f7  LifeCam VX-1000.
        00f8  LifeCam NX-6000.
@@ -1696,6 +1696,8 @@
        04ea  Windows Powered Smartphone 2003
        0708  Transceiver v 3.0 for Bluetooth
        070a  Charon Bluetooth Dongle (DFU)
+       0721  LifeCam NX-3000 (UVC-compliant)
+       0723  LifeCam VX-7000 (UVC-compliant)
        930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
        fff8  Keyboard
 0460  Ace Cad Enterprise Co., Ltd
@@ -3589,6 +3591,7 @@
        a122  ORITE CCD Webcam(PC370R)
        a123  ORITE CCD Webcam(PC370R)
        a124  ORITE CCD Webcam(PC370R)
+       a128  PC Camera (SN9C202 + OV7663 + EEPROM)
        a133  Gateway Webcam
        a204  DSC WIA Device (1300)
        a208  DSC WIA Device (2320)
@@ -4717,6 +4720,7 @@
        2802  Monterey Keyboard
        5492  Hub
        6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
+       6335  SD/MMC Card Reader
        6360  Multimedia Card Reader
        6361  Multimedia Card Reader
        6362  Hi-Speed 21-in-1 Flash Card Reader/Writer (Internal/External)
@@ -6432,6 +6436,11 @@
        1016  AirClick
        627a  Radio SHARK
 077f  Well Excellent & Most Corp.
+0780  Sagem Monetel GmbH
+       1202  ORGA 900 Smart Card Terminal Virtual Com Port
+       1302  ORGA 6000 Smart Card Terminal Virtual Com Port
+       1303  ORGA 6000 Smart Card Terminal USB RNDIS
+       df55  ORGA 900/6000 Smart Card Terminal DFU
 0781  SanDisk Corp.
        0001  SDDR-05a ImageMate CompactFlash Reader
        0002  SDDR-31 ImageMate II CompactFlash Reader
@@ -8044,6 +8053,10 @@
        030a  POS Printer, TH200B
        0400  Lottery Scanner, Xiscan S
        0401  Lottery Scanner, Xiscan 3
+       0402  Programmable Magnetic Swipe Card Reader, MSRP-USB
+       0500  IDE Adapter
+       0501  Hub Printer Interface
+       0502  Hub SNIKey Keyboard
        4304  Banking Printer TP07
 0aa8  TriGem Computer, Inc.
        0060  TG 11Mbps WLAN Mini Adapter
@@ -8064,7 +8077,8 @@
 0aaf  Digitalway Co., Ltd
 0ab0  Arrow Strong Electronics Co., Ltd
 0aba  Ellisys
-       8001  USB Tracker 110 Protocol Analyzer
+       8001  Tracker 110 Protocol Analyzer
+       8002  Explorer 200 Protocol Analyzer
 0abe  Stereo-Link
        0101  SL1200 DAC
 0ac3  Sanyo Semiconductor Company Micro
@@ -8729,8 +8743,9 @@
        60fe  Audio (Microphone)
        6108  Win2 PC Camera
        6122  PC Camera (SN9C110)
+       6128  PC Camera (SN9C325 + OM6802)
        6123  PC Camera (SN9C110)
-       612a  PC Camera (SN9C110)
+       612a  PC Camera (SN9C325)
        612c  PC Camera (SN9C110)
        612e  PC Camera (SN9C110)
        612f  PC Camera (SN9C110)
@@ -8740,34 +8755,39 @@
        613b  Win2 PC Camera
        613c  PC Camera (SN9C120)
        613e  PC Camera (SN9C120)
-       6240  PC Camera (SN9C201)
-       6242  PC Camera (SN9C201)
-       6243  PC Camera (SN9C201)
-       6248  PC Camera (SN9C201)
-       624b  PC Camera (SN9C201)
-       624c  PC Camera (SN9C201)
-       624e  PC Camera (SN9C201)
-       624f  PC Camera (SN9C201)
-       6260  PC Camera (SN9C201)
-       6270  U-CAM PC Camera NE878
-       627a  PC Camera (SN9C201)
-       627b  PC Camera (SN9C201)
-       627c  PC Camera (SN9C201)
-       627f  PC Camera (SN9C201)
-       6280  Composite Device
-       6282  Audio (Microphone)
-       6283  Audio (Microphone)
-       6288  Audio (Microphone)
-       628a  Composite Device
-       628b  PC Camera (SN9C202)
-       628c  PC Camera (SN9C202)
-       628e  Composite Device
-       628f  Composite Device
-       62a0  Audio (Microphone)
-       62b0  Audio (Microphone)
-       62ba  PC Camera (SN9C202)
-       62bb  PC Camera (SN9C202)
-       62bc  Composite Device
+       6240  PC Camera (SN9C201 + MI1300)
+       6242  PC Camera (SN9C201 + MI1310)
+       6243  PC Camera (SN9C201 + S5K4AAFX)
+       6248  PC Camera (SN9C201 + OV9655)
+       624b  PC Camera (SN9C201 + CX1332)
+       624c  PC Camera (SN9C201 + MI1320)
+       624e  PC Camera (SN9C201 + SOI968)
+       624f  PC Camera (SN9C201 + OV9650)
+       6253  PC Camera (SN9C201 + OV9650)
+       6260  PC Camera (SN9C201 + OV7670ISP)
+       6262  PC Camera (SN9C201 + OM6802)
+       6270  PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ...
+       627a  PC Camera (SN9C201 + S5K53BEB)
+       627b  PC Camera (SN9C201 + OV7660)
+       627c  PC Camera (SN9C201 + HV7131R)
+       627f  PC Camera (SN9C201 + OV965x + EEPROM)
+       6280  PC Camera with Microphone (SN9C202 + MI1300)
+       6282  PC Camera with Microphone (SN9C202 + MI1310)
+       6283  PC Camera with Microphone (SN9C202 + S5K4AAFX)
+       6288  PC Camera with Microphone (SN9C202 + OV9655)
+       628a  PC Camera with Microphone (SN9C202 + ICM107)
+       628b  PC Camera with Microphone (SN9C202 + CX1332)
+       628c  PC Camera with Microphone (SN9C202 + MI1320)
+       628e  PC Camera with Microphone (SN9C202 + SOI968)
+       628f  PC Camera with Microphone (SN9C202 + OV9650)
+       62a0  PC Camera with Microphone (SN9C202 + OV7670ISP)
+       62a2  PC Camera with Microphone (SN9C202 + OM6802)
+       62b0  PC Camera with Microphone (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111)
+       62b3  PC Camera with Microphone (SN9C202 + OV9655)
+       62ba  PC Camera with Microphone (SN9C202 + S5K53BEB)
+       62bb  PC Camera with Microphone (SN9C202 + OV7660)
+       62bc  PC Camera with Microphone (SN9C202 + HV7131R)
+       62be  PC Camera with Microphone (SN9C202 + OV7663)
        62c0  Pavilion Webcam
        8000  DC31VC
        8006  Dual Mode Camera (8006 VGA)
@@ -9755,6 +9775,8 @@
        9967  W9967CF/W9968CF WebCam IC
 1048  Targus Group International
 104c  AMCO TEC International, Inc.
+1050  Yubico.com
+       0010  Yubikey
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
        5004  DSL 7420 Loader
@@ -9933,7 +9955,7 @@
 10d6  Actions Semiconductor Co., Ltd
        1000  MP3 Player
        1100  MPMan MP-Ki 128 MP3 Player/Recorder
-       1101  D-Wave 2GB MP4 Player
+       1101  D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player
        8888  ADFU Device
        ff51  ADFU Device
 10de  Authenex, Inc.
@@ -10311,6 +10333,8 @@
        0829  AR5523 (no firmware)
 1436  Denali Software, Inc.
 143c  Altek Corporation
+145f  Unknown
+       013d  PC Camera (SN9C201 + OV7660)
 1453  Radio Shack
        4026  26-183 Serial Cable
 1456  Extending Wire & Cable Co., Ltd.
@@ -10820,6 +10844,8 @@
 19ca  Mindtribe
        0001  Sandio 3D HID Mouse
 19cf  Parrot SA
+19d2  ONDA Communication S.p.A.
+       0002  MT505UP MF632
 19e1  WeiDuan Electronic Accessory (S.Z.) Co., Ltd.
 19e8  Industrial Technology Research Institute
 19ef  Pak Heng Technology (Shenzhen) Co., Ltd.
@@ -11036,6 +11062,7 @@
        0001  1.1 root hub
        0002  2.0 root hub
        0003  3.0 root hub
+1e1f  INVIA
 1e29  Festo AG & Co. KG
        0101  CPX Adapter
 1ebb  NuCORE Technology, Inc.
@@ -11291,7 +11318,7 @@
        913c  Argus DC-1730
        9150  Mini Cam
        9153  iClick 5X
-       915d  Cyberpix S-210S
+       915d  Cyberpix S-210S / Little Tikes My Real Digital Camera
        930b  CCD Webcam(PC370R)
        930c  CCD Webcam(PC370R)
 2899  Toptronic Industrial Co., Ltd
@@ -13223,7 +13250,6 @@ L 0060  Kashmiri
 L 0061  Nepali
        02  India
 
-# karsten@redhat.com: from here to EOF commented out as RHEL-4 lsusb can't handle these entries
 # # HID Descriptor bCountryCode
 # # HID Specification 1.11 (2001-06-27) page 23
 # #