mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-08-29 13:28:01 +00:00
Code Issues Releases Wiki Activity

Simplify the "detect_data" type: no need to store the i2c adapter name

Browse Source 
and driver, we can look these up as needed.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5479 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare 2008-11-30 18:27:59 +00:00
parent 0455ac9e1b
commit 03eac07cd9
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
prog/detect/sensors-detect
View File

@ -2461,12 +2461,8 @@ use vars qw(@chips_detected);
# Type detect_data: # Type detect_data:
# A hash # A hash
# with field 'i2c_adap' containing an adapter string as appearing
# in /sys/class/i2c-adapter (if this is an I2C detection)
# with field 'i2c_devnr', contianing the /dev/i2c-* number of this # with field 'i2c_devnr', contianing the /dev/i2c-* number of this
# adapter (if this is an I2C detection) # adapter (if this is an I2C detection)
# with field 'i2c_driver', containing the driver name for this adapter
# (if this is an I2C detection)
# with field 'i2c_addr', containing the I2C address of the detection; # with field 'i2c_addr', containing the I2C address of the detection;
# (if this is an I2C detection) # (if this is an I2C detection)
# with field 'i2c_sub_addrs', containing a reference to a list of # with field 'i2c_sub_addrs', containing a reference to a list of
@ -2676,8 +2672,6 @@ sub add_busy_i2c_address
i2c_addr => $addr, i2c_addr => $addr,
chipname => sysfs_device_attribute($device, "name") chipname => sysfs_device_attribute($device, "name")
|| "unknown", || "unknown",
i2c_adap => $i2c_adapters[$adapter_nr]->{name},
i2c_driver => $i2c_adapters[$adapter_nr]->{driver},
i2c_devnr => $adapter_nr, i2c_devnr => $adapter_nr,
}; };
@ -2728,8 +2722,6 @@ sub probe_free_i2c_address
conf => $conf, conf => $conf,
i2c_addr => $addr, i2c_addr => $addr,
chipname => $chip->{name}, chipname => $chip->{name},
i2c_adap => $i2c_adapters[$adapter_nr]->{name},
i2c_driver => $i2c_adapters[$adapter_nr]->{driver},
i2c_devnr => $adapter_nr, i2c_devnr => $adapter_nr,
}; };
if (@other_addr) { if (@other_addr) {
@ -2827,7 +2819,8 @@ sub scan_isa_bus
$new_hash); $new_hash);
if ($new_hash) { if ($new_hash) {
printf " Alias of the chip on I2C bus `%s', address 0x%02x\n", printf " Alias of the chip on I2C bus `%s', address 0x%02x\n",
$new_hash->{i2c_adap}, $new_hash->{i2c_addr}; $i2c_adapters[$new_hash->{i2c_devnr}]->{name},
$new_hash->{i2c_addr};
} }
} }
} }
@ -4857,9 +4850,9 @@ sub print_chips_report
my $is_isa = exists $data->{isa_addr}; my $is_isa = exists $data->{isa_addr};
print " * "; print " * ";
if ($is_i2c) { if ($is_i2c) {
printf "Bus `%s'\n", $data->{i2c_adap}; printf "Bus `%s'\n", $i2c_adapters[$data->{i2c_devnr}]->{name};
printf " Busdriver `%s', I2C address 0x%02x", printf " Busdriver `%s', I2C address 0x%02x",
$data->{i2c_driver}, $data->{i2c_addr}; $i2c_adapters[$data->{i2c_devnr}]->{driver}, $data->{i2c_addr};
if (exists $data->{i2c_sub_addrs}) { if (exists $data->{i2c_sub_addrs}) {
print " (and"; print " (and";
my $sub_addr; my $sub_addr;
@ -4914,7 +4907,7 @@ sub generate_modprobes
foreach $chip (@chips_detected) { foreach $chip (@chips_detected) {
@optionlist = (); @optionlist = ();
foreach $detection (@{$chip->{detected}}) { foreach $detection (@{$chip->{detected}}) {
if (exists $detection->{i2c_driver} and if (exists $detection->{i2c_addr} and
exists $detection->{isa_addr} and exists $detection->{isa_addr} and
$i2c_adapters[$detection->{i2c_devnr}]->{used}) { $i2c_adapters[$detection->{i2c_devnr}]->{used}) {
push @optionlist, $detection->{i2c_devnr}, push @optionlist, $detection->{i2c_devnr},