summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-28 22:29:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-28 22:29:30 +0000
commit471e1eed85397a23424eee348b07734f1ce0a0f8 (patch)
treeb5bcbf716b575e060e19758958e6eb35f0239088
parent9243ddda5a2931acb272f2d14cdaa7cbe0918da5 (diff)
downloadldetect-lst-471e1eed85397a23424eee348b07734f1ce0a0f8.tar
ldetect-lst-471e1eed85397a23424eee348b07734f1ce0a0f8.tar.gz
ldetect-lst-471e1eed85397a23424eee348b07734f1ce0a0f8.tar.bz2
ldetect-lst-471e1eed85397a23424eee348b07734f1ce0a0f8.tar.xz
ldetect-lst-471e1eed85397a23424eee348b07734f1ce0a0f8.zip
- add "Removable:floppy", "Removable:memory_card", "Removable:camera"
- usb-removables.pl is useful to update usbtable Removable:xxx based on device descriptions
-rwxr-xr-xconvert/usb-removables.pl18
-rw-r--r--ldetect-lst.spec5
-rw-r--r--lst/usbtable60
3 files changed, 52 insertions, 31 deletions
diff --git a/convert/usb-removables.pl b/convert/usb-removables.pl
new file mode 100755
index 00000000..822917ee
--- /dev/null
+++ b/convert/usb-removables.pl
@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+use detect_devices;
+
+require './merge2pcitable.pl';
+my $usbtable = read_pcitable($ARGV[0]);
+
+foreach (values %$usbtable) {
+ my $s = detect_devices::usb_description2removable($_->[1]) or next;
+ if ($_->[0] =~ /Removable:(.*)/) {
+ print STDERR "Conflicting $1 and $s for $_->[1]\n" if $1 ne $s;
+ } else {
+ print STDERR "Suggesting $s for $_->[1]\n";
+ $_->[0] = "Removable:$s" if $_->[0] eq 'usb-storage';
+ }
+}
+write_pcitable($usbtable);
diff --git a/ldetect-lst.spec b/ldetect-lst.spec
index db7156de..9bf5cf25 100644
--- a/ldetect-lst.spec
+++ b/ldetect-lst.spec
@@ -1,6 +1,6 @@
%define name ldetect-lst
%define version 0.1.4
-%define release 13mdk
+%define release 14mdk
Name: %{name}
Version: %{version}
@@ -63,6 +63,9 @@ fi
%{_bindir}/*
%changelog
+* Thu Aug 29 2002 Pixel <pixel@mandrakesoft.com> 0.1.4-14mdk
+- add "Removable:floppy", "Removable:memory_card", "Removable:camera"
+
* Tue Aug 27 2002 Pixel <pixel@mandrakesoft.com> 0.1.4-13mdk
- fix syntax error in usbtable (and prevent this to happen again)
diff --git a/lst/usbtable b/lst/usbtable
index c391ee99..4073c6af 100644
--- a/lst/usbtable
+++ b/lst/usbtable
@@ -3,7 +3,7 @@
0x03e8 0x0008 "kaweth" "AOX Inc.|101 Ethernet [klsi]"
0x03eb 0x7603 "unknown" "Atmel Corp.|AT76c503a D-Link DWL-120"
0x03ee 0x0000 "usb-storage" "Mitsumi|CD-R/RW Drive"
-0x03ee 0x6901 "usb-storage" "Mitsumi|USB FDD"
+0x03ee 0x6901 "Removable:floppy" "Mitsumi|USB FDD"
0x03f0 0x0004 "unknown" "Hewlett-Packard|DeskJet 895c"
0x03f0 0x0101 "scanner" "Hewlett-Packard|ScanJet 4100C"
0x03f0 0x0102 "scanner" "Hewlett-Packard|PhotoSmart S20"
@@ -93,7 +93,7 @@
0x0428 0x4001 "unknown" "Advanced Gravis Computer Tech. Ltd.|GamePad Pro"
0x0430 0x0005 "unknown" "Sun Microsystems|Type 6 Keyboard"
0x0430 0x0100 "unknown" "Sun Microsystems|3-button Mouse"
-0x0436 0x0005 "usb-storage" "Microtech|CameraMate (DPCM_USB)"
+0x0436 0x0005 "Removable:camera" "Microtech|CameraMate (DPCM_USB)"
0x043d 0x0002 "unknown" "Lexmark International Inc.|Optra E310 Printer"
0x043d 0x0009 "unknown" "Lexmark International Inc.|Optra S 2450"
0x043d 0x000c "unknown" "Lexmark International Inc.|Optra E312 Printer"
@@ -344,27 +344,27 @@
0x04c1 0x009d "unknown" "U.S. Robotics (3Com)|HomeConnect WebCam"
0x04c1 0x3021 "unknown" "U.S. Robotics (3Com)|56k Voice FaxModem Pro"
0x04c8 0x0720 "unknown" "Konica Corp.|Digital Color Camera"
-0x04cb 0x0100 "usb-storage" "Fuji Photo Film Co., Ltd.|FinePix 4700 Zoom / FinePix 1400 Zoom digital camrea"
+0x04cb 0x0100 "Removable:camera" "Fuji Photo Film Co., Ltd.|FinePix 4700 Zoom / FinePix 1400 Zoom digital camrea"
0x04cb 0x0103 "unknown" "Fuji Photo Film Co., Ltd.|FinePix NX-700 printer"
0x04cc 0x1122 "unknown" "Philips Semiconductors|Hub"
0x04ce 0x0002 "usb-storage" "ScanLogic Corp.|SL11R-IDE [IDE Bridge]"
0x04ce 0x0300 "microtek" "ScanLogic Corp.|"
0x04d2 0x0311 "unknown" "Altec Lansing Technologies|ADA-310 Speakers"
0x04d2 0xff05 "unknown" "Altec Lansing Technologies|ADA-305 Speakers"
-0x04da 0x0901 "usb-storage" "Panasonic|LS-120 Camera"
+0x04da 0x0901 "Removable:camera" "Panasonic|LS-120 Camera"
0x04e1 0x0201 "unknown" "Iiyama North America Inc.|Monitor Hub"
0x04e6 0x0001 "unknown" "SCM Microsystems|E-USB ATA Bridge"
0x04e6 0x0002 "usb-storage" "Shuttle Technology Inc.|E-USCSI Bridge"
-0x04e6 0x0003 "usb-storage" "Shuttle Technology Inc.|eUSB SmartMedia Card Reader / ImageMate SDDR09"
-0x04e6 0x0005 "usb-storage" "Shuttle Technology Inc.|eUSB SmartMedia/CompactFlash Card Reader"
+0x04e6 0x0003 "Removable:memory_card" "Shuttle Technology Inc.|eUSB SmartMedia Card Reader / ImageMate SDDR09"
+0x04e6 0x0005 "Removable:memory_card" "Shuttle Technology Inc.|eUSB SmartMedia/CompactFlash Card Reader"
0x04e6 0x0006 "usb-storage" "Shuttle Technology Inc.|eUSB MultiMedia Card Reader / eUSB MMC Adapter"
0x04e6 0x0007 "usb-storage" "Shuttle Technology Inc.|Hifd"
0x04e6 0x0009 "usb-storage" "Shuttle Technology Inc.|eUSB ATA/ATAPI Adapter"
-0x04e6 0x000a "usb-storage" "Shuttle Technology Inc.|eUSB CompactFlash Adapter"
+0x04e6 0x000a "Removable:memory_card" "Shuttle Technology Inc.|eUSB CompactFlash Adapter"
0x04e6 0x000b "usb-storage" "Shuttle Technology Inc.|eUSCSI Bridge"
0x04e6 0x000c "usb-storage" "Shuttle Technology Inc.|eUSCSI Bridge"
0x04e6 0x0101 "usb-storage" "Shuttle Technology Inc.|CD-RW Devicee"
-0x04e6 0x1010 "unknown" "Shuttle Technology Inc.|USBAT-2 CompactFlash Card Reader"
+0x04e6 0x1010 "Removable:memory_card" "Shuttle Technology Inc.|USBAT-2 CompactFlash Card Reader"
0x04e7 0x0001 "unknown" "Elo TouchSystems|TouchScreen"
0x04f1 0x0001 "unknown" "Victor Company of Japan (JVC)|GC-QX3 Digital Still Camera"
0x04f2 0x0001 "unknown" "Chicony Electronics Co., Ltd.|KU-8933 Keyboard"
@@ -389,7 +389,7 @@
0x051d 0x0002 "unknown" "American Power Conversion|Back-UPS Pro 500"
0x0525 0x1080 "usbnet" "Netchip Technology Inc.|NET1080 USB-USB Bridge"
0x0525 0x9901 "usbnet" ""
-0x0525 0xa140 "usb-storage" "Iomega|USB Clik! 40"
+0x0525 0xa140 "Removable:memory_card" "Iomega|USB Clik! 40"
0x0528 0x7561 "unknown" "ATI Technologies, Inc.|TV Wonder"
0x0529 0x0001 "unknown" "Aladdin Knowledge Systems|USB-HASP 0.06"
0x0529 0x030b "unknown" "Aladdin Knowledge Systems|eToken R1 v3.1.3.x"
@@ -420,14 +420,14 @@
0x0547 0x2727 "usbnet" ""
0x0547 0x2810 "unknown" "Anchor Chips Inc.|Cypress USB ATAPI Bridge"
0x0547 0x9999 "dabusb" "Anchor Chips Inc.|AN2131 uninitialized (???)"
-0x054c 0x0010 "usb-storage" "Sony Corp.|DSC-S30/S70/S75/505V/F505/F707 Cybershot Digital Camera"
+0x054c 0x0010 "Removable:camera" "Sony Corp.|DSC-S30/S70/S75/505V/F505/F707 Cybershot Digital Camera"
0x054c 0x0023 "unknown" "Sony Corp.|CD Writer"
0x054c 0x0024 "unknown" "Sony Corp.|Mavica CD-1000 Camera"
-0x054c 0x0025 "usb-storage" "Sony Corp.|NW-MS7 Walkman MemoryStick Reader"
+0x054c 0x0025 "Removable:memory_card" "Sony Corp.|NW-MS7 Walkman MemoryStick Reader"
0x054c 0x002b "usb-storage" "Sony Corp.|Portable USB Harddrive V2"
-0x054c 0x002d "usb-storage" "Sony Corp.|MSAC-US1 MemoryStick Reader"
-0x054c 0x002e "usb-storage" "Sony Corp.|Sony HandyCam MemoryStick Reader"
-0x054c 0x0032 "usb-storage" "Sony Corp.|MemoryStick MSC-U01N Reader"
+0x054c 0x002d "Removable:memory_card" "Sony Corp.|MSAC-US1 MemoryStick Reader"
+0x054c 0x002e "Removable:memory_card" "Sony Corp.|Sony HandyCam MemoryStick Reader"
+0x054c 0x0032 "Removable:memory_card" "Sony Corp.|MemoryStick MSC-U01N Reader"
0x054c 0x0038 "visor" "Sony Corp.|CLIE PEG-S300/D PalmOS PDA"
0x054c 0x0066 "visor" "Sony Corp.|Palm Handheld"
0x054c 0x006d "usb-storage" "Sony Corp.|PEG Mass Storage"
@@ -564,7 +564,7 @@
0x05e3 0x0300 "unknown" "Genesys Logic, Inc.|GLUSB98PT Parallel Port"
0x05e3 0x0502 "usbnet" ""
0x05e3 0x0604 "unknown" "unknown|Hub"
-0x05e3 0x0700 "usb-storage" "SIIG|CompactFlash Card Reader"
+0x05e3 0x0700 "Removable:memory_card" "SIIG|CompactFlash Card Reader"
0x05e3 0x0702 "usb-storage" "EagleTec|External Hard Disk"
0x05e9 0x0008 "kaweth" "Kawasaki LSI|KL5KUSB101B Ethernet [klsi]"
0x05e9 0x0009 "kaweth" "Kawasaki LSI|Sony 10Mbps Ethernet [pegasus]"
@@ -586,9 +586,9 @@
0x0618 0x0101 "unknown" "MacAlly|Mouse"
0x0638 0x0268 "scanner" "Avision, Inc.|iVina 1200U Scanner"
0x0638 0x026a "hpusbscsi" "Avision, Inc.|Minolta Dimage Scan Dual II"
-0x0644 0x0000 "Floppy:normal" "TEAC|Floppy drive-05PUB"
+0x0644 0x0000 "Removable:floppy" "TEAC|Floppy drive-05PUB"
0x0667 0x0fa1 "unknown" "AIWA|TD-U8000 Tape Drive"
-0x066b 0x0105 "usb-storage" "Linksys Inc.|SCM eUSB SmartMedia Card Reader / Camedia MAUSB-2"
+0x066b 0x0105 "Removable:memory_card" "Linksys Inc.|SCM eUSB SmartMedia Card Reader / Camedia MAUSB-2"
0x066b 0x200c "pegasus" "Linksys Inc.|USB Network Adapter"
0x066b 0x2202 "pegasus" "Linksys Inc.|USB10T Ethernet [klsi]"
0x066b 0x2203 "pegasus" "Linksys Inc.|USB100TX Ethernet [pegasus]"
@@ -608,11 +608,11 @@
0x067c 0x4060 "unknown" "Efficient Networks, Inc.|Alcatel Speedstream 4060 ADSL Modem"
0x0681 0x0002 "unknown" "Siemens Information and Communication Products|Gigaset 3075 Passive ISDN"
0x0681 0x0005 "unknown" "Siemens Information and Communication Products|Mouse with Fingerprint Reader"
-0x0686 0x4006 "usb-storage" "Minolta|Dimage S304"
-0x0686 0x4007 "usb-storage" "Minolta|Dimage S304"
+0x0686 0x4006 "Removable:camera" "Minolta|Dimage S304"
+0x0686 0x4007 "Removable:camera" "Minolta|Dimage S304"
0x068e 0x0500 "unknown" "CH Products, Inc.|GameStick 3D"
0x068e 0x0504 "unknown" "CH Products, Inc.|F-16 Combat Stick"
-0x0693 0x0002 "usb-storage" "Hagiwara Sys-Com|FlashGate SmartMedia Card Reader"
+0x0693 0x0002 "Removable:memory_card" "Hagiwara Sys-Com|FlashGate SmartMedia Card Reader"
0x0693 0x0003 "unknown" "Hagiwara Sys-Com|FlasgGate CompactFlash Card Reader"
0x0693 0x0005 "usb-storage" "Hagiwara Sys-Com|FlashGate"
0x0694 0x0001 "unknown" "Lego Group|Mindstorms Tower"
@@ -694,11 +694,11 @@
0x074e 0x0002 "unknown" "Digital Stream Corp.|PS/2 Adapter"
0x0763 0x1001 "unknown" "Midiman|Midisport 2x2"
0x077c 0x0005 "unknown" "Forward Electronics Co., Ltd.|NEC Keyboard"
-0x0781 0x0001 "usb-storage" "SanDisk Corp.|Compact Flash Reader / ImageMate SDDR-05a"
-0x0781 0x0002 "usb-storage" "SanDisk Corp.|SDDR-31 ImageMate CompactFlash Reader / ImageMate SDDR-31"
-0x0781 0x0005 "unknown" "SanDisk Corp.|SDDR-05b (CF II) ImageMate CompactFlash Reader"
-0x0781 0x0100 "usb-storage" "SanDisk Corp.|ImageMate SDDR-12"
-0x0781 0x0200 "usb-storage" "SanDisk Corp.|SDDR-09-01 ImageMate SmartMedia Reader"
+0x0781 0x0001 "Removable:memory_card" "SanDisk Corp.|Compact Flash Reader / ImageMate SDDR-05a"
+0x0781 0x0002 "Removable:memory_card" "SanDisk Corp.|SDDR-31 ImageMate CompactFlash Reader / ImageMate SDDR-31"
+0x0781 0x0005 "Removable:memory_card" "SanDisk Corp.|SDDR-05b (CF II) ImageMate CompactFlash Reader"
+0x0781 0x0100 "Removable:memory_card" "SanDisk Corp.|ImageMate SDDR-12"
+0x0781 0x0200 "Removable:memory_card" "SanDisk Corp.|SDDR-09-01 ImageMate SmartMedia Reader"
0x0785 0x0001 "unknown" "NTT-ME|MN128mini-V ISDN TA"
0x0785 0x0003 "unknown" "NTT-ME|MN128mini-J ISDN TA"
0x07a1 0xd952 "unknown" "Digicom S.p.A.|Palladio USB V.92 Modem"
@@ -709,7 +709,7 @@
0x07ab 0xfc01 "usb-storage" "Freecom/Memorex|USB-IDE/BBQ Series 100 CD-R/RW"
0x07af 0x0004 "usb-storage" "Microtech|SCSI-DB25 SCSI Bridge [shuttle]"
0x07af 0x0005 "usb-storage" "Microtech|SCSI-HD50 SCSI Bridge [shuttle]"
-0x07af 0x0006 "usb-storage" "Microtech|CameraMate (DPCM_USB)"
+0x07af 0x0006 "Removable:camera" "Microtech|CameraMate (DPCM_USB)"
0x07b0 0x0001 "unknown" "Trust Technologies|ISDN TA"
0x07b2 0x4100 "unknown" "Motorola ING|SB4100 Cable Modem"
0x07b2 0x4200 "unknown" "Motorola ING|SB4200 USB Cable Modem"
@@ -739,13 +739,13 @@
0x07b8 0x4104 "pegasus" "D-Link, Inc.|USB Network Adapter"
0x07b8 0xabc1 "pegasus" "D-Link, Inc.|DU-E10 Ethernet [pegasus]"
0x07c4 0xa000 "usb-storage" "Datafab Systems Inc.|Simple Technologies Flash Card Reader"
-0x07c4 0xa001 "usb-storage" "SIIG/Datafab|SIIG/Datafab Memory Stick+CompactFlash & SmartMedia Card Reader/Writer [eusb]"
+0x07c4 0xa001 "Removable:memory_card" "SIIG/Datafab|SIIG/Datafab Memory Stick+CompactFlash & SmartMedia Card Reader/Writer [eusb]"
0x07c4 0xa002 "unknown" "DataFab Systems, Inc.|Disk Drive"
0x07c4 0xa003 "usb-storage" "Datafab/Unknown|Datafab-based Reader"
0x07c4 0xa004 "usb-storage" "Datafab/Unknown|Datafab-based Reader"
-0x07c4 0xa005 "usb-storage" "PNY/Datafab|PNY/Datafab CompactFlash & SmartMedia Card Reader"
-0x07c4 0xa006 "usb-storage" "Simple Tech/Datafab|Simple Tech/Datafab CompactFlash & SmartMedia Card Reader"
-0x07c4 0xa109 "usb-storage" "Datafab Systems, Inc.|USB to CompactFlash + SmartMedia Combo (LC1)"
+0x07c4 0xa005 "Removable:memory_card" "PNY/Datafab|PNY/Datafab CompactFlash & SmartMedia Card Reader"
+0x07c4 0xa006 "Removable:memory_card" "Simple Tech/Datafab|Simple Tech/Datafab CompactFlash & SmartMedia Card Reader"
+0x07c4 0xa109 "Removable:memory_card" "Datafab Systems, Inc.|USB to CompactFlash + SmartMedia Combo (LC1)"
0x07c9 0xb100 "pegasus" ""
0x07cc 0x0004 "unknown" "SIIG|DigiFilm-Combo Reader"
0x07cc 0x0006 "unknown" "Carry Inc.|SM/CF/PCMCIA Card Reader"