Use mbed_sleep API instead of Silicon Labs specific sleepmode API

pull/5579/head
Steven Cooreman 2017-11-24 15:36:44 +01:00
parent a2514fdef3
commit 21d0920068
1 changed files with 6 additions and 6 deletions

View File

@ -18,11 +18,11 @@
#include <string.h> #include <string.h>
#include "mbed.h" #include "mbed.h"
#include "mbed_sleep.h"
#include "ns_types.h" #include "ns_types.h"
#include "platform/arm_hal_interrupt.h" #include "platform/arm_hal_interrupt.h"
#include "nanostack/platform/arm_hal_phy.h" #include "nanostack/platform/arm_hal_phy.h"
#include "mbed_toolchain.h" #include "mbed_toolchain.h"
#include "sleepmodes.h"
#include "mbed-trace/mbed_trace.h" #include "mbed-trace/mbed_trace.h"
#define TRACE_GROUP "SLRF" #define TRACE_GROUP "SLRF"
@ -482,7 +482,7 @@ static void rf_device_unregister(void)
{ {
arm_net_phy_unregister(rf_radio_driver_id); arm_net_phy_unregister(rf_radio_driver_id);
if(sleep_blocked) { if(sleep_blocked) {
unblockSleepMode(EM1); sleep_manager_unlock_deep_sleep();
sleep_blocked = false; sleep_blocked = false;
} }
} }
@ -580,7 +580,7 @@ static int8_t rf_interface_state_control(phy_interface_state_e new_state, uint8_
RAIL_Idle(gRailHandle, RAIL_IDLE_FORCE_SHUTDOWN_CLEAR_FLAGS, true); RAIL_Idle(gRailHandle, RAIL_IDLE_FORCE_SHUTDOWN_CLEAR_FLAGS, true);
radio_state = RADIO_IDLE; radio_state = RADIO_IDLE;
if(sleep_blocked) { if(sleep_blocked) {
unblockSleepMode(EM1); sleep_manager_unlock_deep_sleep();
sleep_blocked = false; sleep_blocked = false;
} }
break; break;
@ -589,7 +589,7 @@ static int8_t rf_interface_state_control(phy_interface_state_e new_state, uint8_
RAIL_Idle(gRailHandle, RAIL_IDLE_FORCE_SHUTDOWN_CLEAR_FLAGS, true); RAIL_Idle(gRailHandle, RAIL_IDLE_FORCE_SHUTDOWN_CLEAR_FLAGS, true);
radio_state = RADIO_IDLE; radio_state = RADIO_IDLE;
if(sleep_blocked) { if(sleep_blocked) {
unblockSleepMode(EM1); sleep_manager_unlock_deep_sleep();
sleep_blocked = false; sleep_blocked = false;
} }
break; break;
@ -602,7 +602,7 @@ static int8_t rf_interface_state_control(phy_interface_state_e new_state, uint8_
radio_state = RADIO_RX; radio_state = RADIO_RX;
if(!sleep_blocked) { if(!sleep_blocked) {
/* RX can only happen in EM0/1*/ /* RX can only happen in EM0/1*/
blockSleepMode(EM1); sleep_manager_lock_deep_sleep();
sleep_blocked = true; sleep_blocked = true;
} }
} else { } else {
@ -623,7 +623,7 @@ static int8_t rf_interface_state_control(phy_interface_state_e new_state, uint8_
radio_state = RADIO_RX; radio_state = RADIO_RX;
if(!sleep_blocked) { if(!sleep_blocked) {
/* RX can only happen in EM0/1*/ /* RX can only happen in EM0/1*/
blockSleepMode(EM1); sleep_manager_lock_deep_sleep();
sleep_blocked = true; sleep_blocked = true;
} }
} else { } else {