Changeset 1865

Timestamp:

07/07/03 12:31:41 (10 years ago)

Author:

khali

Message:

Add LM90 detection.

Fix binmode call for Perl 5.005.
Open /dev/i2c* in binary mode.

Files:

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

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

@@ -771 +771 @@
             fscscy_detect pcf8591_detect arp_detect ipmi_kcs_detect
             ipmi_smic_detect via8231_isa_detect lm85_detect smartbatt_detect
-            adm1026_detect w83l785ts_detect lm83_detect);
+            adm1026_detect w83l785ts_detect lm83_detect lm90_detect);
 
 # This is a list of all recognized chips. 
@@ -1047 +1047 @@
        driver => "lm83",
        i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
+       i2c_detect => sub { lm83_detect 0, @_ },
+     },
+     {
+       name => "National Semiconductor LM90",
+       driver => "to-be-written",
+       i2c_addrs => [0x4c],
        i2c_detect => sub { lm83_detect 0, @_ },
      },
@@ -1355 +1361 @@
   sysopen (IOPORTS, "/dev/port", O_RDWR)
     or die "/dev/port: $!\n";
-  binmode (IOPORTS, ':raw');
+  binmode IOPORTS;
 }
 
@@ -1934 +1940 @@
                    "/dev/i2c[-/]$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
              next;
+      binmode FILE;
       i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{i2c_addr} or
            print("Can't set I2C address for ",
@@ -1962 +1969 @@
                    "/dev/i2c[-/]$new_detected_ref->[$i]->{i2c_devnr}?!?\n"),
              next;
+      binmode FILE;
       i2c_set_slave_addr \*FILE,$new_detected_ref->[$i]->{i2c_addr} or
            print("Can't set I2C address for ",
@@ -2032 +2040 @@
       open FILE,"/dev/i2c/$adapter_nr" or 
          (print "Can't open /dev/i2c[-/]$adapter_nr\n"), return;
+  binmode FILE;
 
   # Now scan each address in turn
@@ -2379 +2388 @@
 sub lm83_detect
 {
-  my $reg;
   my ($chip, $file,$addr) = @_;
   return if $chip == 0 and i2c_smbus_read_byte_data($file,0xfe) != 0x01;
   return 8
         if i2c_smbus_read_byte_data($file,0x04) == 0x00;
+  return 6;
+}
+
+# $_[0]: Chip to detect
+#   (0 = LM90)
+# $_[1]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[2]: Address
+# Returns: undef if not detected, 6, 7 or 8 if detected.
+# Registers used:
+#   0x03: Configuration
+#   0xfe: Manufacturer ID
+#   0xff: Chip ID / die revision
+sub lm90_detect
+{
+  my $reg;
+  my ($chip, $file,$addr) = @_;
+  return if $chip == 0 and i2c_smbus_read_byte_data($file,0xfe) != 0x01;
+  return if (i2c_smbus_read_byte_data($file,0x03) & 0x2a) != 0;
+  return 8
+        if ($reg = i2c_smbus_read_byte_data($file,0xff)) == 0x21;
+  return 7
+    if $reg > 0x21 and $reg < 0x30;
   return 6;
 }