From 68a8a0c4458654f2445fb24cbb709a554f1c5968 Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Thu, 12 Oct 2017 23:52:03 +0200 Subject: [PATCH] energest: removed energest types for LEDs --- os/dev/leds.c | 31 ++----------------------------- os/sys/energest.h | 3 --- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/os/dev/leds.c b/os/dev/leds.c index c815e100d..9273ad9ca 100644 --- a/os/dev/leds.c +++ b/os/dev/leds.c @@ -32,40 +32,13 @@ #include "dev/leds.h" #include "sys/clock.h" -#include "sys/energest.h" static unsigned char leds; /*---------------------------------------------------------------------------*/ -static void +static inline void show_leds(unsigned char new_leds) { - unsigned char changed; - changed = leds ^ new_leds; - leds = new_leds; - - if(changed & LEDS_GREEN) { - /* Green did change */ - if(leds & LEDS_GREEN) { - ENERGEST_ON(ENERGEST_TYPE_LED_GREEN); - } else { - ENERGEST_OFF(ENERGEST_TYPE_LED_GREEN); - } - } - if(changed & LEDS_YELLOW) { - if(leds & LEDS_YELLOW) { - ENERGEST_ON(ENERGEST_TYPE_LED_YELLOW); - } else { - ENERGEST_OFF(ENERGEST_TYPE_LED_YELLOW); - } - } - if(changed & LEDS_RED) { - if(leds & LEDS_RED) { - ENERGEST_ON(ENERGEST_TYPE_LED_RED); - } else { - ENERGEST_OFF(ENERGEST_TYPE_LED_RED); - } - } - leds_arch_set(leds); + leds_arch_set(new_leds); } /*---------------------------------------------------------------------------*/ void diff --git a/os/sys/energest.h b/os/sys/energest.h index 8296041b3..3b52d0c83 100644 --- a/os/sys/energest.h +++ b/os/sys/energest.h @@ -51,9 +51,6 @@ enum energest_type { ENERGEST_TYPE_CPU, ENERGEST_TYPE_LPM, ENERGEST_TYPE_IRQ, - ENERGEST_TYPE_LED_GREEN, - ENERGEST_TYPE_LED_YELLOW, - ENERGEST_TYPE_LED_RED, ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN,