Merge pull request #3674 from ARMmbed/feature_hal_sleep

sg- · web-flow · commit 2c541771153c · 2017-02-02T11:01:45.000-06:00
NRF51822: HAL: Restore WEAK declaration for hal_(deep)sleep
diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/sleep.c b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/sleep.c
@@ -18,15 +18,15 @@
 #include "mbed_interface.h"
 #include "toolchain.h"
 
-void hal_sleep(void)
+MBED_WEAK void hal_sleep(void)
 {
     // ensure debug is disconnected if semihost is enabled....
     NRF_POWER->TASKS_LOWPWR = 1;
     // wait for interrupt
     __WFE();
 }
 
-void hal_deepsleep(void)
+MBED_WEAK void hal_deepsleep(void)
 {
     hal_sleep();
     //   NRF_POWER->SYSTEMOFF=1;

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@`
`18`	`18`	`#include "mbed_interface.h"`
`19`	`19`	`#include "toolchain.h"`
`20`	`20`
`21`		`-void hal_sleep(void)`
	`21`	`+MBED_WEAK void hal_sleep(void)`
`22`	`22`	`{`
`23`	`23`	`// ensure debug is disconnected if semihost is enabled....`
`24`	`24`	`NRF_POWER->TASKS_LOWPWR = 1;`
`25`	`25`	`// wait for interrupt`
`26`	`26`	`__WFE();`
`27`	`27`	`}`
`28`	`28`
`29`		`-void hal_deepsleep(void)`
	`29`	`+MBED_WEAK void hal_deepsleep(void)`
`30`	`30`	`{`
`31`	`31`	`hal_sleep();`
`32`	`32`	`// NRF_POWER->SYSTEMOFF=1;`