Changeset 255

Timestamp:

02/19/99 19:11:03 (10 years ago)

Author:

frodo

Message:

Detect now ouputs an overview of what drivers to load and which you

definitely should not load.

Also fixed GL520 detection bug. Some other bugs are probably still there.

The report is generated using a very intricate data structure. There
can easily be hidden problems. Just test, test, test :-)

Files:

• lm-sensors/trunk/TODO (modified) (1 diff)
• lm-sensors/trunk/prog/detect/detect.pl (modified) (12 diffs)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (12 diffs)

lm-sensors/trunk/TODO

@@ -1 +1 @@
-Many, many things. Most notably:
-
-
+
+
-* Create wait-queues for bus locking instead of pure semaphores, to make
-  it more interactive

lm-sensors/trunk/prog/detect/detect.pl

@@ -41 +41 @@
-# Function) and procid (string as appears in /proc/pci; see linux/driver/pci,
-# either pci.c or oldproc.c). If no driver is written yet, omit the 
-
+
+
+
-@pci_adapters = ( 
-     { 
@@ -48 +50 @@
-       func => 3,
-       procid => "Intel 82371AB PIIX4 ACPI",
-
+
+
-     } , 
-     { 
@@ -55 +58 @@
-       func => 3,
-       procid => "VIA Technologies VT 82C586B Apollo ACPI",
-
+
+
-     } ,
-     {
@@ -62 +66 @@
-       func => 0,
-       procid => "Silicon Integrated Systems 85C503",
+       match => sub { 0 },
-     } ,
-     {
@@ -68 +73 @@
-       funcid => 0,
-       procid => "Acer Labs M7101",
-
+
+
-     }
-);
@@ -138 +144 @@
-       name => "Genesys Logic GL520SM",
-       i2c_addrs => [0x4c, 0x4d],
-1, 
+
-     },
-     {
@@ -313 +319 @@
-}
-
+# $_[0]: Description as found in /proc/bus/i2c
+sub find_adapter_driver
+{
+  my $adapter;
+  for $adapter (@pci_adapters) {
+    return $adapter->{driver} if &{$adapter->{match}} ($_[0]);
+  }
+  return "?????";
+}
+
-#############################
-# I2C AND SMBUS /DEV ACCESS #
@@ -526 +542 @@
-####################
-
+use vars qw(@chips_detected);
+
+# We will build a complicated structure @chips_detected here, being:
+# A list of
+#  references to hashes
+#    with field 'driver', being a string with the driver name for this chip;
+#    with field 'detected'
+#      being a reference to a list of
+#        references to hashes
+#          with field 'description' containing an adapter string as appearing
+#               in /proc/bus/i2c
+#          with field 'driver', containing the driver name for this adapter;
+#          with field 'address', containing the I2C address of the detection;
+#          with field 'confidence', containing the confidence level of this
+#               detection
+#          with field 'chipname", containing the chip name
+#          
+#    with field 'misdetected'
+#      being a reference to a list of
+#        references to hashes
+#          with field 'description' containing an adapter string as appearing
+#               in /proc/bus/i2c
+#          with field 'driver', containing the driver name for this adapter;
+#          with field 'address', containing the I2C address of the detection;
+#          with field 'confidence', containing the confidence level of this
+#               detection
+#          with field 'chipname", containing the chip name
+
+# $_[0]: chip driver
+# $_[1]: reference to data hash
+sub add_to_chips_detected
+{
+  my ($chipdriver,$datahash,$detected_ref,$misdetected_ref,
+      $new_detected_ref,$new_misdetected_ref) = @_;
+  my ($i,$j,$found_it);
+  for ($i = 0; $i < @chips_detected; $i++) {
+    last if ($chips_detected[$i]->{driver} eq $chipdriver);
+  }
+  if ($i == @chips_detected) {
+    push @chips_detected, { driver => $chipdriver,
+                            detected => [],
+                            misdetected => [] };
+  }
+
+  $new_detected_ref = $chips_detected[$i]->{detected};
+  $new_misdetected_ref = $chips_detected[$i]->{misdetected};
+
+  # This is tricky, mostly because of the datastructures involved. We walk
+  # through all previous detections for this address. If the to-be-inserted
+  # detection matches an item in it, we look at the confidence values.
+  # If the to-be-inserted detections's confidence is greater, we delegate
+  # the previous detection to the misdetections, and replace it with this
+  # detection. If it is equal or less, we add the to-be-inserted detection
+  # to the misdetections. As soon as a match is found, we break. If no
+  # matches are found at all, add the to-be-inserted detection with the
+  # detections.
+  $found_it = 0;
+  LOOP: for ($i = 0; $i < @chips_detected; $i++) {
+    $detected_ref = $chips_detected[$i]->{detected};
+    $misdetected_ref = $chips_detected[$i]->{misdetected};
+    for ($j = 0; $j < @$detected_ref ; $j++) {
+      if ($detected_ref->[$j]->{driver} eq $datahash->{driver} and
+          $detected_ref->[$j]->{description} eq $datahash->{description} and
+          $detected_ref->[$j]->{address} eq $datahash->{address}) {
+        if ($detected_ref->[$j]->{confidence} > $datahash->{confidence}) {
+          push @$misdetected_ref, $detected_ref->[$j];
+          splice @$detected_ref, $j, 1;
+          push @$new_detected_ref, $datahash;
+          $found_it = 1;
+          last LOOP;
+        } else {
+          push @$new_misdetected_ref, $datahash;
+          $found_it = 1;
+          last LOOP;
+        }
+      }
+    }
+  }
+  push @$new_detected_ref, $datahash if not $found_it
+}
+
-# $_[0]: The number of the adapter to scan
+# $_[1]: The name of the adapter, as appearing in /proc/bus/i2c
+# $_[2]: The driver of the adapter
-sub scan_adapter
-{
+  my ( $adapter_nr,$adapter_name,$adapter_driver) = @_;
-  my ($chip, $addr, $conf,@chips);
-_[0]" or print ("Can't open /dev/i2c-$_[0] ($!)\n"),
-                        
+adapter_nr" or
+print ("Can't open /dev/i2c-$adapter_nr ($!)\n"),
-  foreach $addr (0..0x7f) {
-    i2c_set_slave_addr(\*FILE,$addr) or print("Can't set address to $_?!?\n"), 
@@ -537 +637 @@
-    next unless i2c_smbus_read_byte(\*FILE) >= 0;
-    printf "Client found at address 0x%02x\n",$addr;
+    my @detection_list = ();
+    my $highest_conf = 0;
+    my $double_conf = 0;
-    foreach $chip (@chip_ids) {
-      if (contains $addr, @{$$chip{i2c_addrs}}) {
@@ -548 +651 @@
-            print ")\n";
-          }
+          add_to_chips_detected $$chip{driver},
+                                { confidence => $conf,
+                                  address => $addr,
+                                  chipname =>  $$chip{name},
+                                  description => $adapter_name,
+                                  driver => $adapter_driver,
+                                };
-        } else {
- 
+;
-        }
-      }
@@ -887 +997 @@
-              "module. If not,",
-              " you won't be able to open any /dev/i2c-* file.\n";
-proc
+dev
-        print " Loading failed ($!), aborting.\n";
-        exit;
@@ -906 +1016 @@
-    print "\n";
-    my ($dev_nr,$description) = /^i2c-(\S+)\s+\S+\s+(.*)$/;
+    $description =~ s/\t/ /;
-    print "Next adapter: $description\n";
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
-
-main;
-
-
-      
-
-
-# TEST!
-# scan_adapter 0;
-#}
-
-#

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

@@ -41 +41 @@
-# Function) and procid (string as appears in /proc/pci; see linux/driver/pci,
-# either pci.c or oldproc.c). If no driver is written yet, omit the 
-
+
+
+
-@pci_adapters = ( 
-     { 
@@ -48 +50 @@
-       func => 3,
-       procid => "Intel 82371AB PIIX4 ACPI",
-
+
+
-     } , 
-     { 
@@ -55 +58 @@
-       func => 3,
-       procid => "VIA Technologies VT 82C586B Apollo ACPI",
-
+
+
-     } ,
-     {
@@ -62 +66 @@
-       func => 0,
-       procid => "Silicon Integrated Systems 85C503",
+       match => sub { 0 },
-     } ,
-     {
@@ -68 +73 @@
-       funcid => 0,
-       procid => "Acer Labs M7101",
-
+
+
-     }
-);
@@ -138 +144 @@
-       name => "Genesys Logic GL520SM",
-       i2c_addrs => [0x4c, 0x4d],
-1, 
+
-     },
-     {
@@ -313 +319 @@
-}
-
+# $_[0]: Description as found in /proc/bus/i2c
+sub find_adapter_driver
+{
+  my $adapter;
+  for $adapter (@pci_adapters) {
+    return $adapter->{driver} if &{$adapter->{match}} ($_[0]);
+  }
+  return "?????";
+}
+
-#############################
-# I2C AND SMBUS /DEV ACCESS #
@@ -526 +542 @@
-####################
-
+use vars qw(@chips_detected);
+
+# We will build a complicated structure @chips_detected here, being:
+# A list of
+#  references to hashes
+#    with field 'driver', being a string with the driver name for this chip;
+#    with field 'detected'
+#      being a reference to a list of
+#        references to hashes
+#          with field 'description' containing an adapter string as appearing
+#               in /proc/bus/i2c
+#          with field 'driver', containing the driver name for this adapter;
+#          with field 'address', containing the I2C address of the detection;
+#          with field 'confidence', containing the confidence level of this
+#               detection
+#          with field 'chipname", containing the chip name
+#          
+#    with field 'misdetected'
+#      being a reference to a list of
+#        references to hashes
+#          with field 'description' containing an adapter string as appearing
+#               in /proc/bus/i2c
+#          with field 'driver', containing the driver name for this adapter;
+#          with field 'address', containing the I2C address of the detection;
+#          with field 'confidence', containing the confidence level of this
+#               detection
+#          with field 'chipname", containing the chip name
+
+# $_[0]: chip driver
+# $_[1]: reference to data hash
+sub add_to_chips_detected
+{
+  my ($chipdriver,$datahash,$detected_ref,$misdetected_ref,
+      $new_detected_ref,$new_misdetected_ref) = @_;
+  my ($i,$j,$found_it);
+  for ($i = 0; $i < @chips_detected; $i++) {
+    last if ($chips_detected[$i]->{driver} eq $chipdriver);
+  }
+  if ($i == @chips_detected) {
+    push @chips_detected, { driver => $chipdriver,
+                            detected => [],
+                            misdetected => [] };
+  }
+
+  $new_detected_ref = $chips_detected[$i]->{detected};
+  $new_misdetected_ref = $chips_detected[$i]->{misdetected};
+
+  # This is tricky, mostly because of the datastructures involved. We walk
+  # through all previous detections for this address. If the to-be-inserted
+  # detection matches an item in it, we look at the confidence values.
+  # If the to-be-inserted detections's confidence is greater, we delegate
+  # the previous detection to the misdetections, and replace it with this
+  # detection. If it is equal or less, we add the to-be-inserted detection
+  # to the misdetections. As soon as a match is found, we break. If no
+  # matches are found at all, add the to-be-inserted detection with the
+  # detections.
+  $found_it = 0;
+  LOOP: for ($i = 0; $i < @chips_detected; $i++) {
+    $detected_ref = $chips_detected[$i]->{detected};
+    $misdetected_ref = $chips_detected[$i]->{misdetected};
+    for ($j = 0; $j < @$detected_ref ; $j++) {
+      if ($detected_ref->[$j]->{driver} eq $datahash->{driver} and
+          $detected_ref->[$j]->{description} eq $datahash->{description} and
+          $detected_ref->[$j]->{address} eq $datahash->{address}) {
+        if ($detected_ref->[$j]->{confidence} > $datahash->{confidence}) {
+          push @$misdetected_ref, $detected_ref->[$j];
+          splice @$detected_ref, $j, 1;
+          push @$new_detected_ref, $datahash;
+          $found_it = 1;
+          last LOOP;
+        } else {
+          push @$new_misdetected_ref, $datahash;
+          $found_it = 1;
+          last LOOP;
+        }
+      }
+    }
+  }
+  push @$new_detected_ref, $datahash if not $found_it
+}
+
-# $_[0]: The number of the adapter to scan
+# $_[1]: The name of the adapter, as appearing in /proc/bus/i2c
+# $_[2]: The driver of the adapter
-sub scan_adapter
-{
+  my ( $adapter_nr,$adapter_name,$adapter_driver) = @_;
-  my ($chip, $addr, $conf,@chips);
-_[0]" or print ("Can't open /dev/i2c-$_[0] ($!)\n"),
-                        
+adapter_nr" or
+print ("Can't open /dev/i2c-$adapter_nr ($!)\n"),
-  foreach $addr (0..0x7f) {
-    i2c_set_slave_addr(\*FILE,$addr) or print("Can't set address to $_?!?\n"), 
@@ -537 +637 @@
-    next unless i2c_smbus_read_byte(\*FILE) >= 0;
-    printf "Client found at address 0x%02x\n",$addr;
+    my @detection_list = ();
+    my $highest_conf = 0;
+    my $double_conf = 0;
-    foreach $chip (@chip_ids) {
-      if (contains $addr, @{$$chip{i2c_addrs}}) {
@@ -548 +651 @@
-            print ")\n";
-          }
+          add_to_chips_detected $$chip{driver},
+                                { confidence => $conf,
+                                  address => $addr,
+                                  chipname =>  $$chip{name},
+                                  description => $adapter_name,
+                                  driver => $adapter_driver,
+                                };
-        } else {
- 
+;
-        }
-      }
@@ -887 +997 @@
-              "module. If not,",
-              " you won't be able to open any /dev/i2c-* file.\n";
-proc
+dev
-        print " Loading failed ($!), aborting.\n";
-        exit;
@@ -906 +1016 @@
-    print "\n";
-    my ($dev_nr,$description) = /^i2c-(\S+)\s+\S+\s+(.*)$/;
+    $description =~ s/\t/ /;
-    print "Next adapter: $description\n";
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}
-
-main;
-
-
-      
-
-
-# TEST!
-# scan_adapter 0;
-#}
-
-#