Changeset 266

Timestamp:

02/23/99 21:28:05 (14 years ago)

Author:

frodo

Message:

Alias detection completed for Nat. Sem. LM7* and Winbond chips

A few ISA detections must still be added; also, I want to add the option not
to scan certain I2C addresses.

Location:

lm-sensors/trunk/prog/detect

Files:

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

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

@@ -78 +78 @@
 );
 
-use subs qw(lm78_detect lm78_isa_detect lm75_detect lm80_detect w83781d_detect
+use subs qw(lm78_detect lm78_isa_detect lm78_alias_detect lm75_detect 
+            lm80_detect w83781d_detect w83781d_alias_detect
             w83781d_isa_detect gl518sm_detect gl520sm_detect adm9240_detect 
             adm1021_detect);
@@ -97 +98 @@
 #      this chip. The function should take one parameter: the ISA address
 #      to probe.
+#  alias_detect (optional): For chips which can be both on the ISA and the
+#      I2C bus, a function which detectes whether two entries are the same.
+#      The function should take three parameters: The ISA address, the
+#      I2C bus number, and the I2C address.
 @chip_ids = (
      {
@@ -105 +110 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect 0, @_ },
+       alias_detect => sub { lm78_alias_detect 0, @_ },
      } ,
      {
@@ -113 +119 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect 1, @_ },
+       alias_detect => sub { lm78_alias_detect 1, @_ },
      } ,
      {
@@ -121 +128 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect 2, @_ },
+       alias_detect => sub { lm78_alias_detect 2, @_ },
      } ,
      {
@@ -141 +149 @@
        isa_addrs => [0x290],
        isa_detect => sub { w83781d_isa_detect 0, @_ },
+       alias_detect => sub { w83781d_alias_detect 0, @_ },
      } ,
      {
@@ -149 +158 @@
        isa_addrs => [0x290],
        isa_detect => sub { w83781d_isa_detect 1, @_ },
+       alias_detect => sub { w83781d_alias_detect 1, @_ },
      } ,
      {
@@ -157 +167 @@
        isa_addrs => [0x290],
        isa_detect => sub { w83781d_isa_detect 2, @_ },
+       alias_detect => sub { w83781d_alias_detect 2, @_ },
      } ,
      {
@@ -639 +650 @@
 #          with field 'algo' containing an algorithm string as appearing
 #               in /proc/bus/i2c
+#          with field 'devnr', contianing the /dev/i2c-* number of this
+#               adapter;
 #          with field 'driver', containing the driver name for this adapter;
 #          with field 'address', containing the I2C address of the detection;
@@ -659 +672 @@
 #          with field 'algo' containing an algorithm string as appearing
 #               in /proc/bus/i2c
+#          with field 'devnr', contianing the /dev/i2c-* number of this
+#               adapter;
 #          with field 'driver', containing the driver name for this adapter;
 #          with field 'address', containing the I2C address of the detection;
@@ -728 +743 @@
 sub add_isa_to_chips_detected
 {
-  my ($chipdriver,$datahash) = @_;
+  my ($alias_detect,$chipdriver,$datahash) = @_;
   my ($detected_ref,$misdetected_ref, $new_detected_ref,$new_misdetected_ref,
       $i,$j,$found_it);
@@ -740 +755 @@
     push @chips_detected, { driver => $chipdriver,
                             detected => [],
-                            misdetected => [] };
+                            misdetected => [], };
   }
   $new_detected_ref = $chips_detected[$i]->{detected};
   $new_misdetected_ref = $chips_detected[$i]->{misdetected};
-
-  # Now, we are looking for aliases. To be done.
-  # If an alias is found, it is removed from the structure, and the data
-  # is put in %$datahash. If not, nothing happens
   
