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

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index fb30352..ef974f0 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -25,14 +25,8 @@
 
 #include <hdd.h>
 #include <psensor.h>
-#include <lmsensor.h>
 #include <temperature.h>
 
-#ifdef HAVE_GTOP
-#include <cpu.h>
-#include <pmem.h>
-#endif
-
 struct psensor *psensor_create(char *id,
 			       char *name,
 			       char *chip,
@@ -418,31 +412,15 @@ double get_max_temp(struct psensor **sensors)
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 {
 	struct psensor **psensors;
-	struct psensor **tmp_psensors;
 
-	psensors = lmsensor_psensor_list_add(NULL, values_max_length);
+	psensors = NULL;
 
-	if (!use_libatasmart) {
-		tmp_psensors = hddtemp_psensor_list_add(psensors,
-							values_max_length);
-		if (tmp_psensors != psensors) {
-			free(psensors);
-			psensors = tmp_psensors;
-		}
-	}
-#ifdef HAVE_ATASMART
-		else {
-			tmp_psensors = hdd_psensor_list_add(psensors,
-							    values_max_length);
-			if (tmp_psensors != psensors) {
-				free(psensors);
-				psensors = tmp_psensors;
-			}
-		}
-#endif
+	if (!use_libatasmart)
+		hddtemp_psensor_list_append(&psensors, values_max_length);
 
-#ifdef HAVE_GTOP
-	mem_psensor_list_add(&psensors, values_max_length);
+#ifdef HAVE_ATASMART
+	else
+		atasmart_psensor_list_append(&psensors, values_max_length);
 #endif
 
 	if (!psensors) {	/* there is no detected sensors */
@@ -520,19 +498,12 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 
 void psensor_list_update_measures(struct psensor **sensors)
 {
-	lmsensor_psensor_list_update(sensors);
-
-#ifdef HAVE_GTOP
-	cpu_psensor_list_update(sensors);
-	mem_psensor_list_update(sensors);
-#endif
-
 	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))
-		hdd_psensor_list_update(sensors);
+		atasmart_psensor_list_update(sensors);
 #endif
 }
 
@@ -550,12 +521,10 @@ void psensor_log_measures(struct psensor **sensors)
 
 void psensor_init()
 {
-	lmsensor_init();
 }
 
 void psensor_cleanup()
 {
-	lmsensor_cleanup();
 }
 
 struct psensor **psensor_list_copy(struct psensor **sensors)