Changeset 5244

Timestamp:

05/09/08 20:01:00 (3 months ago)

Author:

khali

Message:

Fix the parsing of I2C addresses not to scan.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -18 +18 @@
-                          Add Intel ICH10 (bus) detection
-                          Don't probe I2C addresses 0x40-0x47
+                          Fix the parsing of I2C addresses not to scan
-
-2.10.6 "Welcome Home Lina" (20080306)

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

@@ -2074 +2074 @@
-}
-
+# Address can be decimal or hexadecimal
+sub valid_address
+{
+  my $value = shift;
+
+  if ($value !~ m/^(0x[0-9a-f]+|[0-9]+)$/i) {
+    print "$value is not a valid address, sorry.\n";
+    exit -1;
+  }
+  $value = oct($value) if $value =~ /^0x/i;
+
+  return $value;
+}
+
-sub parse_not_to_scan
-{
@@ -2081 +2095 @@
-  my $range;
-  foreach $range (@ranges) {
-$end) = split /\s*-
-oct $start if $start =~ /^0/
+ $end) = split /\s*-\
+valid_address($start)
-    if (defined $end) {
-
+
+
+
+
+
-      $start = $min if $start < $min;
-      $end = $max if $end > $max;
-+0..$end+0
+..$end
-    } else {
-+0
+
-    }
-  }
@@ -3042 +3060 @@
-  foreach $addr (@{$i2c_addresses_to_scan}) {
-    # As the not_to_scan list is sorted, we can check it fast
+    shift @not_to_scan # User skipped an address which we didn't intend to probe anyway
+      while (@not_to_scan and $not_to_scan[0] < $addr);
-    if (@not_to_scan and $not_to_scan[0] == $addr) {
-      shift @not_to_scan;
@@ -5676 +5696 @@
-      $inp2 = <STDIN>;
-      chop $inp2;
- 0,0x7f,$inp2
+(0x03, 0x77, $inp2)
-    }
-    scan_adapter $dev_nr, $adap, $i2c_adapters[$dev_nr]->{'driver'},