+  # Now, we are looking for aliases. An alias can only be the same chiptype.
+  # If an alias is found in the detected list, it is removed from the 
+  # structure, and the data is put in %$datahash. If it is found in the
+  # misdetected list, the entry is modified, and this function aborted.
+  # If it is not found, nothing happens.
+  for ($j = 0; $j < @$new_misdetected_ref; $j++) {
+    if (exists $new_misdetected_ref->[$j]->{address} and 
+        not exists $new_misdetected_ref->[$j]->{isa_addr} and
+        defined $alias_detect and
+        $new_misdetected_ref->[$j]->{chip_type} eq $datahash->{chip_type}) {
+      if (&$alias_detect ($datahash->{isa_addr},
+                          $new_misdetected_ref->[$j]->{devnr},
+                          $new_misdetected_ref->[$j]->{address})) {
+        $new_misdetected_ref->[$j] = { %$new_misdetected_ref->[$j],
+                                      isa_addr => $datahash->{isa_addr}};
+        return;
+      }
+    }
+  }
+
+  for ($j = 0; $j < @$new_detected_ref; $j++) {
+    if (exists $new_detected_ref->[$j]->{address} and
+        not exists $new_detected_ref->[$j]->{isa_addr} and
+        $new_detected_ref->[$j]->{chip_type} eq $datahash->{chip_type}) {
+      if (&$alias_detect ($datahash->{isa_addr},
+                          $new_detected_ref->[$j]->{devnr},
+                          $new_detected_ref->[$j]->{address})) {
+        $new_detected_ref->[$j]->{isa_addr} = $datahash->{isa_addr};
+        ($datahash) = splice (@$new_detected_ref, $j, 1);
+        last;
+      }
+    }
+  }
+        
   # At long last, we will insert the new reference, looking out whether
   # some other chip has already claimed this ISA address.
@@ -791 +836 @@
     printf "Client found at address 0x%02x\n",$addr;
     foreach $chip (@chip_ids) {
-      if (contains $addr, @{$$chip{i2c_addrs}}) {
+      if (exists $$chip{i2c_addrs} and contains $addr, @{$$chip{i2c_addrs}}) {
         print "Probing for $$chip{name}... ";
         if (($conf,@chips) = &{$$chip{i2c_detect}} (\*FILE ,$addr)) {
@@ -808 +853 @@
                                   algorithm => $algorithm_name,
                                   driver => $adapter_driver,
+                                  devnr => $adapter_nr,
                                 };
           foreach $add_addr(@chips) {
@@ -818 +864 @@
                                     driver => $adapter_driver,
                                     main => $addr,
+                                    devnr => $adapter_nr,
                                   };
           }
@@ -840 +887 @@
       print "Success!\n";
       printf "    (confidence %d, driver `%s')\n", $conf, $$chip{driver};
-      add_isa_to_chips_detected $$chip{driver}, 
+      add_isa_to_chips_detected $$chip{alias_detect},$$chip{driver}, 
                                 { confidence => $conf,
                                   isa_addr => $addr,
@@ -910 +957 @@
                 ($chip == 2 and ($reg & 0xfe) == 0xc0);
   return 7;
+}
+
+
+# $_[0]: Chip to detect (0 = LM78, 1 = LM78-J, 2 = LM79)
+# $_[1]: ISA address
+# $_[2]: I2C file handle
+# $_[3]: I2C address
+sub lm78_alias_detect
+{
+  my ($chip,$isa_addr,$file,$i2c_addr) = @_;
+  my $i;
+  my $readproc = sub { isa_read_byte $isa_addr + 5, $isa_addr + 6, @_ };
+  return 0 unless &$readproc(0x48) == $i2c_addr;
+  for ($i = 0x2b; $i <= 0x3d; $i ++) {
+    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($i);
+  }
+  return 1;
 }
 
@@ -996 +1060 @@
   push @res, (($reg1 & 0x80) >> 4) + 0x48 unless $reg1 & 0x80;
   return @res;
+}
+
+# $_[0]: Chip to detect (0 = W83781D, 1 = W83782D, 3 = W83783S)
+# $_[1]: ISA address
+# $_[2]: I2C file handle
+# $_[3]: I2C address
+sub w83781d_alias_detect
+{
+  my ($chip,$isa_addr,$file,$i2c_addr) = @_;
+  my $i;
+  my $readproc = sub { isa_read_byte $isa_addr + 5, $isa_addr + 6, @_ };
+  return 0 unless &$readproc(0x48) == $i2c_addr;
+  for ($i = 0x2b; $i <= 0x3d; $i ++) {
+    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($i);
+  }
+  return 1;
 }
 

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

@@ -78 +78 @@
 );
 
