X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=f80f2100194b5a4590e7dc2b5d8ed7889da3641c;hb=472cac625c92e0d5e0e2511e272e216489936490;hp=3d1013b093c4b7cc5e5a7233497236a487557176;hpb=ba0ded662ced0e4334ac0652d8f7991f485f0899;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 3d1013b..f80f210 100644
--- 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 */
@@ -47,6 +42,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,
@@ -75,23 +71,16 @@ 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;
 
 	/* Last registered measures of the sensor.  Index 0 for the
-	   oldest measure.  */
+	 * oldest measure.  */
 	struct measure *measures;
 
 	/* Color of the sensor used for the graph */
 	struct color *color;
 
-	/* Whether the graph sensor is displayed. */
-	bool graph_enabled;
-
 	/* see psensor_type */
 	unsigned int type;
 
@@ -101,32 +90,22 @@ 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;
 
 	/* Whether an alarm is raised for this sensor */
-	unsigned int alarm_raised;
+	bool alarm_raised;
 
-	void (*cb_alarm_raised) (struct psensor *, void *);
+	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
-	char *url;
 
-	bool appindicator_enabled;
+	void *provider_data;
+	void (*provider_data_free_fct)(void *);
 };
 
 struct psensor *psensor_create(char *id,
@@ -142,18 +121,10 @@ void psensor_free(struct psensor *sensor);
 void psensor_list_free(struct psensor **sensors);
 int psensor_list_size(struct psensor **sensors);
 
-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);
-
 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);
@@ -162,17 +133,11 @@ double get_min_rpm(struct psensor **sensors);
 double get_max_rpm(struct psensor **sensors);
 
 /*
-  Get the maximal current value of all sensors of a given type.
-*/
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
-
-/*
-  Converts the value of a sensor to a string.
-
-  parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA,
-  or SENSOR_TYPE_LMSENSOR_FAN
-*/
+ * Converts the value of a sensor to a string.
+ *
+ * parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA,
+ * or SENSOR_TYPE_LMSENSOR_FAN
+ */
 char *psensor_value_to_str(unsigned int type,
 			   double value,
 			   int use_celsius);
@@ -198,19 +163,11 @@ double psensor_get_current_value(const struct psensor *);
 
 struct measure *psensor_get_current_measure(struct psensor *sensor);
 
-/*
-  Returns a string representation of a psensor type.
-*/
+/* Returns a string representation of a psensor type. */
 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);