Expanded expressions, slightly new syntax

An expression can now refer to the value it has to compute (@), but also to
other values. This is now perfectly valid as an expression:
  vid + in_min - in_max * 2 / @
Not that this is very sensible, but you get the idea. Please install the
new example config file, or replace all old 'val' occurences with '@'.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@107 7894878c-1315-0410-8ee3-d5d059ff63e0

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/data.h b/lib/data.h
index 0030f520..bd2cb7fb 100644
--- a/lib/data.h
+++ b/lib/data.h
@@ -31,7 +31,8 @@ typedef enum sensors_operation {
   sensors_negate } sensors_operation;
 
 typedef enum sensors_expr_kind {
-  sensors_kind_val, sensors_kind_var, sensors_kind_sub } sensors_expr_kind;
+  sensors_kind_val, sensors_kind_source, sensors_kind_var, 
+  sensors_kind_sub } sensors_expr_kind;
 
 struct sensors_expr;
 
@@ -126,7 +127,8 @@ extern int sensors_proc_bus_max;
    error.h on failure. */
 extern int sensors_parse_i2cbus_name(const char *name, int *res);
 
-extern int sensors_eval_expr(sensors_expr *expr, double val, double *result);
+extern int sensors_eval_expr(sensors_chip_name chipname, sensors_expr *expr,
+                             double val, double *result);
 
 
 #endif /* def LIB_SENSORS_DATA_H */