From d305eb7fd5b45d582e64fe79f6b0b1bfb93ea1e3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 22 Mar 2013 10:17:49 +0000 Subject: [PATCH] values are remotely retrieved --- src/lib/cpu.c | 3 ++- src/lib/hdd_atasmart.c | 3 ++- src/lib/hdd_hddtemp.c | 3 ++- src/lib/lmsensor.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/cpu.c b/src/lib/cpu.c index 0fe66df..7cf2105 100644 --- a/src/lib/cpu.c +++ b/src/lib/cpu.c @@ -93,7 +93,8 @@ void cpu_psensor_list_update(struct psensor **sensors) while (*ss) { s = *ss; - if (s->type == SENSOR_TYPE_CPU_USAGE) + if (!(s->type & SENSOR_TYPE_REMOTE) + && s->type == SENSOR_TYPE_CPU_USAGE) cpu_usage_sensor_update(s); ss++; diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c index acd4a8f..bd1ff4b 100644 --- a/src/lib/hdd_atasmart.c +++ b/src/lib/hdd_atasmart.c @@ -169,7 +169,8 @@ void hdd_psensor_list_update(struct psensor **sensors) cur = sensors; while (*cur) { s = *cur; - if (s->type & SENSOR_TYPE_ATASMART) { + if (!(s->type & SENSOR_TYPE_REMOTE) + && s->type & SENSOR_TYPE_ATASMART) { ret = sk_disk_smart_read_data(s->disk); if (!ret) { diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c index 9a6d3d3..afd57b4 100644 --- a/src/lib/hdd_hddtemp.c +++ b/src/lib/hdd_hddtemp.c @@ -222,7 +222,8 @@ static void update(struct psensor **sensors, struct hdd_info *info) struct psensor **sensor_cur = sensors; while (*sensor_cur) { - if ((*sensor_cur)->type & SENSOR_TYPE_HDDTEMP + if (!((*sensor_cur)->type & SENSOR_TYPE_REMOTE) + && (*sensor_cur)->type & SENSOR_TYPE_HDDTEMP && !strcmp((*sensor_cur)->id + 4, info->name)) psensor_set_current_value(*sensor_cur, (float)info->temp); diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c index 84b36b3..2ace110 100644 --- a/src/lib/lmsensor.c +++ b/src/lib/lmsensor.c @@ -86,7 +86,8 @@ void lmsensor_psensor_list_update(struct psensor **sensors) while (*s_ptr) { struct psensor *s = *s_ptr; - if (s->type & SENSOR_TYPE_LMSENSOR) { + if (!(s->type & SENSOR_TYPE_REMOTE) + && s->type & SENSOR_TYPE_LMSENSOR) { if (s->type & SENSOR_TYPE_TEMP) psensor_set_current_value(s, get_temp_input(s)); -- 2.7.4