Changeset 5417

Timestamp:

11/24/08 16:27:26 (4 years ago)

Author:

khali

Message:

Drop $chip parameter from all detection functions which handle only
one chip. Let's not make the code more complex than needed.

Files:

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

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

@@ -660 +660 @@
        driver => "to-be-written",
        i2c_addrs => [0x4c],
-       i2c_detect => sub { andigilog_aSC7511_detect(0, @_); },
+       i2c_detect => sub { andigilog_aSC7511_detect(@_); },
      },
      {
@@ -738 +738 @@
        driver => "w83793",
        i2c_addrs => [0x2c..0x2f],
-       i2c_detect => sub { w83793_detect(0, @_); },
+       i2c_detect => sub { w83793_detect(@_); },
      },
      {
@@ -822 +822 @@
        driver => "w83l785ts",
        i2c_addrs => [0x2e],
-       i2c_detect => sub { w83l785ts_detect(0, @_); },
+       i2c_detect => sub { w83l785ts_detect(@_); },
      },
      {
@@ -876 +876 @@
        driver => "adm1026",
        i2c_addrs => [0x2c, 0x2d, 0x2e],
-       i2c_detect => sub { adm1026_detect(0, @_); },
+       i2c_detect => sub { adm1026_detect(@_); },
      },
      {
@@ -936 +936 @@
        driver => "max6650",
        i2c_addrs => [0x1b, 0x1f, 0x48, 0x4b],
-       i2c_detect => sub { max6650_detect(0, @_); },
+       i2c_detect => sub { max6650_detect(@_); },
      },
      {
@@ -942 +942 @@
        driver => "max6655",
        i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
-       i2c_detect => sub { max6655_detect(0, @_); },
+       i2c_detect => sub { max6655_detect(@_); },
      },
      {
@@ -984 +984 @@
        driver => "lm83",
        i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
-       i2c_detect => sub { lm83_detect(0, @_); },
+       i2c_detect => sub { lm83_detect(@_); },
      },
      {
@@ -1130 +1130 @@
        driver => "adm1029",
        i2c_addrs => [0x28..0x2f],
-       i2c_detect => sub { adm1029_detect(0, @_); },
+       i2c_detect => sub { adm1029_detect(@_); },
      },
      {
@@ -1184 +1184 @@
        driver => "use-isa-instead",
        i2c_addrs => [0x2d],
-       i2c_detect => sub { vt1211_i2c_detect(0, @_); },
+       i2c_detect => sub { vt1211_i2c_detect(@_); },
      },
      {
@@ -1190 +1190 @@
        driver => "it87",
        i2c_addrs => [0x28..0x2f],
-       i2c_detect => sub { ite_detect(0, @_); },
+       i2c_detect => sub { it8712_detect(@_); },
      },
      {
@@ -3759 +3759 @@
 }
 
-# $_[0]: Chip to detect
-#   (0 = LM82/LM83)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 # Returns: undef if not detected, 4 to 8 if detected.
 # Registers used:
@@ -3781 +3779 @@
 sub lm83_detect
 {
-  my ($chip, $file) = @_;
+  my ($file, $addr) = @_;
   return if i2c_smbus_read_byte_data($file, 0xfe) != 0x01;
   my $chipid = i2c_smbus_read_byte_data($file, 0xff);
@@ -4016 +4014 @@
 }
 
-# $_[0]: Chip to detect
-#   (0 = ADM1029)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address (unused)
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address (unused)
 # Returns: undef if not detected, 6 if detected.
 # Registers used:
@@ -4029 +4025 @@
 sub adm1029_detect
 {
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
   my $mid = i2c_smbus_read_byte_data($file, 0x0d);
   my $cid = i2c_smbus_read_byte_data($file, 0x0e);
   my $cfg;
 
-  if ($chip == 0) {
-    return unless $mid == 0x41;             # Analog Devices
-    return unless ($cid & 0xF0) == 0x00;    # ADM1029
-
-    # Extra check on unused bits
-    $cfg = i2c_smbus_read_byte_data($file, 0x02);
-    return unless $cfg == 0x03;
-    $cfg = i2c_smbus_read_byte_data($file, 0x06);
-    return unless ($cfg & 0xF9) == 0x01;
-    foreach my $reg (0x03, 0x07, 0x08, 0x09) {
-      $cfg = i2c_smbus_read_byte_data($file, $reg);
-      return unless ($cfg & 0xFC) == 0x00;
-    }
-
-    return 7;
-  }
-  return;
+  return unless $mid == 0x41;             # Analog Devices
+  return unless ($cid & 0xF0) == 0x00;    # ADM1029
+
+  # Extra check on unused bits
+  $cfg = i2c_smbus_read_byte_data($file, 0x02);
+  return unless $cfg == 0x03;
+  $cfg = i2c_smbus_read_byte_data($file, 0x06);
+  return unless ($cfg & 0xF9) == 0x01;
+  foreach my $reg (0x03, 0x07, 0x08, 0x09) {
+    $cfg = i2c_smbus_read_byte_data($file, $reg);
+    return unless ($cfg & 0xFC) == 0x00;
+  }
+
+  return 7;
 }
 
