diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h index da6293d1d..58224a872 100644 --- a/src/modules/temperature/e_mod_main.h +++ b/src/modules/temperature/e_mod_main.h @@ -4,6 +4,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#include "e_mod_main_private.h" + typedef struct _Config Config; typedef struct _Config_Face Config_Face; @@ -13,19 +15,6 @@ typedef enum _Unit FAHRENHEIT } Unit; -typedef enum _Sensor_Type -{ - SENSOR_TYPE_NONE, - SENSOR_TYPE_FREEBSD, - SENSOR_TYPE_OMNIBOOK, - SENSOR_TYPE_LINUX_MACMINI, - SENSOR_TYPE_LINUX_I2C, - SENSOR_TYPE_LINUX_ACPI, - SENSOR_TYPE_LINUX_PCI, - SENSOR_TYPE_LINUX_PBOOK, - SENSOR_TYPE_LINUX_INTELCORETEMP -} Sensor_Type; - struct _Config_Face { const char *id; diff --git a/src/modules/temperature/e_mod_main_private.h b/src/modules/temperature/e_mod_main_private.h new file mode 100644 index 000000000..87e907b95 --- /dev/null +++ b/src/modules/temperature/e_mod_main_private.h @@ -0,0 +1,20 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifndef E_MOD_MAIN_PRIVATE_H +#define E_MOD_MAIN_PRIVATE_H + +typedef enum _Sensor_Type +{ + SENSOR_TYPE_NONE, + SENSOR_TYPE_FREEBSD, + SENSOR_TYPE_OMNIBOOK, + SENSOR_TYPE_LINUX_MACMINI, + SENSOR_TYPE_LINUX_I2C, + SENSOR_TYPE_LINUX_ACPI, + SENSOR_TYPE_LINUX_PCI, + SENSOR_TYPE_LINUX_PBOOK, + SENSOR_TYPE_LINUX_INTELCORETEMP +} Sensor_Type; + +#endif diff --git a/src/modules/temperature/tempget.c b/src/modules/temperature/tempget.c index 15f115bc8..5d7664e16 100644 --- a/src/modules/temperature/tempget.c +++ b/src/modules/temperature/tempget.c @@ -1,14 +1,23 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "e.h" -#include "e_mod_main.h" + +#include +#include +#include +#include #ifdef __FreeBSD__ #include #include #endif +#include +#include + +#include "e_mod_main_private.h" + + static int sensor_type = SENSOR_TYPE_NONE; static char *sensor_name = NULL; static int poll_interval = 32;