projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid specific nvidia struct field
[psensor.git]
/
src
/
lib
/
psensor.h
diff --git
a/src/lib/psensor.h
b/src/lib/psensor.h
index
9ff5a64
..
37891c3
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_ATIADL = 0x00800,
SENSOR_TYPE_ATASMART = 0x01000,
SENSOR_TYPE_HDDTEMP = 0x02000,
+ SENSOR_TYPE_UDISKS2 = 0x800000,
/* Type of HW component */
SENSOR_TYPE_HDD = 0x04000,
/* Type of HW component */
SENSOR_TYPE_HDD = 0x04000,
@@
-84,7
+85,7
@@
struct psensor {
int values_max_length;
/* Last registered measures of the sensor. Index 0 for the
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 measure *measures;
/* Color of the sensor used for the graph */
@@
-114,10
+115,6
@@
struct psensor {
void (*cb_alarm_raised)(struct psensor *, void *);
void *cb_alarm_raised_data;
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;
#ifdef HAVE_LIBATIADL
/* AMD id for the aticonfig */
int amd_id;
@@
-125,6
+122,10
@@
struct psensor {
#ifdef HAVE_ATASMART
SkDisk *disk;
#endif
#ifdef HAVE_ATASMART
SkDisk *disk;
#endif
+
+ void *provider_data;
+ void (*provider_data_free_fct)(void *);
+
char *url;
bool appindicator_enabled;
char *url;
bool appindicator_enabled;
@@
-148,11
+149,6
@@
struct psensor **psensor_list_filter_graph_enabled(struct psensor **);
struct psensor *psensor_list_get_by_id(struct psensor **sensors,
const char *id);
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);
double get_min_temp(struct psensor **sensors);
int is_temp_type(unsigned int type);
double get_min_temp(struct psensor **sensors);
@@
-161,18
+157,16
@@
double get_max_temp(struct psensor **sensors);
double get_min_rpm(struct psensor **sensors);
double get_max_rpm(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.
-*/
+/* Get the maximal current value of all sensors of a given type. */
double
psensor_get_max_current_value(struct psensor **sensors, unsigned int 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);
char *psensor_value_to_str(unsigned int type,
double value,
int use_celsius);
@@
-198,19
+192,11
@@
double psensor_get_current_value(const struct psensor *);
struct measure *psensor_get_current_measure(struct psensor *sensor);
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);
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);
double get_max_value(struct psensor **sensors, int type);
char *psensor_current_value_to_str(const struct psensor *, unsigned int);