Changeset 5269

Timestamp:

05/28/08 11:52:16 (5 years ago)

Author:

khali

Message:

Have a common function for LM78-like ISA access, so that we no longer have
to define it again each time we need it.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (7 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -2212 +2212 @@
 }
 
+# $_[0]: Base address
+# $_[1]: Register to read
+# Returns: read value
+# This one can be used for any ISA chip with index register at
+# offset 5 and data register at offset 6.
+sub isa_read_i5d6
+{
+  my ($addr, $reg) = @_;
+  return isa_read_byte($addr + 5, $addr + 6, $reg);
+}
+
 #################
 # AUTODETECTION #
@@ -3555 +3566 @@
     return;
   }
-  my $readproc = sub { isa_read_byte($addr + 5, $addr + 6, @_) };
-  return unless (&$readproc(0x40) & 0x80) == 0x00;
-  my $reg = &$readproc(0x49);
+
+  return unless (isa_read_i5d6($addr, 0x40) & 0x80) == 0x00;
+  my $reg = isa_read_i5d6($addr, 0x49);
   return unless ($chip == 0 and ($reg == 0x00 or $reg == 0x20)) or
                 ($chip == 1 and $reg == 0x40) or
@@ -3563 +3574 @@
 
   # Explicitly prevent misdetection of Winbond chips
-  $reg = &$readproc(0x4f);
+  $reg = isa_read_i5d6($addr, 0x4f);
   return if $reg == 0xa3 || $reg == 0x5c;
 
   # Explicitly prevent misdetection of ITE chips
-  $reg = &$readproc(0x58);
+  $reg = isa_read_i5d6($addr, 0x58);
   return if $reg == 0x90;
 
@@ -3582 +3593 @@
   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;
+
+  return 0 unless isa_read_i5d6($isa_addr, 0x48) == $i2c_addr;
   for ($i = 0x2b; $i <= 0x3d; $i ++) {
-    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($file, $i);
+    return 0 unless isa_read_i5d6($isa_addr, $i) == i2c_smbus_read_byte_data($file, $i);
   }
   return 1;
@@ -4597 +4608 @@
   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;
+
+  return 0 unless isa_read_i5d6($isa_addr, 0x48) == $i2c_addr;
   for ($i = 0x2b; $i <= 0x3d; $i ++) {
-    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($file, $i);
+    return 0 unless isa_read_i5d6($isa_addr, $i) == i2c_smbus_read_byte_data($file, $i);
   }
   return 1;
@@ -4623 +4634 @@
   }
 
-  my $read_proc = sub { isa_read_byte($addr + 5, $addr + 6, @_) };
-  $reg1 = &$read_proc(0x4e);
-  $reg2 = &$read_proc(0x4f);
+  $reg1 = isa_read_i5d6($addr, 0x4e);
+  $reg2 = isa_read_i5d6($addr, 0x4f);
   return unless (($reg1 & 0x80) == 0x00 and $reg2 == 0xa3) or
                 (($reg1 & 0x80) == 0x80 and $reg2 == 0x5c);
   return unless ($reg1 & 0x07) == 0x00;
-  $reg1 = &$read_proc(0x58);
+  $reg1 = isa_read_i5d6($addr, 0x58);
   return if $chip == 0 and  ($reg1 & 0xfe) != 0x10;
   return if $chip == 1 and  ($reg1 & 0xfe) != 0x30;
@@ -4985 +4995 @@
   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;
+
+  return 0 unless isa_read_i5d6($isa_addr, 0x48) == $i2c_addr;
   for ($i = 0x30; $i <= 0x45; $i++) {
-    return 0 unless &$readproc($i) == i2c_smbus_read_byte_data($file, $i);
+    return 0 unless isa_read_i5d6($isa_addr, $i) == i2c_smbus_read_byte_data($file, $i);
   }
   return 1;