Changeset 4971

Timestamp:

10/21/07 15:58:27 (6 years ago)

Author:

khali

Message:

sensors-detect-stat.pl: Handle alternative chip lists.
Ultimately this script should be folded into sensors-detect.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect-stat.pl (modified) (3 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -6 +6 @@
   sensors-detect: Fix SMSC LPC47B357/M967 detection
                   Select the right driver for FSC chips
+  sensors-detect-stat.pl: Handle alternative chip lists
 
 3.0.0-rc2 (2007-10-10)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect-stat.pl

@@ -4 +4 @@
 # Statistical analysis of sensors-detect i2c addresses scanner
 # Part of the lm_sensors project
-# Copyright (C) 2003-2004  Jean Delvare <khali@linux-fr.org>
+# Copyright (C) 2003-2007  Jean Delvare <khali@linux-fr.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21 +21 @@
 
 use strict;
-use vars qw(%histo $chips $file);
+use vars qw(%histo $chips $file $skip);
 
 # Where is sensors-detect?
@@ -52 +52 @@
 # Get the data.
 open (SD, $file) || die;
+$skip = 0;
 while (<SD>)
 {
+        # Some chips are handled differently depending on the kernel
+        # version, avoid counting them twice.
+        if (m/^\@chip_kern24_ids\s*=/ || m/^\@chip_oldfsc_ids\s*=/) {
+                $skip = 1;
+                next;
+        }
+        if ($skip && m/^\);$/) {
+                $skip = 0;
+                next;
+        }
+        next if $skip;
+
         # The regular expression may seem a little bit complex, but we wouldn't
         # want to exec malicious code.