projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed useless psensor_init|cleanup functions
[psensor.git]
/
src
/
lib
/
psensor.h
diff --git
a/src/lib/psensor.h
b/src/lib/psensor.h
index
81a8b03
..
8f6fc62
100644
(file)
--- a/
src/lib/psensor.h
+++ b/
src/lib/psensor.h
@@
-35,7
+35,7
@@
enum psensor_type {
/* type of sensor values */
SENSOR_TYPE_TEMP = 0x00001,
SENSOR_TYPE_RPM = 0x00002,
/* type of sensor values */
SENSOR_TYPE_TEMP = 0x00001,
SENSOR_TYPE_RPM = 0x00002,
- SENSOR_TYPE_
USAGE
= 0x00004,
+ SENSOR_TYPE_
PERCENT
= 0x00004,
/* Whether the sensor is remote */
SENSOR_TYPE_REMOTE = 0x00008,
/* Whether the sensor is remote */
SENSOR_TYPE_REMOTE = 0x00008,
@@
-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,
@@
-62,7
+63,7
@@
enum psensor_type {
/* Combinations */
SENSOR_TYPE_HDD_TEMP = (SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP),
/* Combinations */
SENSOR_TYPE_HDD_TEMP = (SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP),
- SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_
USAGE
)
+ SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_
PERCENT
)
};
struct psensor {
};
struct psensor {
@@
-77,6
+78,7
@@
struct psensor {
/* lm-sensor */
const sensors_chip_name *iname;
/* lm-sensor */
const sensors_chip_name *iname;
+
const sensors_feature *feature;
/* Maximum length of 'values' */
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;
/* 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
void *cb_alarm_raised_data;
#ifdef HAVE_NVIDIA
@@
-124,6
+126,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;
@@
-153,7
+159,6
@@
struct psensor *psensor_list_get_by_id(struct psensor **sensors,
int psensor_list_contains_type(struct psensor **sensors, unsigned int type);
int is_temp_type(unsigned int type);
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);
double get_min_temp(struct psensor **sensors);
double get_max_temp(struct psensor **sensors);
@@
-186,6
+191,8
@@
struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
struct psensor **psensor_list_add(struct psensor **sensors,
struct psensor *sensor);
struct psensor **psensor_list_add(struct psensor **sensors,
struct psensor *sensor);
+void psensor_list_append(struct psensor ***sensors, struct psensor *sensor);
+
struct psensor **psensor_list_copy(struct psensor **);
void psensor_set_current_value(struct psensor *sensor, double value);
struct psensor **psensor_list_copy(struct psensor **);
void psensor_set_current_value(struct psensor *sensor, double value);
@@
-203,12
+210,6
@@
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_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);