Updated wdg_lld to use TivaWare.

4 files changed, 21 insertions, 19 deletions

diff --git a/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h
index a8f02e2..7c77368 100644
--- a/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h
@@ -110,6 +110,7 @@ typedef int IRQn_Type;
 #include "inc/hw_uart.h"
 #include "inc/hw_timer.h"
 #include "inc/hw_i2c.h"
+#include "inc/hw_watchdog.h"
 
 #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8)
 #error "TivaWare NUM_INTERRUPTS mismatch"
diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h
index 82d2e02..34528af 100644
--- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h
@@ -95,6 +95,7 @@ typedef int IRQn_Type;
 #include "inc/hw_timer.h"
 #include "inc/hw_emac.h"
 #include "inc/hw_i2c.h"
+#include "inc/hw_watchdog.h"
 
 #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8)
 #error "TivaWare NUM_INTERRUPTS mismatch"
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 38dcef0..1fc86f2 100644
--- a/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c
+++ b/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.c
@@ -60,14 +60,14 @@ static void serve_interrupt(WDGDriver *wdgp)
 {
   uint32_t mis;
 
-  mis = wdgp->wdt->MIS;
+  mis = HWREG(wdgp->wdt + WDT_O_MIS);
 
   if (mis & MIS_WDTMIS) {
     /* Invoke callback, if any */
     if (wdgp->config->callback) {
       if (wdgp->config->callback(wdgp)) {
         /* Clear interrupt */
-        wdgp->wdt->ICR = 0;
+        HWREG(wdgp->wdt + WDT_O_ICR) = 0;
         wdgTivaSyncWrite(wdgp);
       }
     }
@@ -113,12 +113,12 @@ void wdg_lld_init(void)
 {
 #if TIVA_WDG_USE_WDT0
   WDGD1.state = WDG_STOP;
-  WDGD1.wdt = WDT0;
+  WDGD1.wdt = WATCHDOG0_BASE;
 #endif /* TIVA_WDG_USE_WDT0 */
 
 #if TIVA_WDG_USE_WDT1
   WDGD2.state = WDG_STOP;
-  WDGD2.wdt = WDT1;
+  WDGD2.wdt = WATCHDOG1_BASE;
 #endif /* TIVA_WDG_USE_WDT1 */
 
   /* The shared vector is initialized on driver initialization and never
@@ -137,32 +137,32 @@ void wdg_lld_start(WDGDriver *wdgp)
 {
 #if TIVA_WDG_USE_WDT0
   if (&WDGD1 == wdgp) {
-    SYSCTL->RCGCWD |= (1 << 0);
+    HWREG(SYSCTL_RCGCWD) |= (1 << 0);
 
-    while (!(SYSCTL->PRWD & (1 << 0)))
+    while (!(HWREG(SYSCTL_PRWD) & (1 << 0)))
       ;
   }
 #endif /* TIVA_WDG_USE_WDT0 */
 
 #if TIVA_WDG_USE_WDT1
   if (&WDGD2 == wdgp) {
-    SYSCTL->RCGCWD |= (1 << 1);
+    HWREG(SYSCTL_RCGCWD) |= (1 << 1);
 
-    while (!(SYSCTL->PRWD & (1 << 1)))
+    while (!(HWREG(SYSCTL_PRWD) & (1 << 1)))
       ;
   }
 #endif /* TIVA_WDG_USE_WDT1 */
 
-  wdgp->wdt->LOAD = wdgp->config->load;
+  HWREG(wdgp->wdt + WDT_O_LOAD) = wdgp->config->load;
   wdgTivaSyncWrite(wdgp);
 
-  wdgp->wdt->TEST = wdgp->config->test;
+  HWREG(wdgp->wdt + WDT_O_TEST) = wdgp->config->test;
   wdgTivaSyncWrite(wdgp);
 
-  wdgp->wdt->CTL |= CTL_RESEN;
+  HWREG(wdgp->wdt + WDT_O_CTL) |= CTL_RESEN;
   wdgTivaSyncWrite(wdgp);
 
-  wdgp->wdt->CTL |= CTL_INTEN;
+  HWREG(wdgp->wdt + WDT_O_CTL) |= CTL_INTEN;
   wdgTivaSyncWrite(wdgp);
 }
 
@@ -177,15 +177,15 @@ void wdg_lld_stop(WDGDriver *wdgp)
 {
 #if TIVA_WDG_USE_WDT0
   if (&WDGD1 == wdgp) {
-    SYSCTL->SRWD |= (1 << 0);
-    SYSCTL->SRWD &= ~(1 << 0);
+    HWREG(SYSCTL_SRWD) |= (1 << 0);
+    HWREG(SYSCTL_SRWD) &= ~(1 << 0);
   }
 #endif /* TIVA_WDG_USE_WDT0 */
 
 #if TIVA_WDG_USE_WDT1
   if (&WDGD2 == wdgp) {
-    SYSCTL->SRWD |= (1 << 1);
-    SYSCTL->SRWD &= ~(1 << 1);
+    HWREG(SYSCTL_SRWD) |= (1 << 1);
+    HWREG(SYSCTL_SRWD) &= ~(1 << 1);
   }
 #endif /* TIVA_WDG_USE_WDT1 */
 }
@@ -219,7 +219,7 @@ void wdg_lld_reset(WDGDriver *wdgp)
 
 #endif /* defined(TM4C123_USE_REVISION_6_FIX) ||
           defined(TM4C123_USE_REVISION_7_FIX) */
-  wdgp->wdt->LOAD = wdgp->config->load;
+  HWREG(wdgp->wdt + WDT_O_LOAD) = wdgp->config->load;
   wdgTivaSyncWrite(wdgp);
 }
 
@@ -234,7 +234,7 @@ void wdg_lld_reset(WDGDriver *wdgp)
 void wdgTivaSyncWrite(WDGDriver *wdgp)
 {
   if (&WDGD2 == wdgp) {
-    while (!(wdgp->wdt->CTL & CTL_WRC)) {
+    while (!(HWREG(wdgp->wdt + WDT_O_CTL) & CTL_WRC)) {
       ;
     }
   }
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 f88fa26..38bee25 100644
--- a/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h
+++ b/os/hal/ports/TIVA/LLD/WDT/hal_wdg_lld.h
@@ -146,7 +146,7 @@ struct WDGDriver
   /**
    * @brief   Pointer to the WDT registers block.
    */
-  WDT_TypeDef               *wdt;
+  uint32_t                  wdt;
 };
 
 /*===========================================================================*/