X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwireless.c;h=09df407070c01d5b7503c75238d088290055d636;hb=e4b274ed754af52196d3390b8ce101a7f94e318a;hp=007272e1ed28bd5bbf2cca0a831a1f6bbdea0d7a;hpb=06adec208286b5a136ffa5c5f3832c35e9f62844;p=collectd.git diff --git a/src/wireless.c b/src/wireless.c index 007272e1..09df4070 100644 --- a/src/wireless.c +++ b/src/wireless.c @@ -23,40 +23,12 @@ #include "common.h" #include "plugin.h" -#if defined(KERNEL_LINUX) -# define WIRELESS_HAVE_READ 1 -#else -# define WIRELESS_HAVE_READ 0 +#if !KERNEL_LINUX +# error "No applicable input method." #endif #define WIRELESS_PROC_FILE "/proc/net/wireless" -static data_source_t data_source_quality[1] = -{ - {"value", DS_TYPE_GAUGE, 0, NAN} -}; - -static data_set_t quality_ds = -{ - "signal_quality", 1, data_source_quality -}; - -static data_source_t data_source_signal[1] = -{ - {"value", DS_TYPE_GAUGE, NAN, 0} -}; - -static data_set_t power_ds = -{ - "signal_power", 1, data_source_signal -}; - -static data_set_t noise_ds = -{ - "signal_noise", 1, data_source_signal -}; - -#if WIRELESS_HAVE_READ #if 0 static double wireless_dbm_to_watt (double dbm) { @@ -165,19 +137,8 @@ static int wireless_read (void) return (0); } /* int wireless_read */ -#endif /* WIRELESS_HAVE_READ */ -void module_register (modreg_e load) +void module_register (void) { - if (load & MR_DATASETS) - { - plugin_register_data_set (&quality_ds); - plugin_register_data_set (&power_ds); - plugin_register_data_set (&noise_ds); - } - -#if WIRELESS_HAVE_READ - if (load & MR_READ) - plugin_register_read ("wireless", wireless_read); -#endif /* WIRELESS_HAVE_READ */ + plugin_register_read ("wireless", wireless_read); } /* void module_register */