projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid to store configuration in psensor struct
[psensor.git]
/
src
/
lib
/
psensor.h
diff --git
a/src/lib/psensor.h
b/src/lib/psensor.h
index
cec6d0f
..
a04c0ac
100644
(file)
--- a/
src/lib/psensor.h
+++ b/
src/lib/psensor.h
@@
-19,17
+19,12
@@
#ifndef _PSENSOR_PSENSOR_H_
#define _PSENSOR_PSENSOR_H_
#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 <plog.h>
-#include "measure.h"
enum psensor_type {
/* type of sensor values */
enum psensor_type {
/* type of sensor values */
@@
-76,11
+71,6
@@
struct psensor {
/* Name of the chip. */
char *chip;
/* 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;
/* Maximum length of 'values' */
int values_max_length;
@@
-115,24
+105,15
@@
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;
#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;
void *provider_data;
void (*provider_data_free_fct)(void *);
char *url;
-
- bool appindicator_enabled;
};
struct psensor *psensor_create(char *id,
};
struct psensor *psensor_create(char *id,