Commit Graph
5316 Commits
Author SHA1 Message Date
Jean Delvare e9c8c5fb06 Let libsensors handle ignore statements by itself, rather than
delegating the task to the user applications.

For now, I am calling sensors_get_ignored() in
sensors_get_all_features(), because this is the least intrusive way.
This is in no way optimal though, it would be better to not add
ignored features to the feature list in the first place. However,
doing so would require that the configuration file is read before
sysfs is scanned for features, which isn't currently the case. So
this improvement is left for later.

Note that this patch adds a small cost in terms of performance. This
is because we now honor ignore statements on all features (main ones
and subfeatures) while in practice "sensors" was only checking for
main features. It would be trivial to stop checking for subfeatures,
but it seems to me that supporting ignore on subfeatures is a good
move, as the user may actually want to ignore a specific subfeature.
Individual alarms come to mind. This will also be handy to debug the
generic print code in "sensors".


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4644 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-24 08:20:53 +00:00
Jean Delvare 6505fef0fd The way we build the feature lists guarantees that subfeatures always
immediately follow their main feature. This makes it possible to simplify
sensors_get_all_features() quite a bit. We no longer need to maintain
separate pointers for the last main feature and the last subfeature,
we can simply walk the list linearly.

Note that I am still not entirely happy with this API. It was obviously
designed for debugging purposes (sensors -u) and without performance
concernes nor interface cleanliness in mind. I believe that we want to
tag main features and subfeatures as such, and let the application ask
specifically for the list of main features, and for each feature, for
its list of subfeatures (i.e. two functions instead of one.)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4643 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-24 08:19:59 +00:00
Jean Delvare a62ee5bac2 Speed up sensors_get_ignored() a bit. We can return as soon as an ignore
statement is found to match, even if it isn't an exact match.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4642 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-22 12:51:57 +00:00
Jean Delvare 72ffb67a83 Typo.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4641 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-22 12:45:59 +00:00
Jean Delvare db2c145d9d Speed up sensors_get_ignored() a bit. We can return as soon as an ignore
statement is found to match, even if it isn't an exact match.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4640 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-22 12:45:43 +00:00
Jean Delvare 462e7d81df Unify error reporting messages. Fix a memory leak in error path.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4639 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-22 12:25:15 +00:00
Jean Delvare 4c88142226 No need to explicitly discard subclients. With the hwmon class, they won't
even be found. For earlier kernels, they will be discarded anyway because
they expose zero feature.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4638 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-22 10:13:19 +00:00
Jean Delvare 98110858fe Discard devices with zero feature.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4637 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-21 09:28:12 +00:00
Jean Delvare f302998cd2 Fix a memory leak in sensors_read_one_sysfs_chip() when an error occurs.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4636 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-21 08:44:31 +00:00
Jean Delvare 5611ffe6d1 Fix a memory leak in sensors_read_one_sysfs_chip() when an error occurs.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4635 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-21 08:40:26 +00:00
Jean Delvare 7429bc0191 Fix the writing of the temperature interrupt configuration.
The old code was working only by accident. Backport from Linux 2.6.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4634 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-21 08:36:54 +00:00
Jean Delvare d69b87bb74 Use PCI_REVISION_ID instead of our own define (backport from Linux 2.6.)
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4633 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-21 08:35:40 +00:00
Jean Delvare 834cd70e14 Drop redundant test.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4632 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-20 19:09:00 +00:00
Jean Delvare 5d33dd3e68 Minor optimizations to sensors_feature_get_type():
* We no longer support any single type, so no need to handle this case.
* We can start looking for "_" at offset 3 rather than the beginning
  of the string (the shortest valid prefix is "in0", 3 characters.)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4631 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-19 20:50:17 +00:00
Jean Delvare c5b2eabf08 Now that sensors_feature_get_type() is an internal function, we can
adjust it to fit our needs better:

* Call sensors_feature_get_type() before allocating memory for the
feature name. The allocation will be reverted for all sysfs files
which are not valid libsensors attributes, and there can be a lot
of these. So this saves a few memory allocations. But this means
that we want to pass a simple string to sensors_feature_get_type()
rather than a struct sensors_feature_data. This also means that
sensors_feature_get_type() gets the raw attribute name ("_input"
not stripped.)

* Get the channel number from sensors_feature_get_type() too. We
get it for free from sscanf(), so it's more efficient to return it
than to parse it again in sensors_read_dynamic_chip().


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4630 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-19 20:49:29 +00:00
Jean Delvare 70317e1a0e The way we use sensors_feature_get_type() is rather suboptimal. It is
first called during the library initialization to generate the feature
tables. Then it is called again by sensors itself. This is because we
do not store the result the first time. I propose that we add a type
field to struct sensors_feature_data, where libsensors would store
the result of sensors_feature_get_type(). That way, the application
can get the information without calling sensors_feature_get_type()
again.

This change has the following benefits:
* Obviously, a small speed-up.
* sensors_feature_get_type() can be removed from the public interface.
  This means that we can turn it into something that fits the
  libsensors needs better, allowing for more optimizations (see next
  patches.)

