Changeset 290

Timestamp:

03/02/99 09:08:29 (14 years ago)

Author:

frodo

Message:

Finally fixed the misdetect error.

Location:

lm-sensors/trunk/prog/detect

Files:

• detect.pl (modified) (5 diffs)
• sensors-detect (modified) (5 diffs)

lm-sensors/trunk/prog/detect/detect.pl

@@ -744 +744 @@
 
   # Find out whether our new entry should go into the detected or the
-  # misdetected list. We only compare main i2c_addr here; so we can have
-  # the unlikely case that we replace a subsidiary i2c_addr with a higher
-  # confidence value. Too bad.
+  # misdetected list. We compare all i2c addresses; if at least one matches,
+  # but our conf value is lower, we assume this is a misdetect.
+  @hash_addrs = ($datahash->{i2c_addr});
+  push @hash_addrs, @{$datahash->{i2c_sub_addrs}}
+       if exists $datahash->{i2c_sub_addrs};
   $put_in_detected = 1;
   FIND_LOOP:
@@ -752 +754 @@
     foreach $detected_entry (@{$main_entry->{detected}}) {
       if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
-          $detected_entry->{i2c_addr} == $datahash->{i2c_addr}) {
+          any_list_match \@entry_addrs, \@hash_addrs) {
         if ($detected_entry->{conf} >= $datahash->{conf}) {
           $put_in_detected = 0;
@@ -891 +893 @@
   }
 
-  # Nor found? OK, put it in the detected list
+  # Not found? OK, put it in the detected list
   push @$new_detected_ref, $datahash;
 }
@@ -899 +901 @@
 # $_[2]: The name of the algorithm, as appearing in /proc/bus/i2c
 # $_[3]: The driver of the adapter
+# @_[4..]: Addresses not to scan
 sub scan_adapter
 {
@@ -935 +938 @@
             @chips = sort @chips;
             foreach $other_addr (sort @chips) {
-              printf(" %02x",$other_addr);
+              printf(" 0x%02x",$other_addr);
             }
           }

lm-sensors/trunk/prog/detect/sensors-detect

@@ -744 +744 @@
 
   # Find out whether our new entry should go into the detected or the
-  # misdetected list. We only compare main i2c_addr here; so we can have
-  # the unlikely case that we replace a subsidiary i2c_addr with a higher
-  # confidence value. Too bad.
+  # misdetected list. We compare all i2c addresses; if at least one matches,
+  # but our conf value is lower, we assume this is a misdetect.
+  @hash_addrs = ($datahash->{i2c_addr});
+  push @hash_addrs, @{$datahash->{i2c_sub_addrs}}
+       if exists $datahash->{i2c_sub_addrs};
   $put_in_detected = 1;
   FIND_LOOP:
@@ -752 +754 @@
     foreach $detected_entry (@{$main_entry->{detected}}) {
       if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
-          $detected_entry->{i2c_addr} == $datahash->{i2c_addr}) {
+          any_list_match \@entry_addrs, \@hash_addrs) {
         if ($detected_entry->{conf} >= $datahash->{conf}) {
           $put_in_detected = 0;
@@ -891 +893 @@
   }
 
-  # Nor found? OK, put it in the detected list
+  # Not found? OK, put it in the detected list
   push @$new_detected_ref, $datahash;
 }
@@ -899 +901 @@
 # $_[2]: The name of the algorithm, as appearing in /proc/bus/i2c
 # $_[3]: The driver of the adapter
+# @_[4..]: Addresses not to scan
 sub scan_adapter
 {
@@ -935 +938 @@
             @chips = sort @chips;
             foreach $other_addr (sort @chips) {
-              printf(" %02x",$other_addr);
+              printf(" 0x%02x",$other_addr);
             }
           }