Changeset 4553

Timestamp:

07/05/07 17:03:22 (6 years ago)

Author:

khali

Message:

Move sensors_proc_read and sensors_proc_write to sysfs.c, and rename them
to something more in line with what they do.

Location:

lm-sensors/branches/lm-sensors-3.0.0/lib

Files:

• Module.mk (modified) (1 diff)
• access.c (modified) (3 diffs)
• proc.c (deleted)
• proc.h (deleted)
• sysfs.c (modified) (1 diff)
• sysfs.h (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/lib/Module.mk

@@ -47 +47 @@
 
 LIBCSOURCES := $(MODULE_DIR)/data.c $(MODULE_DIR)/general.c \
-               $(MODULE_DIR)/error.c \
-               $(MODULE_DIR)/proc.c $(MODULE_DIR)/access.c \
+               $(MODULE_DIR)/error.c $(MODULE_DIR)/access.c \
                $(MODULE_DIR)/init.c $(MODULE_DIR)/sysfs.c
 

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -25 +25 @@
 #include "data.h"
 #include "error.h"
-#include "proc.h"
+#include "sysfs.h"
 #include "general.h"
 
@@ -259 +259 @@
                         }
                 }
-        if (sensors_read_proc(name, feature, &val))
+        if (sensors_read_sysfs_attr(name, feature, &val))
                 return -SENSORS_ERR_PROC;
         if (!expr)
@@ -307 +307 @@
                 if ((res = sensors_eval_expr(name, expr, value, &to_write)))
                         return res;
-        if (sensors_write_proc(name, feature, to_write))
+        if (sensors_write_sysfs_attr(name, feature, to_write))
                 return -SENSORS_ERR_PROC;
         return 0;

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -394 +394 @@
 }
 
+int sensors_read_sysfs_attr(sensors_chip_name name, int feature, double *value)
+{
+        const sensors_chip_feature *the_feature;
+        int mag;
+        char n[NAME_MAX];
+        FILE *f;
+        int dummy;
+        char check;
+        const char *suffix = "";
+
+        if (!(the_feature = sensors_lookup_feature_nr(&name, feature)))
+                return -SENSORS_ERR_NO_ENTRY;
+
+        /* REVISIT: this is a ugly hack */
+        if (sscanf(the_feature->data.name, "in%d%c", &dummy, &check) == 1
+         || sscanf(the_feature->data.name, "fan%d%c", &dummy, &check) == 1
+         || sscanf(the_feature->data.name, "temp%d%c", &dummy, &check) == 1)
+                suffix = "_input";
+
+        snprintf(n, NAME_MAX, "%s/%s%s", name.busname, the_feature->data.name,
+                 suffix);
+        if ((f = fopen(n, "r"))) {
+                int res = fscanf(f, "%lf", value);
+                fclose(f);
+                if (res != 1)
+                        return -SENSORS_ERR_PROC;
+                for (mag = the_feature->scaling; mag > 0; mag --)
+                        *value /= 10.0;
+        } else
+                return -SENSORS_ERR_PROC;
+
+        return 0;
+}
+  
+int sensors_write_sysfs_attr(sensors_chip_name name, int feature, double value)
+{
+        const sensors_chip_feature *the_feature;
+        int mag;
+        char n[NAME_MAX];
+        FILE *f;
+        int dummy;
+        char check;
+        const char *suffix = "";
+ 
+        if (!(the_feature = sensors_lookup_feature_nr(&name, feature)))
+                return -SENSORS_ERR_NO_ENTRY;
+
+        /* REVISIT: this is a ugly hack */
+        if (sscanf(the_feature->data.name, "in%d%c", &dummy, &check) == 1
+         || sscanf(the_feature->data.name, "fan%d%c", &dummy, &check) == 1
+         || sscanf(the_feature->data.name, "temp%d%c", &dummy, &check) == 1)
+                suffix = "_input";
+
+        snprintf(n, NAME_MAX, "%s/%s%s", name.busname, the_feature->data.name,
+                 suffix);
+        if ((f = fopen(n, "w"))) {
+                for (mag = the_feature->scaling; mag > 0; mag --)
+                        value *= 10.0;
+                fprintf(f, "%d", (int) value);
+                fclose(f);
+        } else
+                return -SENSORS_ERR_PROC;
+
+        return 0;
+}

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.h

@@ -29 +29 @@
 extern int sensors_read_sysfs_bus(void);
 
+/* Read a value out of a sysfs attribute file */
+int sensors_read_sysfs_attr(sensors_chip_name name, int feature, double *value);
+
+/* Write a value to a sysfs attribute file */
+int sensors_write_sysfs_attr(sensors_chip_name name, int feature, double value);
+
 #endif /* !SENSORS_LIB_SYSFS_H */