summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES1
-rw-r--r--doc/FAQ7
-rw-r--r--doc/lm_sensors-FAQ.html7
-rw-r--r--doc/lm_sensors-FAQ.texi5
-rw-r--r--lib/access.c6
-rw-r--r--lib/conf-parse.y18
-rw-r--r--lib/data.c4
-rw-r--r--lib/libsensors.38
-rw-r--r--lib/sensors.conf.55
-rw-r--r--lib/sensors.h3
-rw-r--r--prog/sensors/main.c7
11 files changed, 13 insertions, 58 deletions
diff --git a/CHANGES b/CHANGES
index 4b7a120c..88b1d725 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ SVN HEAD
Delete support of non-sensor drivers (ddcmon, eeprom)
Always build with sysfs support
Delete procfs support (Linux 2.4)
+ Delete all remnants of algorithm names
Man page sensors.conf.5: Update the chip statement section
Programs doc/*: Delete, obsolete
Programs i2cdump, i2cget, i2cset: Do not force the slave address by default
diff --git a/doc/FAQ b/doc/FAQ
index 0030d16a..e2e359b8 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -94,7 +94,7 @@ lm_sensors
4.24.2 Sensors-detect says "Can't open /dev/i2c[-/]0"
4.24.3 Sensors-detect doesn't find any sensors!
4.25 Sensors says `Error: Line xxx: zzzzzzz'
- 4.26 Sensors only gives the name, adapter, and algorithm for my chip
+ 4.26 Sensors only gives the name and adapter for my chip
4.27 Sensors says `ERROR: Can't get xxxxx data!'
4.28 Sensors doesn't find any sensors, just eeproms.
4.29 Inserting modules hangs my board
@@ -1103,15 +1103,14 @@ These are errors from the libsensors library in reading the
it. If you have a parse error, perhaps you have to put the feature name
in double quotes.
-4.26 Sensors only gives the name, adapter, and algorithm for my chip
-====================================================================
+4.26 Sensors only gives the name and adapter for my chip
+========================================================
If `sensors' only says this, for example, and doesn't provide any
actual data at all:
it87-isa-0290
Adapter: ISA adapter
- Algorithm: ISA algorithm
Your chip is not currently supported by `sensors' and so all it does
is print out that information. Get the latest release and be sure you
diff --git a/doc/lm_sensors-FAQ.html b/doc/lm_sensors-FAQ.html
index 6ceab70a..6ba58d4c 100644
--- a/doc/lm_sensors-FAQ.html
+++ b/doc/lm_sensors-FAQ.html
@@ -152,7 +152,7 @@ Jean Delvare<br>
<li><a href="#Section-4_002e24">4.24.3 Sensors-detect doesn't find any sensors!</a>
</li></ul>
<li><a href="#Section-4_002e25">4.25 Sensors says `<samp><span class="samp">Error: Line xxx: zzzzzzz</span></samp>'</a>
-<li><a href="#Section-4_002e26">4.26 Sensors only gives the name, adapter, and algorithm for my chip</a>
+<li><a href="#Section-4_002e26">4.26 Sensors only gives the name and adapter for my chip</a>
<li><a href="#Section-4_002e27">4.27 Sensors says `<samp><span class="samp">ERROR: Can't get xxxxx data!</span></samp>'</a>
<li><a href="#Section-4_002e28">4.28 Sensors doesn't find any sensors, just eeproms.</a>
<li><a href="#Section-4_002e29">4.29 Inserting modules hangs my board</a>
@@ -897,7 +897,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
<li><a href="#Section-4_002e23">Section 4.23</a>: What is at I2C address XXX?
<li><a href="#Section-4_002e24">Section 4.24</a>: Sensors-detect doesn't work at all
<li><a href="#Section-4_002e25">Section 4.25</a>: Sensors says `<samp><span class="samp">Error: Line xxx: zzzzzzz</span></samp>'
-<li><a href="#Section-4_002e26">Section 4.26</a>: Sensors only gives the name, adapter, and algorithm!
+<li><a href="#Section-4_002e26">Section 4.26</a>: Sensors only gives the name and adapter!
<li><a href="#Section-4_002e27">Section 4.27</a>: Sensors says `<samp><span class="samp">ERROR: Can't get xxxxx data!</span></samp>'
<li><a href="#Section-4_002e28">Section 4.28</a>: Sensors doesn't find any sensors, just eeproms.
<li><a href="#Section-4_002e29">Section 4.29</a>: Inserting modules hangs my board
@@ -1679,14 +1679,13 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#Problems">Problems</a>
</div>
-<h3 class="section">4.26 Sensors only gives the name, adapter, and algorithm for my chip</h3>
+<h3 class="section">4.26 Sensors only gives the name and adapter for my chip</h3>
<p>If <samp><span class="command">sensors</span></samp> only says this, for example, and doesn't
provide any actual data at all:
<pre class="example"> it87-isa-0290
Adapter: ISA adapter
- Algorithm: ISA algorithm
</pre>
<p>Your chip is not currently supported by <samp><span class="command">sensors</span></samp> and so all it
does is print out that information. Get the latest release
diff --git a/doc/lm_sensors-FAQ.texi b/doc/lm_sensors-FAQ.texi
index 55ecc57b..ada3d3e3 100644
--- a/doc/lm_sensors-FAQ.texi
+++ b/doc/lm_sensors-FAQ.texi
@@ -561,7 +561,7 @@ to work.
* Section 4.23:: What is at I2C address XXX?
* Section 4.24:: Sensors-detect doesn't work at all
* Section 4.25:: Sensors says @samp{Error: Line xxx: zzzzzzz}
-* Section 4.26:: Sensors only gives the name, adapter, and algorithm!
+* Section 4.26:: Sensors only gives the name and adapter!
* Section 4.27:: Sensors says @samp{ERROR: Can't get xxxxx data!}
* Section 4.28:: Sensors doesn't find any sensors, just eeproms.
* Section 4.29:: Inserting modules hangs my board
@@ -1142,7 +1142,7 @@ to put the feature name in double quotes.
@node Section 4.26, Section 4.27, Section 4.25, Problems
-@section Sensors only gives the name, adapter, and algorithm for my chip
+@section Sensors only gives the name and adapter for my chip
If @command{sensors} only says this, for example, and doesn't
provide any actual data at all:
@@ -1150,7 +1150,6 @@ provide any actual data at all:
@example
it87-isa-0290
Adapter: ISA adapter
-Algorithm: ISA algorithm
@end example
Your chip is not currently supported by @command{sensors} and so all it
diff --git a/lib/access.c b/lib/access.c
index fb7c7dc4..a66d2b35 100644
--- a/lib/access.c
+++ b/lib/access.c
@@ -325,12 +325,6 @@ const char *sensors_get_adapter_name(int bus_nr)
return NULL;
}
-/* This function is deprecated and will be dropped soon. */
-const char *sensors_get_algorithm_name(int bus_nr)
-{
- return "No longer available";
-}
-
/* nr1-1 is the last main feature found; nr2-1 is the last subfeature found */
const sensors_feature_data *sensors_get_all_features(sensors_chip_name name,
int *nr1, int *nr2)
diff --git a/lib/conf-parse.y b/lib/conf-parse.y
index 5ae50e58..88a1cf49 100644
--- a/lib/conf-parse.y
+++ b/lib/conf-parse.y
@@ -120,7 +120,6 @@ static sensors_chip *current_chip = NULL;
%type <expr> expression
%type <bus> i2cbus_name
%type <name> adapter_name
-%type <name> algorithm_name
%type <name> function_name
%type <name> string
%type <chip> chip_name
@@ -134,7 +133,6 @@ input: /* empty */
;
line: bus_statement EOL
- | busalgo_statement EOL
| label_statement EOL
| set_statement EOL
| chip_statement EOL
@@ -152,17 +150,6 @@ bus_statement: BUS i2cbus_name adapter_name
}
;
-/* for compatibility, deprecated */
-busalgo_statement: BUS i2cbus_name adapter_name algorithm_name
- { sensors_bus new_el;
- new_el.lineno = $1;
- new_el.number = $2;
- new_el.adapter = $3;
- free($4);
- bus_add_el(&new_el);
- }
-;
-
label_statement: LABEL function_name string
{ sensors_label new_el;
check_current_chip();
@@ -315,11 +302,6 @@ adapter_name: NAME
$$ = $1; }
;
-algorithm_name: NAME
- { sensors_strip_of_spaces($1);
- $$ = $1; }
-;
-
function_name: NAME
{ $$ = $1; }
;
diff --git a/lib/data.c b/lib/data.c
index 3954df0b..0c7fa705 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -238,9 +238,7 @@ int sensors_substitute_chip(sensors_chip_name *name,int lineno)
return -SENSORS_ERR_BUS_NAME;
}
- /* We used to compare both the adapter and the algorithm names for
- bus matching, but Linux 2.6 has no more names for algorithms, and
- it was redundant anyway. So we now only rely on the adapter name. */
+ /* Compare the adapter names */
for (j = 0; j < sensors_proc_bus_count; j++) {
if (!strcmp(sensors_config_busses[i].adapter,
sensors_proc_bus[j].adapter)) {
diff --git a/lib/libsensors.3 b/lib/libsensors.3
index ae8a71ea..c5c22991 100644
--- a/lib/libsensors.3
+++ b/lib/libsensors.3
@@ -24,7 +24,7 @@
.\"
.\" References consulted:
.\" libsensors source code
-.TH libsensors 3 "October 2006" "" "Linux Programmer's Manual"
+.TH libsensors 3 "June 2007" "" "Linux Programmer's Manual"
.SH NAME
libsensors \- publicly accessible functions provided by the sensors library
.SH SYNOPSIS
@@ -81,12 +81,6 @@ Check whether the chip name is an 'absolute' name, which can only match one chip
This function returns the adapter name of a bus number, as used within the
sensors_chip_name structure. If it could not be found, it returns NULL.
-.B const char *sensors_get_algorithm_name(int bus_nr);
-.br
-This function used to return the algorithm name of a bus number.
-It is now deprecated and returns an arbitrary string. It will be dropped
-in a later version of the library so you should stop using it.
-
\fBint sensors_get_label(sensors_chip_name name, int feature,
char **result);\fP
.br
diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5
index a6d996fc..776b4067 100644
--- a/lib/sensors.conf.5
+++ b/lib/sensors.conf.5
@@ -23,7 +23,7 @@
.\"
.\" References consulted:
.\" sensors.conf.eg by Frodo Looijaard
-.TH sensors.conf 5 "April 2007" "" "Linux Programmer's Manual"
+.TH sensors.conf 5 "June 2007" "" "Linux Programmer's Manual"
.SH NAME
sensors.conf \- libsensors configuration file
@@ -149,9 +149,6 @@ or
It should always be quoted as well as it will most certainly contain
spaces or dashes.
-There used to be a third argument, the algorithm name. For compatibility
-reasons, the parser still accepts this third argument, but ignores it.
-
The
.I bus
statements may be scattered randomly throughout the configuration file;
diff --git a/lib/sensors.h b/lib/sensors.h
index deb31e7a..6b9d5e94 100644
--- a/lib/sensors.h
+++ b/lib/sensors.h
@@ -74,9 +74,6 @@ extern int sensors_chip_name_has_wildcards(sensors_chip_name chip);
it returns NULL */
extern const char *sensors_get_adapter_name(int bus_nr);
-/* This function is deprecated and will be dropped soon. */
-extern const char *sensors_get_algorithm_name(int bus_nr);
-
/* Look up the label which belongs to this chip. Note that chip should not
contain wildcard values! *result is newly allocated (free it yourself).
This function will return 0 on success, and <0 on failure. This
diff --git a/prog/sensors/main.c b/prog/sensors/main.c
index 2a1a6969..6d2b372b 100644
--- a/prog/sensors/main.c
+++ b/prog/sensors/main.c
@@ -161,8 +161,6 @@ int main (int argc, char *argv[])
{ "no-unknown", no_argument, NULL, 'U' },
{ "config-file", required_argument, NULL, 'c' },
{ "unknown", no_argument, NULL, 'u' },
- /* next option accepted for compatibility, but otherwise ignored */
- { "algorithm", no_argument, NULL, 'a' },
{ "generic", no_argument, NULL, 'g'},
{ 0,0,0,0 }
};
@@ -175,7 +173,7 @@ int main (int argc, char *argv[])
hide_unknown = 0;
do_generic = 0;
while (1) {
- c = getopt_long(argc,argv,"hsvfaAUc:ug",long_opts,NULL);
+ c = getopt_long(argc, argv, "hsvfAUc:ug", long_opts, NULL);
if (c == EOF)
break;
switch(c) {
@@ -207,9 +205,6 @@ int main (int argc, char *argv[])
case 'u':
do_unknown = 1;
break;
- case 'a':
- /* Ignore for compatibility */
- break;
case 'g':
do_generic = 1;
break;
View Lorry Controller Status