From fafe4bb1f3a08529094fe9d69bc33ed02c536ab2 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Thu, 12 Oct 2017 23:59:11 +0200
Subject: [PATCH] energest: replaced some energest on/off with
 ENERGEST_SWITCH()

---
 arch/cpu/cc2538/dev/cc2538-rf.c            | 6 ++----
 arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 6 ++----
 arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c | 6 ++----
 arch/dev/cc1200/cc1200.c                   | 3 +--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/arch/cpu/cc2538/dev/cc2538-rf.c b/arch/cpu/cc2538/dev/cc2538-rf.c
index 09d72397f..5e6661b3e 100644
--- a/arch/cpu/cc2538/dev/cc2538-rf.c
+++ b/arch/cpu/cc2538/dev/cc2538-rf.c
@@ -638,8 +638,7 @@ transmit(unsigned short transmit_len)
   }
 
   /* Start the transmission */
-  ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
-  ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
+  ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);
 
   CC2538_RF_CSP_ISTXON();
 
@@ -658,8 +657,7 @@ transmit(unsigned short transmit_len)
     while(REG(RFCORE_XREG_FSMSTAT1) & RFCORE_XREG_FSMSTAT1_TX_ACTIVE);
     ret = RADIO_TX_OK;
   }
-  ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
-  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
+  ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);
 
   if(was_off) {
     off();
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index ae9a91f81..d4c1c27e5 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -946,8 +946,7 @@ transmit(unsigned short transmit_len)
 
   if(ret) {
     /* If we enter here, TX actually started */
-    ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
-    ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
+    ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);
 
     /* Idle away while the command is running */
     while((cmd.status & RF_CORE_RADIO_OP_MASKED_STATUS)
@@ -985,8 +984,7 @@ transmit(unsigned short transmit_len)
    * Update ENERGEST state here, before a potential call to off(), which
    * will correctly update it if required.
    */
-  ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
-  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
+  ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);
 
   /*
    * Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
index fb2099ed7..61581f20a 100644
--- a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
+++ b/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
@@ -706,8 +706,7 @@ transmit(unsigned short transmit_len)
 
   if(ret) {
     /* If we enter here, TX actually started */
-    ENERGEST_OFF(ENERGEST_TYPE_LISTEN);
-    ENERGEST_ON(ENERGEST_TYPE_TRANSMIT);
+    ENERGEST_SWITCH(ENERGEST_TYPE_LISTEN, ENERGEST_TYPE_TRANSMIT);
 
     watchdog_periodic();
 
@@ -737,8 +736,7 @@ transmit(unsigned short transmit_len)
    * Update ENERGEST state here, before a potential call to off(), which
    * will correctly update it if required.
    */
-  ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
-  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
+  ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);
 
   /*
    * Disable LAST_FG_COMMAND_DONE interrupt. We don't really care about it
diff --git a/arch/dev/cc1200/cc1200.c b/arch/dev/cc1200/cc1200.c
index c1492317d..78f379161 100644
--- a/arch/dev/cc1200/cc1200.c
+++ b/arch/dev/cc1200/cc1200.c
@@ -1970,8 +1970,7 @@ idle_tx_rx(const uint8_t *payload, uint16_t payload_len)
 
   TX_LEDS_OFF();
 
-  ENERGEST_OFF(ENERGEST_TYPE_TRANSMIT);
-  ENERGEST_ON(ENERGEST_TYPE_LISTEN);
+  ENERGEST_SWITCH(ENERGEST_TYPE_TRANSMIT, ENERGEST_TYPE_LISTEN);
 
   return RADIO_TX_OK;