check target call cppcheck if it is installed

[psensor.git] / src / lib / psensor.h

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 3b18a66..d0185a6 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -19,13 +19,14 @@
 #ifndef _PSENSOR_PSENSOR_H_
 #define _PSENSOR_PSENSOR_H_
 
-#include "config.h"
 #include <sensors/sensors.h>
 
+#include "config.h"
 #ifdef HAVE_ATASMART
 #include <atasmart.h>
 #endif
 
+#include "bool.h"
 #include "color.h"
 #include "log.h"
 #include "measure.h"
@@ -36,19 +37,19 @@ enum psensor_type {
        SENSOR_TYPE_REMOTE = 0x0004,
 
        SENSOR_TYPE_LMSENSOR = 0x0100,
-       SENSOR_TYPE_NVIDIA_TEMP = 0x0200 | SENSOR_TYPE_TEMP,
-       SENSOR_TYPE_HDD_TEMP = 0x0400 | SENSOR_TYPE_TEMP,
+       SENSOR_TYPE_NVIDIA_TEMP = (0x0200 | SENSOR_TYPE_TEMP),
+       SENSOR_TYPE_HDD_TEMP = (0x0400 | SENSOR_TYPE_TEMP),
        SENSOR_TYPE_CPU_USAGE = 0x0800,
        SENSOR_TYPE_AMD = 0x1000,
 
-       SENSOR_TYPE_HDD_TEMP_ATASMART = 0x2000 | SENSOR_TYPE_HDD_TEMP,
-       SENSOR_TYPE_HDD_TEMP_HDDTEMP = 0x4000 | SENSOR_TYPE_HDD_TEMP,
+       SENSOR_TYPE_HDD_TEMP_ATASMART = (0x2000 | SENSOR_TYPE_HDD_TEMP),
+       SENSOR_TYPE_HDD_TEMP_HDDTEMP = (0x4000 | SENSOR_TYPE_HDD_TEMP),
 
-       SENSOR_TYPE_AMD_TEMP = SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP,
-       SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN,
+       SENSOR_TYPE_AMD_TEMP = (SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP),
+       SENSOR_TYPE_AMD_FAN = (SENSOR_TYPE_AMD | SENSOR_TYPE_FAN),
 
-       SENSOR_TYPE_LMSENSOR_TEMP = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP,
-       SENSOR_TYPE_LMSENSOR_FAN = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN
+       SENSOR_TYPE_LMSENSOR_TEMP = (SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP),
+       SENSOR_TYPE_LMSENSOR_FAN = (SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN)
 };
 
 struct psensor {
@@ -58,6 +59,9 @@ struct psensor {
        /* Uniq id of the sensor */
        char *id;
 
+       /* Name of the chip. */
+       char *chip;
+
        /* lm-sensor */
        const sensors_chip_name *iname;
        const sensors_feature *feature;
@@ -73,7 +77,7 @@ struct psensor {
        struct color *color;
 
        /* Whether the graph sensor is displayed. */
-       unsigned int enabled;
+       bool enabled;
 
        /* see psensor_type */
        unsigned int type;
@@ -85,7 +89,7 @@ struct psensor {
        double min;
 
        /* Whether alarm alert is enabled for this sensor */
-       unsigned int alarm_enabled;
+       bool alarm_enabled;
 
        int alarm_high_threshold;
        int alarm_low_threshold;
@@ -110,11 +114,13 @@ struct psensor {
 
        char *url;
 
-       unsigned int appindicator_enabled;
+       bool appindicator_enabled;
 };
 
 struct psensor *psensor_create(char *id,
-                              char *name, unsigned int type,
+                              char *name,
+                              char *chip,
+                              unsigned int type,
                               int values_max_length);
 
 void psensor_values_resize(struct psensor *s, int new_size);