-use subs qw(lm78_detect lm78_isa_detect lm75_detect lm80_detect w83781d_detect
+use subs qw(lm78_detect lm78_isa_detect lm78_alias_detect lm75_detect 
+            lm80_detect w83781d_detect w83781d_alias_detect
             w83781d_isa_detect gl518sm_detect gl520sm_detect adm9240_detect 
             adm1021_detect);
@@ -97 +98 @@
 #      this chip. The function should take one parameter: the ISA address
 #      to probe.
+#  alias_detect (optional): For chips which can be both on the ISA and the
+#      I2C bus, a function which detectes whether two entries are the same.
+#      The function should take three parameters: The ISA address, the
+#      I2C bus number, and the I2C address.
 @chip_ids = (
      {
@@ -105 +110 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect 0, @_ },
+       alias_detect => sub { lm78_alias_detect 0, @_ },
      } ,
      {
@@ -113 +119 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect 1, @_ },
+       alias_detect => sub { lm78_alias_detect 1, @_ },
      } ,
      {
@@ -121 +128 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect 2, @_ },
+       alias_detect => sub { lm78_alias_detect 2, @_ },
      } ,
      {
@@ -141 +149 @@
        isa_addrs => [0x290],
        isa_detect => sub { w83781d_isa_detect 0, @_ },
+       alias_detect => sub { w83781d_alias_detect 0, @_ },
      } ,
      {
@@ -149 +158 @@
        isa_addrs => [0x290],
        isa_detect => sub { w83781d_isa_detect 1, @_ },
+       alias_detect => sub { w83781d_alias_detect 1, @_ },
      } ,
      {
@@ -157 +167 @@
        isa_addrs => [0x290],
        isa_detect => sub { w83781d_isa_detect 2, @_ },
+       alias_detect => sub { w83781d_alias_detect 2, @_ },
      } ,
      {
@@ -639 +650 @@
 #          with field 'algo' containing an algorithm string as appearing
 #               in /proc/bus/i2c
+#          with field 'devnr', contianing the /dev/i2c-* number of this
+#               adapter;
 #          with field 'driver', containing the driver name for this adapter;
 #          with field 'address', containing the I2C address of the detection;
@@ -659 +672 @@
 #          with field 'algo' containing an algorithm string as appearing
 #               in /proc/bus/i2c
+#          with field 'devnr', contianing the /dev/i2c-* number of this
+#               adapter;
 #          with field 'driver', containing the driver name for this adapter;
 #          with field 'address', containing the I2C address of the detection;
@@ -728 +743 @@
 sub add_isa_to_chips_detected
 {
-  my ($chipdriver,$datahash) = @_;
+  my ($alias_detect,$chipdriver,$datahash) = @_;
   my ($detected_ref,$misdetected_ref, $new_detected_ref,$new_misdetected_ref,
       $i,$j,$found_it);
@@ -740 +755 @@
     push @chips_detected, { driver => $chipdriver,
                             detected => [],
-                            misdetected => [] };
+                            misdetected => [], };
   }
   $new_detected_ref = $chips_detected[$i]->{detected};
   $new_misdetected_ref = $chips_detected[$i]->{misdetected};
-
-  # Now, we are looking for aliases. To be done.
-  # If an alias is found, it is removed from the structure, and the data
-  # is put in %$datahash. If not, nothing happens
   
