#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,
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 */
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
}
void psensor_init()
{
- lmsensor_init();
}
void psensor_cleanup()
{
- lmsensor_cleanup();
}
struct psensor **psensor_list_copy(struct psensor **sensors)