diff options
| author | Fabio Utzig <utzig@utzig.org> | 2016-04-04 23:37:20 -0300 |
|---|---|---|
| committer | Fabio Utzig <utzig@utzig.org> | 2016-04-04 23:37:20 -0300 |
| commit | 99c3815a527585127b850f555078de4792ca7caf (patch) | |
| tree | a36de2252ecdfc6e44946e935e64658b2532ba81 /os/hal | |
| parent | 4c5a09e72722351d0139a64f3c9f476e38f95554 (diff) | |
| download | ChibiOS-Contrib-99c3815a527585127b850f555078de4792ca7caf.tar.gz ChibiOS-Contrib-99c3815a527585127b850f555078de4792ca7caf.tar.bz2 ChibiOS-Contrib-99c3815a527585127b850f555078de4792ca7caf.zip | |
Fix testhal demos (except for RNG)
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/rng.h | 2 | ||||
| -rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.c | 2 | ||||
| -rw-r--r-- | os/hal/ports/NRF51/NRF51822/hal_wdg_lld.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/os/hal/include/rng.h b/os/hal/include/rng.h index 4730f7b..0e3c484 100644 --- a/os/hal/include/rng.h +++ b/os/hal/include/rng.h @@ -57,7 +57,7 @@ typedef enum { RNG_READY, /* Ready. */ } rngstate_t; -#include "rng_lld.h" +#include "hal_rng_lld.h" /*===========================================================================*/ diff --git a/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.c b/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.c index bdb25da..52f07d6 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.c +++ b/os/hal/ports/NRF51/NRF51822/hal_ext_lld_isr.c @@ -26,7 +26,7 @@ #if HAL_USE_EXT || defined(__DOXYGEN__)
-#include "ext_lld_isr.h"
+#include "hal_ext_lld_isr.h"
/*===========================================================================*/
/* Driver local definitions. */
diff --git a/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.c b/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.c index 0a25ceb..0ce37ee 100644 --- a/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.c +++ b/os/hal/ports/NRF51/NRF51822/hal_wdg_lld.c @@ -30,7 +30,7 @@ /* Driver local definitions. */
/*===========================================================================*/
-#define RELOAD_REQUEST_VALUE 0x6E524635
+#define RELOAD_REQUEST_VALUE 0x6E524635
/*===========================================================================*/
/* Driver exported variables. */
@@ -68,7 +68,7 @@ OSAL_IRQ_HANDLER(Vector84) { /* Notify */
if (WDGD1.config->callback)
WDGD1.config->callback();
-
+
/* Wait for reboot */
while (1) { /* */ }
@@ -104,12 +104,12 @@ void wdg_lld_start(WDGDriver *wdgp) { #if WDG_USE_TIMEOUT_CALLBACK == TRUE
wdgp->wdt->INTENSET = WDT_INTENSET_TIMEOUT_Msk;
#endif
-
+
/* When to pause? (halt, sleep) */
wdgp->wdt->CONFIG =
(wdgp->config->flags.pause_on_sleep * WDT_CONFIG_SLEEP_Msk) |
(wdgp->config->flags.pause_on_halt * WDT_CONFIG_HALT_Msk );
-
+
/* Timeout in milli-seconds */
uint64_t tout = (NRF51_LFCLK_FREQUENCY * wdgp->config->timeout_ms / 1000) - 1;
osalDbgAssert(tout <= 0xFFFFFFFF, "watchdog timout value exceeded");
|