Changeset 4757

Timestamp:

09/05/07 10:13:15 (6 years ago)

Author:

khali

Message:

Rename sensors_feature_data.mode to flags, as we plan to use it to
store non-mode flags soon.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/access.c (modified) (2 diffs)
• lib/data.h (modified) (1 diff)
• lib/libsensors.3 (modified) (1 diff)
• lib/sensors.h (modified) (2 diffs)
• lib/sysfs.c (modified) (1 diff)
• prog/sensord/sense.c (modified) (1 diff)
• prog/sensors/chips.c (modified) (1 diff)

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

@@ -239 +239 @@
                                         main_feature->data.compute_mapping);
 
-        if (!(main_feature->data.mode & SENSORS_MODE_R))
+        if (!(main_feature->data.flags & SENSORS_MODE_R))
                 return -SENSORS_ERR_ACCESS_R;
         for (chip = NULL;
@@ -286 +286 @@
                                         main_feature->data.compute_mapping);
 
-        if (!(main_feature->data.mode & SENSORS_MODE_W))
+        if (!(main_feature->data.flags & SENSORS_MODE_W))
                 return -SENSORS_ERR_ACCESS_W;
         for (chip = NULL;

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

@@ -133 +133 @@
      feature whose compute line will be inherited (a group could be fan and
      fan_max, but not fan_div)
-   mode is a bitfield, its value is a combination of SENSORS_MODE_R (readable)
+   flags is a bitfield, its value is a combination of SENSORS_MODE_R (readable)
      and SENSORS_MODE_W (writable).
    scaling is the number of decimal points to scale by.

lm-sensors/branches/lm-sensors-3.0.0/lib/libsensors.3

@@ -116 +116 @@
   int compute_mapping;
 .br
-  int mode;
+  unsigned int flags;
 .br
 } sensors_feature_data;\fP
 .br
-The mode field is a bitfield, its value is a combination of
+The flags field is a bitfield, its value is a combination of
 SENSORS_MODE_R (readable) and SENSORS_MODE_W (writable).
 

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

@@ -113 +113 @@
                                                     *match, int *nr);
 
-/* These defines are used in the mode field of sensors_feature_data */
+/* These defines are used in the flags field of sensors_feature_data */
 #define SENSORS_MODE_R 1
 #define SENSORS_MODE_W 2
@@ -165 +165 @@
         int mapping;
         int compute_mapping;
-        int mode;
+        unsigned int flags;
 } sensors_feature_data;
 

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

@@ -154 +154 @@
 
                 if (attr->method & SYSFS_METHOD_SHOW)
-                        feature.data.mode |= SENSORS_MODE_R;
+                        feature.data.flags |= SENSORS_MODE_R;
                 if (attr->method & SYSFS_METHOD_STORE)
-                        feature.data.mode |= SENSORS_MODE_W;
+                        feature.data.flags |= SENSORS_MODE_W;
 
                 feature.scaling = get_type_scaling(type);

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

@@ -89 +89 @@
       sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, sensor->name);
       ret = 21;
-    } else if (!(sensor->mode & SENSORS_MODE_R)) {
+    } else if (!(sensor->flags & SENSORS_MODE_R)) {
       sensorLog (LOG_INFO, "%s: %s", sensor->name, label);
     } else if ((ret = sensors_get_value (chip, sensor->number, &value))) {

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -42 +42 @@
                         continue;
                 }
-                if (data->mode & SENSORS_MODE_R) {
+                if (data->flags & SENSORS_MODE_R) {
                         if (sensors_get_value(name, data->number, &val))
                                 printf("ERROR: Can't get feature `%s' data!\n",