X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=d151ac1dfd86d5c88d92944e30957c723aa3495d;hb=9d77e6ab0ca102b9d42072df4fd9d2378897a5ca;hp=ef974f0d99d09db1ccadcba171f55643a9d37a66;hpb=7df6be97f428ae704d2572ad79e2c7d7d1afc90f;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index ef974f0..d151ac1 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -23,6 +23,8 @@
 #include <libintl.h>
 #define _(str) gettext(str)
 
+#include <stdio.h>
+
 #include <hdd.h>
 #include <psensor.h>
 #include <temperature.h>
@@ -48,7 +50,6 @@ struct psensor *psensor_create(char *id,
 	psensor->values_max_length = values_max_length;
 	psensor->measures = measures_dbl_create(values_max_length);
 
-	psensor->alarm_enabled = 0;
 	psensor->alarm_high_threshold = 0;
 	psensor->alarm_low_threshold = 0;
 
@@ -60,9 +61,6 @@ struct psensor *psensor_create(char *id,
 
 	psensor->color = NULL;
 
-	psensor->graph_enabled = 1;
-	psensor->appindicator_enabled = 0;
-
 	psensor->provider_data = NULL;
 	psensor->provider_data_free_fct = &free;
 
@@ -155,32 +153,15 @@ int psensor_list_size(struct psensor **sensors)
 	return size;
 }
 
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
-{
-	struct psensor **s;
-
-	if (!sensors)
-		return 0;
-
-	s = sensors;
-	while (*s) {
-		if ((*s)->type & type)
-			return 1;
-		s++;
-	}
-
-	return 0;
-}
-
 struct psensor **psensor_list_add(struct psensor **sensors,
 				  struct psensor *sensor)
 {
 	int size;
+	struct psensor **result;
 
 	size = psensor_list_size(sensors);
 
-	struct psensor **result
-	    = malloc((size + 1 + 1) * sizeof(struct psensor *));
+	result = malloc((size + 1 + 1) * sizeof(struct psensor *));
 
 	if (sensors)
 		memcpy(result, sensors, size * sizeof(struct psensor *));
@@ -281,15 +262,13 @@ void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv)
 	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
 		s->max = v;
 
-	if (s->alarm_enabled) {
-		if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
-			if (!s->alarm_raised && s->cb_alarm_raised)
-				s->cb_alarm_raised(s, s->cb_alarm_raised_data);
-
-			s->alarm_raised = 1;
-		} else {
-			s->alarm_raised = 0;
+	if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
+		if (!s->alarm_raised && s->cb_alarm_raised) {
+			s->alarm_raised = true;
+			s->cb_alarm_raised(s, s->cb_alarm_raised_data);
 		}
+	} else {
+		s->alarm_raised = false;
 	}
 }
 
@@ -367,28 +346,6 @@ double get_max_value(struct psensor **sensors, int type)
 	return m;
 }
 
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s_cur = sensors;
-
-	while (*s_cur) {
-		struct psensor *s = *s_cur;
-
-		if (s->graph_enabled && (s->type & type)) {
-			double v = psensor_get_current_value(s);
-
-			if (m == UNKNOWN_DBL_VALUE || v > m)
-				m = v;
-		}
-
-		s_cur++;
-	}
-
-	return m;
-}
-
 double get_min_temp(struct psensor **sensors)
 {
 	return get_min_value(sensors, SENSOR_TYPE_TEMP);
@@ -409,28 +366,6 @@ double get_max_temp(struct psensor **sensors)
 	return get_max_value(sensors, SENSOR_TYPE_TEMP);
 }
 
-struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
-{
-	struct psensor **psensors;
-
-	psensors = NULL;
-
-	if (!use_libatasmart)
-		hddtemp_psensor_list_append(&psensors, values_max_length);
-
-#ifdef HAVE_ATASMART
-	else
-		atasmart_psensor_list_append(&psensors, values_max_length);
-#endif
-
-	if (!psensors) {	/* there is no detected sensors */
-		psensors = malloc(sizeof(struct psensor *));
-		*psensors = NULL;
-	}
-
-	return psensors;
-}
-
 const char *psensor_type_to_str(unsigned int type)
 {
 	if (type & SENSOR_TYPE_NVCTRL) {
@@ -496,17 +431,6 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 	return _("N/A");
 }
 
-void psensor_list_update_measures(struct psensor **sensors)
-{
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
-		hddtemp_psensor_list_update(sensors);
-
-#ifdef HAVE_ATASMART
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART))
-		atasmart_psensor_list_update(sensors);
-#endif
-}
-
 void psensor_log_measures(struct psensor **sensors)
 {
 	if (log_level == LOG_DEBUG)
@@ -519,14 +443,6 @@ void psensor_log_measures(struct psensor **sensors)
 		}
 }
 
-void psensor_init()
-{
-}
-
-void psensor_cleanup()
-{
-}
-
 struct psensor **psensor_list_copy(struct psensor **sensors)
 {
 	struct psensor **result;
@@ -548,26 +464,3 @@ psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius)
 				    psensor_get_current_value(s),
 				    use_celsius);
 }
-
-struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors)
-{
-	int n, i;
-	struct psensor **result, **cur, *s;
-
-	if (!sensors)
-		return NULL;
-
-	n = psensor_list_size(sensors);
-	result = malloc((n+1) * sizeof(struct psensor *));
-
-	for (cur = sensors, i = 0; *cur; cur++) {
-		s = *cur;
-
-		if (s->graph_enabled)
-			result[i++] = s;
-	}
-
-	result[i] = NULL;
-
-	return result;
-}