Tiva Tickless timer in down mode turned out not to work in last commit. It's working for WGPT5 now.

Started some cleanup in st_lld driver.

2 files changed, 11 insertions, 33 deletions

diff --git a/os/hal/ports/TIVA/LLD/st_lld.c b/os/hal/ports/TIVA/LLD/st_lld.c
index 1a9fbe6..538cf2e 100644
--- a/os/hal/ports/TIVA/LLD/st_lld.c
+++ b/os/hal/ports/TIVA/LLD/st_lld.c
@@ -74,7 +74,6 @@
 #define ST_HANDLER                          TIVA_WGPT5A_HANDLER
 #define ST_NUMBER                           TIVA_WGPT5A_NUMBER
 #define ST_CLOCK_SRC                        (80000000)
-//#define ST_CLOCK_SRC                        (16000000)
 #define ST_ENABLE_CLOCK()                   (SYSCTL->RCGCWTIMER |= (1 << 5))
 
 #else
@@ -145,10 +144,6 @@
 
 #endif
 
-//#if (ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1 > 0xFFFF
-//#error "the selected ST frequency is not obtainable because TIM timer prescaler limits"
-//#endif
-
 /*===========================================================================*/
 /* Driver exported variables.                                                */
 /*===========================================================================*/
@@ -190,7 +185,7 @@ OSAL_IRQ_HANDLER(SysTick_Handler)
 
 #if (OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING) || defined(__DOXYGEN__)
 /**
- * @brief   TIM2 interrupt handler.
+ * @brief   GPT interrupt handler.
  * @details This interrupt is used for system tick in free running mode.
  *
  * @isr
@@ -198,25 +193,12 @@ OSAL_IRQ_HANDLER(SysTick_Handler)
 OSAL_IRQ_HANDLER(ST_HANDLER)
 {
   uint32_t mis;
-  uint32_t temp;
 
   OSAL_IRQ_PROLOGUE();
 
   mis = TIVA_ST_TIM->MIS;
   TIVA_ST_TIM->ICR = mis;
 
-  if (mis & GPTM_IMR_TATOIM) {
-    temp = 3;
-  }
-
-  if (mis & GPTM_IMR_CAMIM) {
-    temp = 1;
-  }
-
-  if (mis & GPTM_IMR_CAEIM) {
-    temp = 2;
-  }
-
   if (mis & GPTM_IMR_TAMIM) {
     osalSysLockFromISR();
     osalOsTimerHandlerI();
@@ -244,19 +226,15 @@ void st_lld_init(void)
   /* Enabling timer clock.*/
   ST_ENABLE_CLOCK();
 
-  /* Initializing the counter in free running mode.*/
+  /* Initializing the counter in free running down mode.*/
   TIVA_ST_TIM->CTL  = 0;
-  TIVA_ST_TIM->CFG  = GPTM_CFG_CFG_SPLIT;           /* Timer split mode */
-  TIVA_ST_TIM->TAMR = (GPTM_TAMR_TAMR_PERIODIC |    /* Periodic mode */
-                        /*GPTM_TAMR_TACDIR |*/          /* Count up */
-                        GPTM_TAMR_TAMIE |           /* Match interrupt enable */
-                        GPTM_TAMR_TASNAPS);         /* Snapshot mode */
+  TIVA_ST_TIM->CFG  = GPTM_CFG_CFG_SPLIT;       /* Timer split mode */
+  TIVA_ST_TIM->TAMR = (GPTM_TAMR_TAMR_PERIODIC |/* Periodic mode */
+                       GPTM_TAMR_TAMIE |        /* Match interrupt enable */
+                       /*GPTM_TAMR_TASNAPS*/0);      /* Snapshot mode */
   TIVA_ST_TIM->TAPR = (ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1;
-  /* in up mode (used by tickless mode) the prescaler register extends the TAV
-   * and TAR registers. How to solve this? In down mode it is working better
-   * because the prescaler really works as prescaler. */
-  TIVA_ST_TIM->CTL  = (GPTM_CTL_TAEN |              /* Timer A enable */
-                        GPTM_CTL_TASTALL);          /* Timer A stall when paused */
+  TIVA_ST_TIM->CTL  = (GPTM_CTL_TAEN |          /* Timer A enable */
+                       GPTM_CTL_TASTALL);       /* Timer A stall when paused */
 
   /* IRQ enabled.*/
   nvicEnableVector(ST_NUMBER, TIVA_ST_IRQ_PRIORITY);
diff --git a/os/hal/ports/TIVA/LLD/st_lld.h b/os/hal/ports/TIVA/LLD/st_lld.h
index aadc966..c2e1a80 100644
--- a/os/hal/ports/TIVA/LLD/st_lld.h
+++ b/os/hal/ports/TIVA/LLD/st_lld.h
@@ -206,7 +206,7 @@ extern "C" {
 static inline systime_t st_lld_get_counter(void)
 {
 #if OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING
-  return (systime_t) 0xffffffff - TTIVA_ST_TIM->TAV;
+  return (systime_t) 0xffffffff - TIVA_ST_TIM->TAV;
   //return (systime_t) TIVA_ST_TIM->TAV/((ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1);
   //return (systime_t) ((TIVA_ST_TIM->TAV >> 16) | (TIVA_ST_TIM->TAPV << 16))/((ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1);
 #else
@@ -250,7 +250,7 @@ static inline void st_lld_start_alarm(systime_t time)
   //uint64_t settime = time * ((ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1);
 
   //TIVA_ST_TIM->TAPMR = (uint16_t) ((settime >> 32) & 0xffff);
-  TIVA_ST_TIM->TAMATCHR = (uint32_t) 0xffffffff - settime;
+  TIVA_ST_TIM->TAMATCHR = (uint32_t) 0xffffffff - time;
 
   TIVA_ST_TIM->ICR = TIVA_ST_TIM->MIS;
   TIVA_ST_TIM->IMR = GPTM_IMR_TAMIM;
@@ -299,7 +299,7 @@ static inline void st_lld_set_alarm(systime_t time)
   //uint64_t settime = time * ((ST_CLOCK_SRC / OSAL_ST_FREQUENCY) - 1);
 
   //TIVA_ST_TIM->TAPMR = (uint16_t) ((settime >> 32) & 0xffff);
-  TIVA_ST_TIM->TAMATCHR = (uint32_t) (0xffffffff - settime);
+  TIVA_ST_TIM->TAMATCHR = (uint32_t) (0xffffffff - time);
 #else
   (void)time;
 #endif