code style, cleanup, changed to bool return type

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

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 3d1013b..132e84f 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -47,6 +47,7 @@ enum psensor_type {
        SENSOR_TYPE_ATIADL = 0x00800,
        SENSOR_TYPE_ATASMART = 0x01000,
        SENSOR_TYPE_HDDTEMP = 0x02000,
+       SENSOR_TYPE_UDISKS2 = 0x800000,
 
        /* Type of HW component */
        SENSOR_TYPE_HDD = 0x04000,
@@ -77,6 +78,7 @@ struct psensor {
 
        /* lm-sensor */
        const sensors_chip_name *iname;
+
        const sensors_feature *feature;
 
        /* Maximum length of 'values' */
@@ -110,7 +112,7 @@ struct psensor {
        /* Whether an alarm is raised for this sensor */
        unsigned int alarm_raised;
 
-       void (*cb_alarm_raised) (struct psensor *, void *);
+       void (*cb_alarm_raised)(struct psensor *, void *);
        void *cb_alarm_raised_data;
 
 #ifdef HAVE_NVIDIA
@@ -124,6 +126,10 @@ struct psensor {
 #ifdef HAVE_ATASMART
        SkDisk *disk;
 #endif
+
+       void *provider_data;
+       void (*provider_data_free_fct)(void *);
+
        char *url;
 
        bool appindicator_enabled;
@@ -147,13 +153,11 @@ struct psensor **psensor_list_filter_graph_enabled(struct psensor **);
 struct psensor *psensor_list_get_by_id(struct psensor **sensors,
                                       const char *id);
 
-/*
-  Return 1 if there is at least one sensor of a given type, else
-  returns 0 */
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type);
+/* 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);
-int is_fan_type(unsigned int type);
 
 double get_min_temp(struct psensor **sensors);
 double get_max_temp(struct psensor **sensors);
@@ -205,12 +209,6 @@ const char *psensor_type_to_str(unsigned int type);
 
 const char *psensor_type_to_unit_str(unsigned int type, int use_celsius);
 
-void psensor_list_update_measures(struct psensor **sensors);
-
-void psensor_init();
-
-void psensor_cleanup();
-
 double get_max_value(struct psensor **sensors, int type);
 
 char *psensor_current_value_to_str(const struct psensor *, unsigned int);