Changeset 291

Timestamp:

03/02/99 11:04:21 (14 years ago)

Author:

frodo

Message:

More bug fixes. Try again, etc.

Location:

lm-sensors/trunk/prog/detect

Files:

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

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

@@ -753 +753 @@
   foreach $main_entry (@chips_detected) {
     foreach $detected_entry (@{$main_entry->{detected}}) {
+      @entry_addrs = ($detected_entry->{i2c_addr});
+      push @entry_addrs, @{$detected_entry->{i2c_sub_addrs}}
+               if exists $datahash->{i2c_sub_addrs};
       if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
           any_list_match \@entry_addrs, \@hash_addrs) {
@@ -833 +836 @@
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
            next;
-      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{address} or
+      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{i2c_addr} or
            print("Can't set I2C address for ",
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),

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

@@ -753 +753 @@
   foreach $main_entry (@chips_detected) {
     foreach $detected_entry (@{$main_entry->{detected}}) {
+      @entry_addrs = ($detected_entry->{i2c_addr});
+      push @entry_addrs, @{$detected_entry->{i2c_sub_addrs}}
+               if exists $datahash->{i2c_sub_addrs};
       if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
           any_list_match \@entry_addrs, \@hash_addrs) {
@@ -833 +836 @@
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
            next;
-      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{address} or
+      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{i2c_addr} or
            print("Can't set I2C address for ",
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),