Changeset 4766

Timestamp:

09/05/07 14:28:31 (6 years ago)

Author:

khali

Message:

Add support for the standard beep_enable attribute (#2248).

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/access.c (modified) (1 diff)
• lib/sensors.h (modified) (1 diff)
• lib/sysfs.c (modified) (2 diffs)
• prog/sensors/chips.c (modified) (2 diffs)

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

@@ -563 +563 @@
         const struct feature_subtype_match *submatches;
         
+        /* Special case */
+        if (!strcmp(name, "beep_enable")) {
+                *nr = 0;
+                return SENSORS_FEATURE_BEEP_ENABLE;
+        }
+
         for (i = 0; i < ARRAY_SIZE(matches); i++)
                 if ((count = sscanf(name, matches[i].name, nr, &c)))

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

@@ -155 +155 @@
         SENSORS_FEATURE_VID = 0x300,
 
+        SENSORS_FEATURE_BEEP_ENABLE = 0x1100,
+
         SENSORS_FEATURE_UNKNOWN = INT_MAX,
 } sensors_feature_type;

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

@@ -39 +39 @@
 #define MAX_SENSORS_PER_TYPE    20
 #define MAX_SUB_FEATURES        6
-/* Room for all 3 types (in, fan, temp) with all their subfeatures + VID */
+/* Room for all 3 types (in, fan, temp) with all their subfeatures + VID
+   + misc features */
 #define ALL_POSSIBLE_FEATURES   (MAX_SENSORS_PER_TYPE * MAX_SUB_FEATURES * 6 \
-                                 + MAX_SENSORS_PER_TYPE)
+                                 + MAX_SENSORS_PER_TYPE + 1)
 
 static
@@ -110 +111 @@
                 /* "calculate" a place to store the feature in our sparse,
                    sorted table */
-                if (type == SENSORS_FEATURE_VID) {
+                switch (type) {
+                case SENSORS_FEATURE_VID:
                         i = nr + MAX_SENSORS_PER_TYPE * MAX_SUB_FEATURES * 6;
-                } else {
+                        break;
+                case SENSORS_FEATURE_BEEP_ENABLE:
+                        i = MAX_SENSORS_PER_TYPE * MAX_SUB_FEATURES * 6 +
+                            MAX_SENSORS_PER_TYPE;
+                        break;
+                default:
                         i = (type >> 8) * MAX_SENSORS_PER_TYPE *
                             MAX_SUB_FEATURES * 2 + nr * MAX_SUB_FEATURES * 2 +

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

@@ -387 +387 @@
                 print_label(label, label_size);
                 printf("%+6.3f V\n", vid);
+        }
+        free(label);
+}
+
+static void print_chip_beep_enable(const sensors_chip_name *name, int f_beep,
+                                   int label_size)
+{
+        char *label;
+        double beep_enable;
+
+        if ((label = sensors_get_label(name, f_beep))
+         && !sensors_get_value(name, f_beep, &beep_enable)) {
+                print_label(label, label_size);
+                printf("%s\n", beep_enable ? "enabled" : "disabled");
         }
         free(label);
@@ -416 +430 @@
                         print_chip_vid(name, feature->number, label_size);
                         break;
+                case SENSORS_FEATURE_BEEP_ENABLE:
+                        print_chip_beep_enable(name, feature->number,
+                                               label_size);
+                        break;
                 default:
                         continue;