summaryrefslogtreecommitdiffstats
path: root/lst/usbtable
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-08-04 04:55:46 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-08-04 04:55:46 +0000
commit7a931296a888f52d4ec92b477542d07356fc6b08 (patch)
tree7e65037579a2db003f9c3b035f384010c2c743e5 /lst/usbtable
parente455d6ee9231778fcbcb1ba075e526b576c83af5 (diff)
downloadldetect-lst-7a931296a888f52d4ec92b477542d07356fc6b08.tar
ldetect-lst-7a931296a888f52d4ec92b477542d07356fc6b08.tar.gz
ldetect-lst-7a931296a888f52d4ec92b477542d07356fc6b08.tar.bz2
ldetect-lst-7a931296a888f52d4ec92b477542d07356fc6b08.tar.xz
ldetect-lst-7a931296a888f52d4ec92b477542d07356fc6b08.zip
merge strings from usb.ids
Diffstat (limited to 'lst/usbtable')
-rw-r--r--lst/usbtable34
1 files changed, 17 insertions, 17 deletions
diff --git a/lst/usbtable b/lst/usbtable
index 8a8896c0..0ff9c80e 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -36,20 +36,20 @@
0x03f0 0x0604 "unknown" "Hewlett-Packard|DeskJet 840c"
0x03f0 0x0605 "scanner" "Hewlett-Packard|ScanJet 2200C"
0x03f0 0x0701 "hp5300" "Hewlett-Packard|ScanJet 5300"
-0x03f0 0x0705 "scanner" ""
-0x03f0 0x0801 "hpusbscsi" ""
+0x03f0 0x0705 "scanner" "Hewlett-Packard|ScanJet 4400c"
+0x03f0 0x0801 "hpusbscsi" "Hewlett-Packard|ScanJet 7400c"
0x03f0 0x0804 "unknown" "Hewlett-Packard|DeskJet 816c"
0x03f0 0x0901 "scanner" "Hewlett-Packard|ScanJet 2300c"
0x03f0 0x1004 "unknown" "Hewlett-Packard|DeskJet 970Cse"
-0x03f0 0x1016 "ipaq" ""
+0x03f0 0x1016 "ipaq" "Hewlett-Packard|Jornada 548 Pocket PC"
0x03f0 0x1104 "unknown" "Hewlett-Packard|Deskjet 959C"
0x03f0 0x1105 "scanner" "Hewlett-Packard|ScanJet 5470c"
-0x03f0 0x1116 "ipaq" ""
+0x03f0 0x1116 "ipaq" "Hewlett-Packard|Jornada 568 Pocket PC"
0x03f0 0x1151 "unknown" "Hewlett-Packard|750xi Printer/Scanner/Copier"
0x03f0 0x1204 "unknown" "Hewlett-Packard|DeskJet 930c"
0x03f0 0x2002 "unknown" "Hewlett-Packard|Usb Hub"
0x03f0 0x2004 "unknown" "Hewlett-Packard|DeskJet 640c"
-0x03f0 0x2005 "scanner" ""
+0x03f0 0x2005 "scanner" "Hewlett-Packard|ScanJet 3570c"
0x03f0 0x2304 "unknown" "Hewlett-Packard|DeskJet 656c"
0x03f0 0x3102 "unknown" "Hewlett-Packard|PhotoSmart P1100"
0x03f0 0x4002 "unknown" "Hewlett-Packard|PhotoSmart 720 Camera"
@@ -98,7 +98,7 @@
0x0411 0x0005 "pegasus" "Melco, Inc.|USB Network Adapter"
0x0411 0x0009 "pegasus" "Melco, Inc.|USB Network Adapter"
0x0411 0x0012 "rtl8150" ""
-0x0411 0x0016 "prism2_usb" ""
+0x0411 0x0016 "prism2_usb" "MelCo., Inc.|WLI-USB-S11 802.11b Adapter"
0x0411 0x1020 "pegasus" ""
0x0416 0x0961 "unknown" "Winbond Electronics Corp.|AVL Flash Card Reader"
0x0416 0x26ef "unknown" "Winbond Electronics Corp.|WC9967CF WebCam IC"
@@ -118,7 +118,7 @@
0x041e 0x4004 "unknown" "Creative Labs|Nomad II MG MP3 Player"
0x041e 0x400a "unknown" "Creative Labs|PC-Cam 300"
0x041e 0x400b "unknown" "Creative Labs|PC-Cam 600"
-0x041e 0x400c "pwc" ""
+0x041e 0x400c "pwc" "Creative Technology, Ltd|WebCam 5 [pwc]"
0x041e 0x400d "unknown" "Creative Labs|WebCam PD1001"
0x0423 0x0001 "catc" "Computer Access Technology Corp.|smartBridges smartNIC"
0x0423 0x000a "catc" "Computer Access Technology Corp.|NetMate Ethernet"
@@ -136,7 +136,7 @@
0x043d 0x0017 "unknown" "Lexmark International Inc.|Z32 printer"
0x043d 0x0018 "unknown" "Lexmark International Inc.|Z52 Printer"
0x043d 0x0020 "unknown" "Lexmark International Inc.|Z51"
-0x043d 0x002d "scanner" ""
+0x043d 0x0021 "unknown" "Lexmark International, Inc.|Z33 Printer"
0x043d 0x003d "scanner" "Lexmark International Inc.|X83 Scan/Print/Copy"
0x043e 0x42bd "unknown" "LG Electronics USA Inc.|Flatron 795FT Plus Monitor"
0x043e 0x4a4d "unknown" "LG Electronics USA Inc.|Flatron 915FT Plus Monitor"
@@ -157,7 +157,7 @@
0x0451 0x2046 "unknown" "Texas Instruments|TUSB2046 Hub"
0x0451 0x2077 "unknown" "Texas Instruments|TUSB2077 Hub"
0x0451 0x5409 "usb-storage" "Frontier Labs|Nex II Digital"
-0x0451 0xe001 "tiglusb" ""
+0x0451 0xe001 "tiglusb" "Texas Instruments, Inc.|GraphLink"
0x0458 0x0001 "unknown" "KYE Systems Corp.(Mouse Systems)|Mouse"
0x0458 0x0002 "unknown" "KYE Systems Corp.(Mouse Systems)|Genius NetMouse Pro"
0x0458 0x0003 "unknown" "KYE Systems Corp. (Mouse Systems)|Genius NetScroll+"
@@ -166,12 +166,12 @@
0x0458 0x1003 "unknown" "KYE Systems Corp. (Mouse Systems)|Genius VideoCam"
0x0458 0x1004 "unknown" "KYE Systems Corp.(Mouse Systems)|Flight2000 F-23 Joystick"
0x0458 0x2001 "scanner" "KYE Systems Corp.(Mouse Systems)|ColorPage-Vivid Pro Scanner"
-0x0458 0x2007 "scanner" ""
-0x0458 0x2008 "scanner" ""
-0x0458 0x2009 "scanner" ""
-0x0458 0x2013 "scanner" ""
-0x0458 0x2015 "scanner" ""
-0x0458 0x2016 "scanner" ""
+0x0458 0x2007 "scanner" "KYE Systems Corp. (Mouse Systems)|ColorPage-HR6 V2 Scanner"
+0x0458 0x2008 "scanner" "KYE Systems Corp. (Mouse Systems)|ColorPage-HR6 V2 Scanner"
+0x0458 0x2009 "scanner" "KYE Systems Corp. (Mouse Systems)|ColorPage-HR6A Scanner"
+0x0458 0x2013 "scanner" "KYE Systems Corp. (Mouse Systems)|ColorPage-HR7 Scanner"
+0x0458 0x2015 "scanner" "KYE Systems Corp. (Mouse Systems)|ColorPage-HR7LE Scanner"
+0x0458 0x2016 "scanner" "KYE Systems Corp. (Mouse Systems)|ColorPage-HR6X Scanner"
0x045a 0x0b4a "unknown" "Diamond Multimedia Systems|SupraMax 2890 56K Modem [Lucent Atlas]"
0x045a 0x0b68 "unknown" "Diamond Multimedia Systems|SupraMax 56K Modem"
0x045e 0x0008 "unknown" "Microsoft Corp.|SideWinder Precision Pro"
@@ -197,7 +197,7 @@
0x045e 0x003c "unknown" "Microsoft Corp.|SideWinder Joystick"
0x045e 0x0040 "Mouse:USB|Wheel" "Microsoft Corp.|IntelliMouse Optical"
0x045e 0x0059 "Mouse:USB|Microsoft Explorer" "Microsoft Corp.|Wireless IntelliMouse Explorer"
-0x045e 0x006e "prism2_usb" ""
+0x045e 0x006e "prism2_usb" "Microsoft Corp.|MN510 802.11b Adapter"
0x045e 0x0284 "unknown" "Microsoft Corp.|Xbox DVD Playback Kit"
0x0460 0x0004 "acecad" ""
0x0461 0x0300 "scanner" "Primax Electronics|G2-300 Scanner"
@@ -641,7 +641,7 @@
0x056a 0x0035 "wacom" ""
0x056a 0x0041 "wacom" ""
0x056a 0x0042 "wacom" ""
-0x056a 0x0043 "wacom" ""
+0x056a 0x0043 "wacom" "Wacom Co., Ltd|Intuos 2"
0x056a 0x0044 "wacom" ""
0x056a 0x0045 "wacom" ""
0x056c 0x8007 "belkin_sa" "eTEK Labs|Kwik232 Serial Port"