Changeset 4827

Timestamp:

09/20/07 23:24:12 (6 years ago)

Author:

khali

Message:

Restore support for beeps.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/chips.c (modified) (6 diffs)

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

@@ -169 +169 @@
                              const sensors_feature_data *feature, int i)
 {
-  const int size = SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN;
-  short has_features[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN] = { 0, };
-  int feature_nrs[SENSORS_FEATURE_IN_MAX_ALARM - SENSORS_FEATURE_IN];
+  const int size = SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN;
+  short has_features[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN] = { 0, };
+  int feature_nrs[SENSORS_FEATURE_IN_BEEP - SENSORS_FEATURE_IN];
   int pos = 0;
 
@@ -203 +203 @@
     voltage->alarmNumber = -1;
   }
-  /* beep support missing for now */
-  voltage->beepNumber = -1;
+  /* beep if applicable */
+  if (IN_FEATURE(SENSORS_FEATURE_IN_BEEP)) {
+    voltage->beepNumber = IN_FEATURE_NR(SENSORS_FEATURE_IN_ALARM);
+  } else {
+    voltage->beepNumber = -1;
+  }
 }
 
@@ -213 +217 @@
                                  const sensors_feature_data *feature, int i)
 {
-  const int size = SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP;
-  short has_features[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP] = { 0, };
-  int feature_nrs[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP];
+  const int size = SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP;
+  short has_features[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP] = { 0, };
+  int feature_nrs[SENSORS_FEATURE_TEMP_BEEP - SENSORS_FEATURE_TEMP];
   int pos = 0;
 
@@ -250 +254 @@
     temperature->alarmNumber = -1;
   }
-  /* beep support missing for now */
-  temperature->beepNumber = -1;
+  /* beep if applicable */
+  if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_BEEP)) {
+    temperature->beepNumber = TEMP_FEATURE_NR(SENSORS_FEATURE_TEMP_BEEP);
+  } else {
+    temperature->beepNumber = -1;
+  }
 }
 
@@ -260 +268 @@
                          const sensors_feature_data *feature, int i)
 {
-  const int size = SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN;
-  short has_features[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN] = { 0, };
-  int feature_nrs[SENSORS_FEATURE_FAN_DIV - SENSORS_FEATURE_FAN];
+  const int size = SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN;
+  short has_features[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN] = { 0, };
+  int feature_nrs[SENSORS_FEATURE_FAN_BEEP - SENSORS_FEATURE_FAN];
   int pos = 0;
 
@@ -293 +301 @@
     fan->alarmNumber = -1;
   }
-  /* beep support missing for now */
-  fan->beepNumber = -1;
+  /* beep if applicable */
+  if (FAN_FEATURE(SENSORS_FEATURE_FAN_BEEP)) {
+    fan->beepNumber = FAN_FEATURE_NR(SENSORS_FEATURE_FAN_BEEP);
+  } else {
+    fan->beepNumber = -1;
+  }
 }