Note: the patch looks bigger that it really is, because I had to move
definitions around in sensors.h.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4629 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-19 20:46:09 +00:00
Jean Delvare ac5ae18fe7 Drop the package target.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4628 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-19 16:59:16 +00:00
Jean Delvare ee8268e390 Don't sort the same list twice.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4627 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-19 07:30:51 +00:00
Jean Delvare 3ac6681d72 Fix the 'ALARM' text alignment in the dme1737 print temp routine.
Patch from Juerg Haefliger.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4626 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-18 21:04:50 +00:00
Jean Delvare 226dffd064 Whitespace cleaups (backport from Linux 2.6).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4625 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-18 21:02:42 +00:00
Jean Delvare 57e38757f1 Add ATI SB700 support to the i2c-piix4 driver. This is a backport from
a Linux 2.6 patch by Henry Su.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4624 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-18 21:01:35 +00:00
Jean Delvare 7e3b183eab Delete many unused defines. Backport from Linux 2.6.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4623 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-18 20:58:12 +00:00
Philip Edelbrock d4e5a7cf44 Bump up version in version.h
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4621 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-17 05:11:47 +00:00
Philip Edelbrock fa9a8b9958 Bump up minor version.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4619 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-17 05:07:40 +00:00
Philip Edelbrock 707bff78ad Prep for 2.10.4
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4618 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-17 05:05:33 +00:00
Jean Delvare fd6fc535ab No special treatment is needed for the name attribute.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4616 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-16 12:08:00 +00:00
Jean Delvare 4c2f4416fb Explicitly silent eeprom and ddcmon. libsensors still supports them and
will present them to us for older kernels (<= 2.6.13). We don't want
to display them as unknown chips.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4615 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 19:18:37 +00:00
Jean Delvare 8eaa3767b1 Warning fix.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4614 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 18:55:14 +00:00
Jean Delvare f2f170a903 Warning fix.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4613 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 17:19:47 +00:00
Jean Delvare e251c94f60 Warning fix.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4612 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 16:59:50 +00:00
Jean Delvare d73a25b166 Don't sort the same list twice.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4611 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 16:32:56 +00:00
Jean Delvare c100b4f38b Don't add non-sensor I2C chips to the list of detected I2C chips. Even
if we discard them later, their presence in the list can prevent the
"no sensors found" event from triggering. It also causes the script to
suggest loading i2c bus drivers which are not needed for hardware
monitoring.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4610 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 16:29:52 +00:00
Jean Delvare 7659b47112 Don't add non-sensor I2C chips to the list of detected I2C chips. Even
if we discard them later, their presence in the list can prevent the
"no sensors found" event from triggering. It also causes the script to
suggest loading i2c bus drivers which are not needed for hardware
monitoring.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4609 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-14 16:28:39 +00:00
Jean Delvare 44b541a1e8 Fix broken links to datasheets.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4608 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-13 14:57:31 +00:00
Jean Delvare 91d6d664ed Fix broken links to Analog Devices website.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4607 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-13 14:53:31 +00:00
Jean Delvare 7033c61200 Fix broken links to Analog Devices website.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4606 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-13 14:52:44 +00:00
Jean Delvare 356e03f000 Add missing static marker.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4605 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-13 11:05:43 +00:00
Jean Delvare 02b58be2e8 Add Fintek F71806FG and F71862FG detection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4604 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-10 21:09:32 +00:00
Jean Delvare 0a90b248d2 Add Fintek F71806FG and F71862FG detection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4603 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-10 21:08:36 +00:00
Jean Delvare 7b8fdf0188 Advertise and document libsensors_version.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4602 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-10 19:55:06 +00:00
Jean Delvare f905e5f242 Delete LM_DATE and libsensors_date.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4601 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-10 19:38:14 +00:00
Hans de Goede d5d0476273 remove f71882fg example config fan2-4 ignore lines and add labels, fix typo in Battery label
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4600 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-09 12:54:54 +00:00
Hans de Goede cb5d52fccd remove f71882fg example config fan2-4 ignore lines and add labels, fix typo in Battery label
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4599 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-09 12:53:20 +00:00
Jean Delvare e45b873981 Delete unused function sensors_get_sub_feature_by_type().
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4598 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-09 11:20:47 +00:00
Jean Delvare 867b8453f2 Add more known SMSC Super IO chips to sensors-detect. Also sort
the list of SMSC chips by chip name. Patch from Juerg Haefliger.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4597 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-08 20:54:33 +00:00
Jean Delvare 7655f7fb97 Adds more known SMSC Super IO chips to sensors-detect. Also sort
the list of SMSC chips by chip name. Patch from Juerg Haefliger.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4596 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-08 20:48:03 +00:00
Hans de Goede 712748f659 Handle chips who return the beta value as temp sensor type
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4595 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-08 18:59:16 +00:00
Jean Delvare a2b7c5b0b1 Drop reference to mkdev.sh.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4594 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-08 12:01:23 +00:00
Jean Delvare a83ef92c9a Delete mkdev.sh. i2c device nodes are created by devfs or udev on most
2.6 kernel-based systems, for others they should have been created at
system installation time. If they are missing, sensors-detect will run
MAKEDEV to create them.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4593 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-08 12:00:55 +00:00
Jean Delvare 6b18074f92 Only write integer values to pwm files.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4592 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-07-08 11:19:10 +00:00