From 16a299660bbda12b08755c2d3a8987ac5b6e8c02 Mon Sep 17 00:00:00 2001 From: Frederic Lepied Date: Tue, 31 Aug 2004 09:41:01 +0000 Subject: simplify UPS detection and report the needed info for harddrake --- perl-install/detect_devices.pm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'perl-install/detect_devices.pm') diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index bec2de7a4..8fcb0a122 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -536,29 +536,9 @@ sub getNet() { # mapgrep(sub {member (($_[0] =~ /\s*(\w*):/), @netdevices), $1 }, split(/\n/, cat_("/proc/net/dev"))); #} -# heavily inspirated from hidups driver from nut: sub getUPS() { - # nut/driver/hidups.h: - my $UPS_USAGE = 0x840004; - my $POWER_USAGE = 0x840020; - my $hiddev_find_application = sub { - my ($fd, $usage) = @_; - my $i = 0; - my $ret; - do { $i++ } while ($ret = ioctl($fd, c::HIDIOCAPPLICATION(), $i)) && $ret != $usage; - return $ret == $usage ? 1 : 0; - }; - - (map { $_->{driver} = "mge-shut"; $_ } grep { $_->{DESCRIPTION} =~ /MGE UPS/ } values %serialprobe), - (map { - open(my $f, $_); - if_(!$hiddev_find_application->($f, $UPS_USAGE) && !$hiddev_find_application->($f, $POWER_USAGE), - { port => $_, - name => c::get_usb_ups_name(fileno($f)), - driver => "hidups", - } - ); - } -e "/dev/.devfsd" ? glob("/dev/usb/hid/hiddev*") : glob("/dev/usb/hiddev*")); + (map { $_->{driver} = "mge-shut"; $_->{media_type} = 'UPS'; $_ } grep { $_->{DESCRIPTION} =~ /MGE UPS/ } values %serialprobe), + (map { ($_->{name} = $_->{description}) =~ s/.*\|//; $_->{port} = "/dev/"; $_->{media_type} = 'UPS'; $_} grep { $_->{driver} =~ /ups$/ } usb_probe()); } $pcitable_addons = <<'EOF'; -- cgit v1.2.1