mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-01 23:05:25 +00:00
Code Issues Releases Wiki Activity

Corrected Acer device id; fallback in case a device is unknown to the

Browse Source 
kernel.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@209 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Frodo Looijaard
1999-02-09 22:41:58 +00:00
parent 5ff3e45aa0
commit ed5aeab91c
2 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
prog/detect/detect.pl
View File

@@ -31,7 +31,8 @@ sub read_proc_dev_pci
# This function returns a reference to an array of hashes. Each hash has some # This function returns a reference to an array of hashes. Each hash has some
# PCI information. The important fields here are 'bus', 'slot', 'func' (they # PCI information. The important fields here are 'bus', 'slot', 'func' (they
# uniquely identify a PCI device in a computer) and 'desc' (a functional # uniquely identify a PCI device in a computer) and 'desc' (a functional
# description of the PCI device). # description of the PCI device). If this is an 'unknown device', the
# vendid and devid fields are set instead.
sub read_proc_pci sub read_proc_pci
{ {
my @pci_list; my @pci_list;
@@ -40,7 +41,12 @@ sub read_proc_pci
my $record = {}; my $record = {};
if (($record->{bus},$record->{slot},$record->{func}) = if (($record->{bus},$record->{slot},$record->{func}) =
/^\s*Bus\s*(\S)+\s*,\s*device\s*(\S+)\s*,\s*function\s*(\S+)\s*:\s*$/) { /^\s*Bus\s*(\S)+\s*,\s*device\s*(\S+)\s*,\s*function\s*(\S+)\s*:\s*$/) {
$record->{desc} = <INPUTFILE>; my $desc = <INPUTFILE>;
unless (($desc =~ /Unknown device/) and
(($record->{vendid},$record->{devid}) =
/^\s*Vendor id=(\S+)\.\s*Device id=(\S+)\.$/)) {
$record->{desc} = $desc;
}
push @pci_list,$record; push @pci_list,$record;
} }
} }
@@ -70,14 +76,12 @@ sub adapter_pci_detection
devid => 0x0008, devid => 0x0008,
func => 0, func => 0,
procid => "Silicon Integrated Systems 85C503", procid => "Silicon Integrated Systems 85C503",
driver => "UNIMPLEMENTED"
} , } ,
{ {
vendid => 0x10b9, vendid => 0x10b9,
devid => 0x7107, devid => 0x7101,
funcid => 0, funcid => 0,
procid => "Acer Labs M1533 Aladdin IV", procid => "Acer Labs M7101",
driver => "UNIMPLEMENTED"
} }
); );
@@ -96,15 +100,15 @@ sub adapter_pci_detection
foreach $device (@$pci_list_ref) { foreach $device (@$pci_list_ref) {
foreach $try (@pci_adapters) { foreach $try (@pci_adapters) {
if ((! $old_pci_interface and if ((defined($device->{vendid}) and
($try->{vendid} == $device->{vendid} and $try->{vendid} == $device->{vendid} and
$try->{devid} == $device->{devid} and $try->{devid} == $device->{devid} and
$try->{func} == $device->{func}) $try->{func} == $device->{func}) or
) or (! defined($device->{vendid}) and
($old_pci_interface and $device->{desc} =~ /$try->{procid}/ and
($device->{desc} =~ /$try->{procid}/ and $try->{func} == $device->{func})) {
$try->{func} == $device->{func}))) { printf "Use driver `%s' for device %02x:%02x.%x: %s\n",
printf "Use driver `%s' for device %02x:%02x.%x: %s\n",$try->{driver}, $try->{driver}?$try->{driver}:"<To Be Written>",
$device->{bus},$device->{slot},$device->{func},$try->{procid}; $device->{bus},$device->{slot},$device->{func},$try->{procid};
push @res,$try->{driver}; push @res,$try->{driver};
} }

32
prog/detect/sensors-detect
View File

@@ -31,7 +31,8 @@ sub read_proc_dev_pci
# This function returns a reference to an array of hashes. Each hash has some # This function returns a reference to an array of hashes. Each hash has some
# PCI information. The important fields here are 'bus', 'slot', 'func' (they # PCI information. The important fields here are 'bus', 'slot', 'func' (they
# uniquely identify a PCI device in a computer) and 'desc' (a functional # uniquely identify a PCI device in a computer) and 'desc' (a functional
# description of the PCI device). # description of the PCI device). If this is an 'unknown device', the
# vendid and devid fields are set instead.
sub read_proc_pci sub read_proc_pci
{ {
my @pci_list; my @pci_list;
@@ -40,7 +41,12 @@ sub read_proc_pci
my $record = {}; my $record = {};
if (($record->{bus},$record->{slot},$record->{func}) = if (($record->{bus},$record->{slot},$record->{func}) =
/^\s*Bus\s*(\S)+\s*,\s*device\s*(\S+)\s*,\s*function\s*(\S+)\s*:\s*$/) { /^\s*Bus\s*(\S)+\s*,\s*device\s*(\S+)\s*,\s*function\s*(\S+)\s*:\s*$/) {
$record->{desc} = <INPUTFILE>; my $desc = <INPUTFILE>;
unless (($desc =~ /Unknown device/) and
(($record->{vendid},$record->{devid}) =
/^\s*Vendor id=(\S+)\.\s*Device id=(\S+)\.$/)) {
$record->{desc} = $desc;
}
push @pci_list,$record; push @pci_list,$record;
} }
} }
@@ -70,14 +76,12 @@ sub adapter_pci_detection
devid => 0x0008, devid => 0x0008,
func => 0, func => 0,
procid => "Silicon Integrated Systems 85C503", procid => "Silicon Integrated Systems 85C503",
driver => "UNIMPLEMENTED"
} , } ,
{ {
vendid => 0x10b9, vendid => 0x10b9,
devid => 0x7107, devid => 0x7101,
funcid => 0, funcid => 0,
procid => "Acer Labs M1533 Aladdin IV", procid => "Acer Labs M7101",
driver => "UNIMPLEMENTED"
} }
); );
@@ -96,15 +100,15 @@ sub adapter_pci_detection
foreach $device (@$pci_list_ref) { foreach $device (@$pci_list_ref) {
foreach $try (@pci_adapters) { foreach $try (@pci_adapters) {
if ((! $old_pci_interface and if ((defined($device->{vendid}) and
($try->{vendid} == $device->{vendid} and $try->{vendid} == $device->{vendid} and
$try->{devid} == $device->{devid} and $try->{devid} == $device->{devid} and
$try->{func} == $device->{func}) $try->{func} == $device->{func}) or
) or (! defined($device->{vendid}) and
($old_pci_interface and $device->{desc} =~ /$try->{procid}/ and
($device->{desc} =~ /$try->{procid}/ and $try->{func} == $device->{func})) {
$try->{func} == $device->{func}))) { printf "Use driver `%s' for device %02x:%02x.%x: %s\n",
printf "Use driver `%s' for device %02x:%02x.%x: %s\n",$try->{driver}, $try->{driver}?$try->{driver}:"<To Be Written>",
$device->{bus},$device->{slot},$device->{func},$try->{procid}; $device->{bus},$device->{slot},$device->{func},$try->{procid};
push @res,$try->{driver}; push @res,$try->{driver};
} }