diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-11 14:26:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-11 14:26:56 +0000 |
| commit | 0cadba080a3485bf36d673d8259d2ef6a995684a (patch) | |
| tree | e33be77ab33d61053a85aff8cef31ebd1394678f | |
| parent | 83bcbd9dbc5edfe6343e0aa94f2bfb54da0b7a1e (diff) | |
| download | drakx-0cadba080a3485bf36d673d8259d2ef6a995684a.tar drakx-0cadba080a3485bf36d673d8259d2ef6a995684a.tar.gz drakx-0cadba080a3485bf36d673d8259d2ef6a995684a.tar.bz2 drakx-0cadba080a3485bf36d673d8259d2ef6a995684a.tar.xz drakx-0cadba080a3485bf36d673d8259d2ef6a995684a.zip | |
cleanup usbMice
| -rw-r--r-- | perl-install/detect_devices.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 780cfde0f..c32435b7d 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -323,13 +323,16 @@ sub pci_probe { sub usb_probe { -e "/proc/bus/usb/devices" or return (); - add_addons($usbtable_addons, map { + my @l = add_addons($usbtable_addons, map { my %l; @l{qw(vendor id media_type driver description)} = split "\t"; $l{$_} = hex $l{$_} foreach qw(vendor id); $l{bus} = 'USB'; \%l } c::usb_probe()); + use Data::Dumper; + log::l(Dumper \@l, backtrace()); + @l; } sub pcmcia_probe { @@ -454,8 +457,8 @@ sub whatParport() { @res; } -sub usbMice { grep { ($_->{media_type} =~ /\|Mouse/ || $_->{driver} =~ /Mouse:USB/) && - $_->{driver} !~ /Tablet:wacom/} usb_probe() }; +sub usbMice { grep { $_->{media_type} =~ /\|Mouse/ && $_->{driver} !~ /Tablet:wacom/ || + $_->{driver} =~ /Mouse:USB/ } usb_probe() } sub usbWacom { grep { $_->{driver} =~ /Tablet:wacom/ } usb_probe() } sub usbKeyboards { grep { $_->{media_type} =~ /\|Keyboard/ } usb_probe() } sub usbStorage { grep { $_->{media_type} =~ /Mass Storage\|/ } usb_probe() } |