avoid config in the psensor struct

[psensor.git] / src / lib / psensor.h

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index be25b72..505bd6f 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -19,17 +19,12 @@
 #ifndef _PSENSOR_PSENSOR_H_
 #define _PSENSOR_PSENSOR_H_
 
-#include <sensors/sensors.h>
+#include <config.h>
 
-#include "config.h"
-#ifdef HAVE_ATASMART
-#include <atasmart.h>
-#endif
-
-#include "bool.h"
-#include "color.h"
+#include <bool.h>
+#include <color.h>
+#include <measure.h>
 #include <plog.h>
-#include "measure.h"
 
 enum psensor_type {
        /* type of sensor values */
@@ -76,11 +71,6 @@ struct psensor {
        /* Name of the chip. */
        char *chip;
 
-       /* lm-sensor */
-       const sensors_chip_name *iname;
-
-       const sensors_feature *feature;
-
        /* Maximum length of 'values' */
        int values_max_length;
 
@@ -103,9 +93,6 @@ struct psensor {
        /* The minimum detected value of the sensor */
        double min;
 
-       /* Whether alarm alert is enabled for this sensor */
-       bool alarm_enabled;
-
        int alarm_high_threshold;
        int alarm_low_threshold;
 
@@ -115,24 +102,15 @@ struct psensor {
        void (*cb_alarm_raised)(struct psensor *, void *);
        void *cb_alarm_raised_data;
 
-#ifdef HAVE_NVIDIA
-       /* Nvidia id for the nvctrl */
-       int nvidia_id;
-#endif
 #ifdef HAVE_LIBATIADL
        /* AMD id for the aticonfig */
        int amd_id;
 #endif
-#ifdef HAVE_ATASMART
-       SkDisk *disk;
-#endif
 
        void *provider_data;
        void (*provider_data_free_fct)(void *);
 
        char *url;
-
-       bool appindicator_enabled;
 };
 
 struct psensor *psensor_create(char *id,
@@ -153,10 +131,6 @@ struct psensor **psensor_list_filter_graph_enabled(struct psensor **);
 struct psensor *psensor_list_get_by_id(struct psensor **sensors,
                                       const char *id);
 
-/* Return true if there is at least one sensor of a given type, else
- * returns false */
-bool psensor_list_contains_type(struct psensor **sensors, unsigned int type);
-
 int is_temp_type(unsigned int type);
 
 double get_min_temp(struct psensor **sensors);