Changeset 2413

Timestamp:

04/05/04 20:29:27 (9 years ago)

Author:

khali

Message:

Review comments on Super IO chips declaration.

Add two SMSC Super IO chips.
Support 2.6 /proc/modules (with underscores).
Fix double input request for /etc/sysconfig creation.

Files:

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

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

@@ -1307 +1307 @@
 #  driver: The driver name (without .o extension). Put in
 #      "to-be-written" if it is not yet available.
-#  addrreg: The address register
-#  datareg: The data register
 #  enter: The password sequence to write to the address register
 #  devid: The device ID(s) we have to match (base device)
 #  logdev: The logical device containing the sensors
-#  exit (optional): Sequence of addr,val pairs which exits config mode
+#  exit (optional): Sequence to write to the address register to exit config
+#      mode. If not provided, a default reset operation is performed.
 #  alias_detect (optional): For chips which can be both on the ISA and the
 #      I2C bus, a function which detectes whether two entries are the same.
@@ -1421 +1420 @@
      }, 
      {
+        name => "SMSC 47S42x Super IO Fan Sensors",
+        driver => "to-be-written",
+        enter => [0x55],
+        devid => 0x57,
+        logdev => 0x0a,
+        exit => [0xaa],
+     }, 
+     {
+        name => "SMSC 47S45x Super IO Fan Sensors",
+        driver => "to-be-written",
+        enter => [0x55],
+        devid => 0x62,
+        logdev => 0x0a,
+        exit => [0xaa],
+     }, 
+     {
         name => "VT1211 Super IO Sensors",
         driver => "vt1211",
@@ -1461 +1476 @@
      }, 
      {
-        name => "Winbond W83697UF Super IO PWM",
+        name => "Winbond W83697SF/UF Super IO PWM",
         driver => "to-be-written",
         enter => [0x87, 0x87],
@@ -1669 +1684 @@
   open INPUTFILE, "/proc/modules" or die "Can't access /proc/modules!";
   while (<INPUTFILE>) {
+    tr/_/-/;
     push @modules_list, /^(\S*)/ ;
   }
@@ -4498 +4514 @@
     print "\nAs you are not root, we shall skip this step.\n";
   } else {
-    if (($have_sysconfig and not <STDIN> =~ /^\s*[Nn]/) or <STDIN> =~ /^\s*[Yy]/) {
+    $_ = <STDIN>;
+    if (($have_sysconfig and not m/^\s*[Nn]/) or m/^\s*[Yy]/) {
       unless ($have_sysconfig) {
         mkdir '/etc/sysconfig', 0777