Imported Upstream version 1.2.0

[psensor-pkg-debian.git] / src / lib / psensor.h

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index cec6d0f..111976b 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,17 +19,11 @@
 #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 <measure.h>
 #include <plog.h>
-#include "measure.h"
 
 enum psensor_type {
        /* type of sensor values */
@@ -76,63 +70,44 @@ 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.  */
+       /*
+        * Last registered measures of the sensor.  Index 0 for the
+        * 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;
 
-       /* The maximum detected value of the sensor */
        double max;
 
-       /* The minimum detected value of the sensor */
        double min;
 
-       /* Whether alarm alert is enabled for this sensor */
-       bool alarm_enabled;
+       /* The highest value detected during this session. */
+       double sess_highest;
+
+       /* The lowest value detected during this session. */
+       double sess_lowest;
 
-       int alarm_high_threshold;
-       int alarm_low_threshold;
+       double alarm_high_threshold;
+       double 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_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,
@@ -148,8 +123,6 @@ 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);
 
@@ -161,10 +134,6 @@ double get_max_temp(struct psensor **sensors);
 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.
  *
@@ -179,8 +148,6 @@ char *psensor_measure_to_str(const struct measure *m,
                             unsigned int type,
                             unsigned int use_celsius);
 
-struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
-
 struct psensor **psensor_list_add(struct psensor **sensors,
                                  struct psensor *sensor);