Changeset 5419

Timestamp:

11/24/08 16:50:00 (4 years ago)

Author:

khali

Message:

Refactor IPMI detection functions.

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

@@ -1331 +1331 @@
        driver => "ipmisensors",
        isa_addrs => [0x0ca0],
-       isa_detect => sub { ipmi_kcs_detect(@_); },
+       isa_detect => sub { ipmi_detect(@_); },
      },
      {
@@ -1337 +1337 @@
        driver => "ipmisensors",
        isa_addrs => [0x0ca8],
-       isa_detect => sub { ipmi_smic_detect(@_); },
+       isa_detect => sub { ipmi_detect(@_); },
      },
 );
@@ -5212 +5212 @@
 }
 
-# These are simple detectors that only look for a register at the
-# standard location.
+# We simply look for a register at standard locations.
 # For KCS, use the STATUS register. For SMIC, use the FLAGS register.
-sub ipmi_kcs_detect
-{
-  return if inb(0x0ca3) == 0xff;
-  return 4;
-}
-
-sub ipmi_smic_detect
-{
-  return if inb(0x0cab) == 0xff;
+# Incidentally they live at the same offset.
+sub ipmi_detect
+{
+  my ($addr) = @_;
+  return if inb($addr + 3) == 0xff;
   return 4;
 }