Changeset 5425

Timestamp:

11/24/08 18:10:31 (4 years ago)

Author:

khali

Message:

Merge the GL520 detection into gl518_detect.

Files:

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

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

@@ -816 +816 @@
        driver => "gl518sm",
        i2c_addrs => [0x2c, 0x2d],
-       i2c_detect => sub { gl518sm_detect(@_); },
+       i2c_detect => sub { gl518sm_detect(@_, 0); },
      },
      {
@@ -822 +822 @@
        driver => "gl520sm",
        i2c_addrs => [0x2c, 0x2d],
-       i2c_detect => sub { gl520sm_detect(@_); },
+       i2c_detect => sub { gl518sm_detect(@_, 1); },
      },
      {
@@ -4361 +4361 @@
 }
 
+# Chip to detect: 0 = GL518SM, 1 = GL520SM
 # Registers used:
 #   0x00: Device ID
 #   0x01: Revision ID
 #   0x03: Configuration
-# Mediocre detection
 sub gl518sm_detect
 {
-  my ($file, $addr) = @_;
+  my ($file, $addr, $chip) = @_;
   my $reg;
-  return unless i2c_smbus_read_byte_data($file, 0x00) == 0x80;
-  return unless (i2c_smbus_read_byte_data($file, 0x03) & 0x80) == 0x00;
-  $reg = i2c_smbus_read_byte_data($file, 0x01);
-  return unless $reg == 0x00 or $reg == 0x80;
-  return (6);
-}
-
-# Registers used:
-#   0x00: Device ID
-#   0x01: Revision ID
-#   0x03: Configuration
-# Mediocre detection
-sub gl520sm_detect
-{
-  my ($file, $addr) = @_;
-  return unless i2c_smbus_read_byte_data($file, 0x00) == 0x20;
+
+  $reg = i2c_smbus_read_byte_data($file, 0x00);
+  return if $chip == 0 && $reg != 0x80;
+  return if $chip == 1 && $reg != 0x20;
+
   return unless (i2c_smbus_read_byte_data($file, 0x03) & 0x80) == 0x00;
   $reg = i2c_smbus_read_byte_data($file, 0x01);