@@ -4254 +4247 @@
 }
 
-# $_[0]: Chip to detect
-#   (0 = aSC7511)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address (unused)
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address (unused)
 # Returns: undef if not detected, 1 if detected.
 # Registers used:
@@ -4264 +4255 @@
 sub andigilog_aSC7511_detect
 {
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
   my $mid = i2c_smbus_read_byte_data($file, 0xfe);
   my $die = i2c_smbus_read_byte_data($file, 0xff);
 
-  if ($chip == 0) {
-    return if $mid != 0x61;     # Andigilog
-    if ($die == 0x0) {
-        return 3;
-    } else {
-        return 1;
-    }
-  }
-  return;
+  return if $mid != 0x61;     # Andigilog
+  if ($die == 0x0) {
+      return 3;
+  } else {
+      return 1;
+  }
 }
 
@@ -4425 +4413 @@
 }
 
-# $_[0]: Chip to detect (0 = W83793)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 # Returns: undef if not detected
 #          6 if detected and bank different from 0
@@ -4441 +4428 @@
 {
   my ($bank, $reg, @res);
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
 
   $bank = i2c_smbus_read_byte_data($file, 0x00);
@@ -4450 +4437 @@
 
   $reg = i2c_smbus_read_byte_data($file, 0x0e);
-  return if $chip == 0 and $reg != 0x7b;
+  return if $reg != 0x7b;
 
 # If bank 0 is selected, we can do more checks
@@ -4684 +4671 @@
 }
 
-# $_[0]: Chip to detect (0 = ADM1026)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 # Returns: undef if not detected, (8) if detected.
 # Registers used:
@@ -4694 +4680 @@
 {
   my $reg;
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
   $reg = i2c_smbus_read_byte_data($file, 0x16);
   return unless ($reg == 0x41);
@@ -4863 +4849 @@
 }
 
-# $_[0]: Chip to detect (0 = IT8712F)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 # Returns: undef if not detected, 7 or 8 if detected (tops LM78).
 # Registers used:
@@ -4871 +4856 @@
 #   0x48: Full I2C Address
 #   0x58: Mfr ID
-#   0x5b: Device ID (not on IT8705)
-sub ite_detect
+#   0x5b: Device ID
+sub it8712_detect
 {
   my $reg;
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
   return unless i2c_smbus_read_byte_data($file, 0x48) == $addr;
   return unless (i2c_smbus_read_byte_data($file, 0x00) & 0x90) == 0x10;
   return unless i2c_smbus_read_byte_data($file, 0x58) == 0x90;
-  return if $chip == 0 and i2c_smbus_read_byte_data($file, 0x5b) != 0x12;
+  return if i2c_smbus_read_byte_data($file, 0x5b) != 0x12;
   return (7 + ($addr == 0x2d));
 }
@@ -5160 +5145 @@
 }
 
-# $_[0]: Chip to detect (0 = W83L785TS-S)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 # Returns: undef if not detected, 8 if detected
 # Registers used:
@@ -5168 +5152 @@
 sub w83l785ts_detect
 {
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
   return unless i2c_smbus_read_byte_data($file, 0x4c) == 0xa3;
   return unless i2c_smbus_read_byte_data($file, 0x4d) == 0x5c;
@@ -5175 +5159 @@
 }
 
-# $_[0]: Chip to detect. Always zero for now, but available for future use
-#        if somebody finds a way to distinguish MAX6650 and MAX6651.
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 # Returns: undef if not detected, 3 if detected.
 #
@@ -5196 +5178 @@
 sub max6650_detect
 {
-  my ($chip, $file) = @_;
+  my ($file, $addr) = @_;
 
   my $conf = i2c_smbus_read_byte_data($file, 0x02);
@@ -5209 +5191 @@
 }
 
-# $_[0]: Chip to detect. Always zero.
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address.
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address.
 #
 # Returns: undef if not detected, 6 if detected.
 sub max6655_detect
 {
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
 
   # checking RDID (Device ID)
@@ -5231 +5212 @@
 }
 
-# $_[0]: Chip to detect (0 = VT1211)
-# $_[1]: A reference to the file descriptor to access this chip.
-# $_[2]: Address
+# $_[0]: A reference to the file descriptor to access this chip.
+# $_[1]: Address
 #
 # This isn't very good detection.
@@ -5241 +5221 @@
 sub vt1211_i2c_detect
 {
-  my ($chip, $file, $addr) = @_;
+  my ($file, $addr) = @_;
   return unless (i2c_smbus_read_byte_data($file, 0x48) & 0x7f) == $addr;
   return unless i2c_smbus_read_byte_data($file, 0x3f) == 0xb0;