diff options
author | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-27 22:55:17 +0200 |
---|---|---|
committer | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-27 22:55:17 +0200 |
commit | 223f46589016f2dce6a29cbd00d9020f80d2a556 (patch) | |
tree | 66653c078459a091ade80f5a6434cad9ee1c2741 /os/hal/ports/TIVA/LLD/WDT | |
parent | 94fe96d3ae4a8d05b7d752f9ff8e0bd4b3de25d6 (diff) | |
download | ChibiOS-Contrib-223f46589016f2dce6a29cbd00d9020f80d2a556.tar.gz ChibiOS-Contrib-223f46589016f2dce6a29cbd00d9020f80d2a556.tar.bz2 ChibiOS-Contrib-223f46589016f2dce6a29cbd00d9020f80d2a556.zip |
Replaced custom register bitfield macros by TivaWare bitfield macros.
Diffstat (limited to 'os/hal/ports/TIVA/LLD/WDT')
-rw-r--r-- | os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c | 6 | ||||
-rw-r--r-- | os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h | 17 |
2 files changed, 3 insertions, 20 deletions
diff --git a/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c b/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c index 1fc86f2..ddd01e0 100644 --- a/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c +++ b/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c @@ -62,7 +62,7 @@ static void serve_interrupt(WDGDriver *wdgp) mis = HWREG(wdgp->wdt + WDT_O_MIS); - if (mis & MIS_WDTMIS) { + if (mis & WDT_MIS_WDTMIS) { /* Invoke callback, if any */ if (wdgp->config->callback) { if (wdgp->config->callback(wdgp)) { @@ -159,10 +159,10 @@ void wdg_lld_start(WDGDriver *wdgp) HWREG(wdgp->wdt + WDT_O_TEST) = wdgp->config->test; wdgTivaSyncWrite(wdgp); - HWREG(wdgp->wdt + WDT_O_CTL) |= CTL_RESEN; + HWREG(wdgp->wdt + WDT_O_CTL) |= WDT_CTL_RESEN; wdgTivaSyncWrite(wdgp); - HWREG(wdgp->wdt + WDT_O_CTL) |= CTL_INTEN; + HWREG(wdgp->wdt + WDT_O_CTL) |= WDT_CTL_INTEN; wdgTivaSyncWrite(wdgp); } diff --git a/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h b/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h index 38bee25..77badb3 100644 --- a/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h +++ b/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h @@ -32,23 +32,6 @@ /* Driver constants. */ /*===========================================================================*/ -#define LOCK_UNLOCK 0x1ACCE551U -#define LOCK_LOCK 0x00000000U - -#define LOCK_IS_UNLOCKED 0U -#define LOCK_IS_LOCKED 1U - -#define TEST_STALL (1 << 8) - -#define MIS_WDTMIS (1 << 0) -#define RIS_WDTRIS (1 << 0) -#define ICR_WDTICR (1 << 0) - -#define CTL_INTEN (1 << 0) -#define CTL_RESEN (1 << 1) -#define CTL_INTTYPE (1 << 2) -#define CTL_WRC (1 << 31) - /*===========================================================================*/ /* Driver pre-compile time settings. */ /*===========================================================================*/ |