From 06f693965c84dd762f8de960eef0434fea357a9c Mon Sep 17 00:00:00 2001 From: Nathan Hartman Date: Wed, 7 Aug 2019 07:35:37 -0600 Subject: [PATCH] Tiva: Fix errors in low-level timer support arch/arm/src/tiva/common/tiva_timerlib.c: * tiva_gptm_configure() and tiva_gptm_release(): Fix error: Was calling tiva_emac_periphrdy() instead of tiva_gptm_periphrdy(). arch/arm/src/tiva/tiva_timer.h: * Fix error in "abcde" description of bit flag defines. --- arch/arm/src/tiva/common/tiva_timerlib.c | 4 ++-- arch/arm/src/tiva/tiva_timer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/tiva/common/tiva_timerlib.c b/arch/arm/src/tiva/common/tiva_timerlib.c index b2cd6a67a25..b18e67c7919 100644 --- a/arch/arm/src/tiva/common/tiva_timerlib.c +++ b/arch/arm/src/tiva/common/tiva_timerlib.c @@ -1747,7 +1747,7 @@ TIMER_HANDLE tiva_gptm_configure(const struct tiva_gptmconfig_s *config) /* Wait for the reset to complete */ - while (!tiva_emac_periphrdy()); + while (!tiva_gptm_periphrdy()); up_udelay(250); /* Select the alternate timer clock source is so requested. The general @@ -1906,7 +1906,7 @@ void tiva_gptm_release(TIMER_HANDLE handle) /* Wait for the reset to complete */ - while (!tiva_emac_periphrdy()); + while (!tiva_gptm_periphrdy()); up_udelay(250); /* Disable power and clocking to the GPTM module */ diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h index 59b9c295198..c14ec97b0de 100644 --- a/arch/arm/src/tiva/tiva_timer.h +++ b/arch/arm/src/tiva/tiva_timer.h @@ -98,8 +98,8 @@ /* Flags bit definitions in configuration structures. NOTE: not all flags * apply in all timer modes. Applicable modes noted with: * - * a. 32-bit one shot timer - * b. 32-bit periodic timer + * a. 16-bit one shot timer + * b. 16-bit periodic timer * c. 32-bit one shot timer * d. 32-bit periodic timer * e. 32-bit RTC timer