diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 554d4e05..83d76885 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -74,7 +74,6 @@ $revision =~ s/ \([^()]*\)//; devid => 0x7603, procid => "Intel 82372FB PIIX5 ACPI", driver => "to-be-tested", - match => qr/^SMBus PIIX4 adapter at /, } , { vendid => 0x8086, @@ -2694,17 +2693,23 @@ sub adapter_pci_detection $key = sprintf("%04x:%04x", $try->{vendid}, $try->{devid}); if (exists $pci_list{$key}) { $device = $pci_list{$key}; - printf "Use driver `\%s' for device \%s: \%s\n", - $try->{driver}, pci_busid($device), $try->{procid}; - if ($try->{driver} eq "to-be-tested") { - print "\nWe are currently looking for testers for this adapter!\n". - "Please check http://www.lm-sensors.org/wiki/Devices\n". - "and/or contact us if you want to help.\n\n"; - print "Continue... "; - ; - print "\n"; + if ($try->{driver} =~ m/^to-be-/) { + printf "No known driver for device \%s: \%s\n", + pci_busid($device), $try->{procid}; + + if ($try->{driver} eq "to-be-tested") { + print "\nWe are currently looking for testers for this adapter!\n". + "Please check http://www.lm-sensors.org/wiki/Devices\n". + "and/or contact us if you want to help.\n\n"; + print "Continue... "; + ; + print "\n"; + } + } else { + printf "Use driver `\%s' for device \%s: \%s\n", + $try->{driver}, pci_busid($device), $try->{procid}; + push @res, $try->{driver}; } - push @res,$try->{driver}; # Delete from detected SMBus device list delete $smbus{$key}; @@ -2719,7 +2724,7 @@ sub adapter_pci_detection } if (! @res) { - print "Sorry, no known PCI bus adapters found.\n"; + print "Sorry, no supported PCI bus adapters found.\n"; } return @res; } @@ -5617,10 +5622,6 @@ sub generate_modprobes next unless exists $adap->{nr_later} and $adap->{nr_later} == $i; if ($adap->{driver} eq "UNKNOWN") { $modprobes .= "# modprobe unknown adapter ".$adap->{name}."\n"; - } elsif ($adap->{driver} eq "DISABLED") { - $modprobes .= "# modprobe disabled adapter ".$adap->{name}."\n"; - } elsif ($adap->{driver} eq "to-be-written") { - $modprobes .= "# no driver available for adapter ".$adap->{name}."\n"; } else { $modprobes .= "modprobe $adap->{driver}\n" unless $modprobes =~ /modprobe $adap->{driver}\n/; @@ -5757,8 +5758,6 @@ sub main print "We will now try to load each adapter module in turn.\n" if (@adapters); foreach $adapter (@adapters) { - next if $adapter eq "DISABLED"; - next if $adapter eq "to-be-tested"; if (exists($modules_list{$adapter})) { print "Module `$adapter' already loaded.\n"; } else {