Changeset 2654 for lm-sensors/trunk/lib/proc.c

Timestamp:

08/08/04 18:38:28 (9 years ago)

Author:

khali

Message:

Allow an alternate sysfs file name for chip features. This is

needed to provide backward compatibility when changes are made
to the sysfs interface (policy change or driver fix).
The first item for which this is needed is VID files. The name
we chose, in0_ref, is bad (because motherboard manufacturers can
use any input for VCore, regardless of the recommendations.
Thus, the new name cpu0_vid is better. Drivers will be updated
later.

Files:

• lm-sensors/trunk/lib/proc.c (modified) (11 diffs)

lm-sensors/trunk/lib/proc.c

@@ -72 +72 @@
                                        sizeof(struct sensors_bus))
 
-int getsysname(const sensors_chip_feature *feature, char *sysname, int *sysmag);
+int getsysname(const sensors_chip_feature *feature, char *sysname,
+        int *sysmag, char *altsysname);
 
 /* This reads /proc/sys/dev/sensors/chips into memory */
@@ -305 +306 @@
         int buflen = BUF_LEN;
         int mag, eepromoffset, fd, ret=0;
-        char n[NAME_MAX];
-        FILE *f;
 
         if(!foundsysfs)
@@ -314 +313 @@
                 return -SENSORS_ERR_NO_ENTRY;
         if(foundsysfs) {
+                char n[NAME_MAX], altn[NAME_MAX];
+                FILE *f;
                 strcpy(n, name.busname);
                 strcat(n, "/");
@@ -336 +337 @@
                                 return -SENSORS_ERR_PROC;
                 } else {
+                        strcpy(altn, n);
                         /* use rindex to append sysname to n */
-                        getsysname(the_feature, rindex(n, '\0'), &mag);
-                        if ((f = fopen(n, "r")) != NULL) {
+                        getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
+                        if ((f = fopen(n, "r")) != NULL
+                         || (f = fopen(altn, "r")) != NULL) {
                                 fscanf(f, "%lf", value);
                                 fclose(f);
@@ -369 +372 @@
         int buflen = BUF_LEN;
         int mag;
-        char n[NAME_MAX];
-        FILE *f;
  
         if(!foundsysfs)
@@ -378 +379 @@
                 return -SENSORS_ERR_NO_ENTRY;
         if(foundsysfs) {
+                char n[NAME_MAX], altn[NAME_MAX];
+                FILE *f;
                 strcpy(n, name.busname);
                 strcat(n, "/");
+                strcpy(altn, n);
                 /* use rindex to append sysname to n */
-                getsysname(the_feature, rindex(n, '\0'), &mag);
-                if ((f = fopen(n, "w")) != NULL) {
+                getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
+                if ((f = fopen(n, "w")) != NULL
+                 || (f = fopen(altn, "w")) != NULL) {
                         for (; mag > 0; mag --)
                                 value *= 10.0;
@@ -455 +460 @@
                     Documentation/i2c/sysfs_interface in the kernel
 */
-int getsysname(const sensors_chip_feature *feature, char *sysname, int *sysmag)
+int getsysname(const sensors_chip_feature *feature, char *sysname,
+        int *sysmag, char *altsysname)
 {
         const char * name = feature->name;
@@ -465 +471 @@
                 const char * name, * sysname;
                 const int sysmag;
+                const char * altsysname;
         };
 
@@ -472 +479 @@
                 { "beeps", "beep_mask", 0 },
                 { "pwm", "fan1_pwm", 0 },
-                { "vid", "in0_ref", INMAG },
+                { "vid", "cpu0_vid", INMAG, "in0_ref" },
                 { "remote_temp", "temp2_input", TEMPMAG },
                 { "remote_temp_hyst", "temp2_max_hyst", TEMPMAG },
@@ -485 +492 @@
 
 
+/* default to a non-existent alternate name (should rarely be tried) */
+        strcpy(altsysname, "_");
+
 /* use override in feature structure if present */
         if(feature->sysname != NULL) {
@@ -499 +509 @@
                 if(!strcmp(m->name, name)) {
                         strcpy(sysname, m->sysname);
+                        if (m->altsysname != NULL)
+                                strcpy(altsysname, m->altsysname);
                         *sysmag = m->sysmag;
                         return 0;