mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-03 15:55:15 +00:00
Code Issues Releases Wiki Activity

Fix the case where different chips using the same driver, when

Browse Source 
detected at the same address, cause the driver to be told to
        ignore this address. Untested.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2000 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2003-09-26 21:07:16 +00:00
parent 2096026dd7
commit dc953405ce
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
prog/detect/sensors-detect
View File

@@ -1974,7 +1974,8 @@ sub add_i2c_to_chips_detected
{
my ($chipdriver,$datahash) = @_;
my ($i,$new_detected_ref,$new_misdetected_ref,$detected_ref,$misdetected_ref,
$main_entry,$detected_entry,$put_in_detected,@hash_addrs,@entry_addrs);
$main_entry,$detected_entry,$put_in_detected,@hash_addrs,@entry_addrs,
$do_not_add);
# First determine where the hash has to be added.
for ($i = 0; $i < @chips_detected; $i++) {
@@ -1995,6 +1996,7 @@ sub add_i2c_to_chips_detected
push @hash_addrs, @{$datahash->{i2c_sub_addrs}}
if exists $datahash->{i2c_sub_addrs};
$put_in_detected = 1;
$do_not_add = 0;
FIND_LOOP:
foreach $main_entry (@chips_detected) {
foreach $detected_entry (@{$main_entry->{detected}}) {
@@ -2006,6 +2008,9 @@ sub add_i2c_to_chips_detected
if ($detected_entry->{conf} >= $datahash->{conf}) {
$put_in_detected = 0;
}
if ($chipdriver eq $main_entry->{driver}) {
$do_not_add = 1;
}
last FIND_LOOP;
}
}
@@ -2016,6 +2021,10 @@ sub add_i2c_to_chips_detected
# match at least in one main or sub address. This may not be the
# best idea to do, as it may remove detections without replacing
# them with second-best ones. Too bad.
# (Khali 2003-09-13) If the driver is the same, the "misdetected"
# entry is simply deleted; failing to do so cause the configuration
# lines generated later to look very confusing (the driver will
# be told to ignore valid addresses).
@hash_addrs = ($datahash->{i2c_addr});
push @hash_addrs, @{$datahash->{i2c_sub_addrs}}
if exists $datahash->{i2c_sub_addrs};
@@ -2028,7 +2037,8 @@ sub add_i2c_to_chips_detected
if exists $detected_ref->[$i]->{i2c_sub_addrs};
if ($detected_ref->[$i]->{i2c_devnr} == $datahash->{i2c_devnr} and
any_list_match \@entry_addrs, \@hash_addrs) {
push @$misdetected_ref,$detected_ref->[$i];
push @$misdetected_ref,$detected_ref->[$i]
unless $chipdriver eq $main_entry->{driver};
splice @$detected_ref, $i, 1;
}
}
@@ -2038,7 +2048,8 @@ sub add_i2c_to_chips_detected
push @$new_detected_ref, $datahash;
} else {
# No hard work here
push @$new_misdetected_ref, $datahash;
push @$new_misdetected_ref, $datahash
unless $do_not_add;
}
}