mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-03 15:55:15 +00:00
Code Issues Releases Wiki Activity

Drop alias detection for Super-I/O chips. It never actually worked,

Browse Source 
because the code compares the chip names first and we never cared of
using the exact same name string for I2C and Super-I/O entries of
a given chip. Anyway, we do not have any Super-I/O driver also
doing I2C access so detecting aliases wouldn't be that usesul. And
as I've said before, alias detection is better handled at the kernel
level anyway.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5494 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2008-12-01 17:02:47 +00:00
parent e834cebc0c
commit 22cc12173a
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -31,6 +31,7 @@ SVN-HEAD
Simplify loading of bus drivers Simplify loading of bus drivers
Fix bus number prediction logic (#2327) Fix bus number prediction logic (#2327)
Suggest the sbs driver for smart batteries Suggest the sbs driver for smart batteries
Drop alias detection for Super-I/O chips
3.0.3 (2008-09-28) 3.0.3 (2008-09-28)
libsensors: Avoid namespace pollution libsensors: Avoid namespace pollution

25
prog/detect/sensors-detect
View File

@@ -1124,10 +1124,6 @@ use vars qw(@i2c_adapter_names);
# devid: The device ID we have to match (base device) # devid: The device ID we have to match (base device)
# devid_mask (optional): Bitmask to apply before checking the device ID # devid_mask (optional): Bitmask to apply before checking the device ID
# logdev: The logical device containing the sensors # logdev: The logical device containing the sensors
# alias_detect (optional): For chips which can be both on the LPC and the
# I2C bus, a function which detects whether two entries are the same.
# The function will be passed three parameters: the LPC address, an
# open file descriptor to access the I2C bus, and the I2C address.
use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns
@superio_ids_winbond @superio_ids_ite @superio_ids); @superio_ids_winbond @superio_ids_ite @superio_ids);
@@ -1449,7 +1445,6 @@ use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns
driver => "vt1211", driver => "vt1211",
devid => 0x3c, devid => 0x3c,
logdev => 0x0b, logdev => 0x0b,
alias_detect => sub { vt1211_alias_detect(@_); },
}, { }, {
name => "VIA VT1212 Super IO Lite", # in 100 pin TQFP package name => "VIA VT1212 Super IO Lite", # in 100 pin TQFP package
driver => "not-a-sensor", driver => "not-a-sensor",
@@ -1463,7 +1458,6 @@ use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns
driver => "w83627hf", driver => "w83627hf",
devid => 0x52, devid => 0x52,
logdev => 0x0b, logdev => 0x0b,
alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3d); },
}, { }, {
name => "Winbond W83627THF/THG Super IO Sensors", name => "Winbond W83627THF/THG Super IO Sensors",
driver => "w83627hf", driver => "w83627hf",
@@ -1497,14 +1491,12 @@ use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns
devid => 0x8840, devid => 0x8840,
devid_mask => 0xFFC0, devid_mask => 0xFFC0,
logdev => 0x0b, logdev => 0x0b,
alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3e); },
}, { }, {
name => "Winbond W83627DHG Super IO Sensors", name => "Winbond W83627DHG Super IO Sensors",
driver => "w83627ehf", driver => "w83627ehf",
devid => 0xA020, devid => 0xA020,
devid_mask => 0xFFF0, devid_mask => 0xFFF0,
logdev => 0x0b, logdev => 0x0b,
alias_detect => sub { winbond_alias_detect(@_, 0x2b, 0x3e); },
}, { }, {
name => "Winbond W83L517D Super IO", name => "Winbond W83L517D Super IO",
driver => "not-a-sensor", driver => "not-a-sensor",
@@ -1571,7 +1563,6 @@ use vars qw(@superio_ids_natsemi @superio_ids_smsc @superio_ids_smsc_ns
driver => "it87", driver => "it87",
devid => 0x8712, devid => 0x8712,
logdev => 0x04, logdev => 0x04,
alias_detect => sub { winbond_alias_detect(@_, 0x30, 0x45); },
}, { }, {
name => "ITE IT8716F Super IO Sensors", name => "ITE IT8716F Super IO Sensors",
driver => "it87", driver => "it87",
@@ -2909,8 +2900,7 @@ sub probe_superio
isa_addr => $addr, isa_addr => $addr,
chipname => $chip->{name} chipname => $chip->{name}
}; };
add_isa_to_chips_detected($chip->{driver}, $new_hash, add_isa_to_chips_detected($chip->{driver}, $new_hash);
$chip->{alias_detect});
} }
# Detection routine for non-standard SMSC Super I/O chips # Detection routine for non-standard SMSC Super I/O chips
@@ -4651,19 +4641,6 @@ sub winbond_alias_detect
return 1; return 1;
} }
sub vt1211_alias_detect
{
my ($isa_addr, $file, $i2c_addr) = @_;
my $i;
return 0 unless (inb($isa_addr + 0x48) & 0x7f) == $i2c_addr;
for ($i = 0x2b; $i <= 0x3d; $i++) {
return 0 unless inb($isa_addr + $i) ==
i2c_smbus_read_byte_data($file, $i);
}
return 1;
}
###################### ######################
# PCI CHIP DETECTION # # PCI CHIP DETECTION #
###################### ######################