+  # Now, we are looking for aliases. An alias can only be the same chiptype.
+  # If an alias is found in the detected list, it is removed from the 
+  # structure, and the data is put in %$datahash. If it is found in the
+  # misdetected list, the entry is modified, and this function aborted.
+  # If it is not found, nothing happens.
+  for ($j = 0; $j < @$new_misdetected_ref; $j++) {
+    if (exists $new_misdetected_ref->[$j]->{address} and 
+        not exists $new_misdetected_ref->[$j]->{isa_addr} and
+        defined $alias_detect and
+        $new_misdetected_ref->[$j]->{chip_type} eq $datahash->{chip_type}) {
+      if (&$alias_detect ($datahash->{isa_addr},
+                          $new_misdetected_ref->[$j]->{devnr},
+                          $new_misdetected_ref->[$j]->{address})) {
+        $new_misdetected_ref->[$j] = { %$new_misdetected_ref->[$j],
+                                      isa_addr => $datahash->{isa_addr}};
+        return;
+      }
+    }
+  }
+
+  for ($j = 0; $j < @$new_detected_ref; $j++) {
+    if (exists $new_detected_ref->[$j]->{address} and
+        not exists $new_detected_ref->[$j]->{isa_addr} and
+        $new_detected_ref->[$j]->{chip_type} eq $datahash->{chip_type}) {
+      if (&$alias_detect ($datahash->{isa_addr},
+                          $new_detected_ref->[$j]->{devnr},
+                          $new_detected_ref->[$j]->{address})) {
+        $new_detected_ref->[$j]->{isa_addr} = $datahash->{isa_addr};
+        ($datahash) = splice (@$new_detected_ref, $j, 1);
+        last;
+      }
+    }
+  }
+        
   # At long last, we will insert the new reference, looking out whether
   # some other chip has already claimed this ISA address.
@@ -791 +836 @@
     printf "Client found at address 0x%02x\n",$addr;
     foreach $chip (@chip_ids) {
-      if (contains $addr, @{$$chip{i2c_addrs}}) {
+      if (exists $$chip{i2c_addrs} and contains $addr, @{$$chip{i2c_addrs}}) {
         print "Probing for $$chip{name}... ";
         if (($conf,@chips) = &{$$chip{i2c_detect}} (\*FILE ,$addr)) {
@@ -808 +853 @@
                                   algorithm => $algorithm_name,
                                   driver => $adapter_driver,
+                                  devnr => $adapter_nr,
                                 };
           foreach $add_addr(@chips) {
@@ -818 +864 @@
                                     driver => $adapter_driver,
                                     main => $addr,
+                                    devnr => $adapter_nr,
                                   };
           }
@@ -840 +887 @@
       print "Success!\n";
       printf "    (confidence %d, driver `%s')\n", $conf, $$chip{driver};
-      add_isa_to_chips_detected $$chip{driver}, 
+      add_isa_to_chips_detected $$chip{alias_detect},$$chip{driver}, 
                                 { confidence => $conf,
                                   isa_addr => $addr,
@@ -910 +957 @@
                 ($chip == 2 and ($reg & 0xfe) == 0xc0);
   return 7;
+}
+
+
+# $_[0]: Chip to detect (0 = LM78, 1 = LM78-J, 2 = LM79)
+# $_[1]: ISA address
+# $_[2]: I2C file handle
+# $_[3]: I2C address
+sub lm78_alias_detect
+{
+  my ($chip,$isa_addr,$file,$i2c_addr) = @_;
+  my $i;
+  my $readproc = sub { isa_read_byte $isa_addr + 5, $isa_addr + 6, @_ };
+  return 0 unless &$readproc(0x48) == $i2c_addr;
+  for ($i = 0x2b; $i <= 0x3d; $i ++) {
+    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($i);
+  }
+  return 1;
 }
 
@@ -996 +1060 @@
   push @res, (($reg1 & 0x80) >> 4) + 0x48 unless $reg1 & 0x80;
   return @res;
+}
+
+# $_[0]: Chip to detect (0 = W83781D, 1 = W83782D, 3 = W83783S)
+# $_[1]: ISA address
+# $_[2]: I2C file handle
+# $_[3]: I2C address
+sub w83781d_alias_detect
+{
+  my ($chip,$isa_addr,$file,$i2c_addr) = @_;
+  my $i;
+  my $readproc = sub { isa_read_byte $isa_addr + 5, $isa_addr + 6, @_ };
+  return 0 unless &$readproc(0x48) == $i2c_addr;
+  for ($i = 0x2b; $i <= 0x3d; $i ++) {
+    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($i);
+  }
+  return 1;
 }