Changeset 5416

Timestamp:

11/24/08 15:56:18 (4 years ago)

Author:

khali

Message:

Drop separate LM78-J entry, we really have no good reason to handle
the LM78-J differently from the original LM78.

Files:

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

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

@@ -537 +537 @@
        isa_addrs => [0x290],
        isa_detect => sub { lm78_isa_detect(0, @_); },
-       alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3d); },
-     },
-     {
-       name => "National Semiconductor LM78-J",
-       driver => "lm78",
-       i2c_addrs => [0x28..0x2f],
-       i2c_detect => sub { lm78_detect(1, @_); },
-       isa_addrs => [0x290],
-       isa_detect => sub { lm78_isa_detect(1, @_); },
        alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3d); },
      },
@@ -3393 +3384 @@
 }
 
-# $_[0]: Chip to detect (0 = LM78, 1 = LM78-J, 2 = LM79)
+# $_[0]: Chip to detect (0 = LM78, 2 = LM79)
 # $_[1]: A reference to the file descriptor to access this chip.
 # $_[2]: Address
@@ -3408 +3399 @@
   return unless (i2c_smbus_read_byte_data($file, 0x40) & 0x80) == 0x00;
   $reg = i2c_smbus_read_byte_data($file, 0x49);
-  return unless ($chip == 0 and ($reg == 0x00 or $reg == 0x20)) or
-                    ($chip == 1 and $reg == 0x40) or
+  return unless ($chip == 0 and ($reg == 0x00 or $reg == 0x20 or $reg == 0x40)) or
                     ($chip == 2 and ($reg & 0xfe) == 0xc0);
 
@@ -3419 +3409 @@
 }
 
-# $_[0]: Chip to detect (0 = LM78, 1 = LM78-J, 2 = LM79)
+# $_[0]: Chip to detect (0 = LM78, 2 = LM79)
 # $_[1]: Address
 # Returns: undef if not detected, 6 if detected.
@@ -3439 +3429 @@
   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
+  return unless ($chip == 0 and ($reg == 0x00 or $reg == 0x20 or $reg == 0x40)) or
                 ($chip == 2 and ($reg & 0xfe) == 0xc0);