diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/tiva/Kconfig | 46 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/chip.h | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_timerlib.c | 136 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_timerlow32.c | 12 | ||||
| -rw-r--r-- | nuttx/configs/tm4c123g-launchpad/nsh/defconfig | 93 | ||||
| -rw-r--r-- | nuttx/configs/tm4c123g-launchpad/src/Makefile | 4 | ||||
| -rw-r--r-- | nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h | 14 | ||||
| -rw-r--r-- | nuttx/configs/tm4c123g-launchpad/src/tm4c_bringup.c | 21 | ||||
| -rw-r--r-- | nuttx/configs/tm4c123g-launchpad/src/tm4c_timer.c | 90 |
9 files changed, 353 insertions, 64 deletions
diff --git a/nuttx/arch/arm/src/tiva/Kconfig b/nuttx/arch/arm/src/tiva/Kconfig index 2b61ae5dc..71a5f4e10 100644 --- a/nuttx/arch/arm/src/tiva/Kconfig +++ b/nuttx/arch/arm/src/tiva/Kconfig @@ -173,6 +173,9 @@ config ARCH_CHIP_TM4C bool select ARCH_CORTEXM4 select ARCH_HAVE_FPU + select TIVA_HAVE_ADC0 + select TIVA_HAVE_ADC1 + select TIVA_HAVE_GPIOP_IRQS select TIVA_HAVE_I2C1 select TIVA_HAVE_I2C2 select TIVA_HAVE_I2C3 @@ -185,6 +188,9 @@ config ARCH_CHIP_TM4C select TIVA_HAVE_SSI1 select TIVA_HAVE_SSI2 select TIVA_HAVE_SSI3 + select TIVA_HAVE_TIMER0 + select TIVA_HAVE_TIMER1 + select TIVA_HAVE_TIMER2 select TIVA_HAVE_TIMER3 select TIVA_HAVE_TIMER4 select TIVA_HAVE_TIMER5 @@ -203,6 +209,18 @@ config TIVA_BOARD_EARLYINIT menu "Tiva/Stellaris Peripheral Support" +config TIVA_ADC + bool + default n + +config TIVA_HAVE_ADC0 + bool + default n + +config TIVA_HAVE_ADC1 + bool + default n + config TIVA_I2C bool default n @@ -291,6 +309,18 @@ config TIVA_TIMER bool default n +config TIVA_HAVE_TIMER0 + bool + default n + +config TIVA_HAVE_TIMER1 + bool + default n + +config TIVA_HAVE_TIMER2 + bool + default n + config TIVA_HAVE_TIMER3 bool default n @@ -311,6 +341,17 @@ config TIVA_HAVE_TIMER7 bool default n +config TIVA_ADC0 + bool "ADC0" + default n + select TIVA_ADC + +config TIVA_ADC1 + bool "ADC1" + default n + depends on TIVA_HAVE_ADC0 + select TIVA_ADC + config TIVA_I2C0 bool "I2C0" default n @@ -441,16 +482,19 @@ config TIVA_SSI3 config TIVA_TIMER0 bool "16-/32-bit Timer 0" default n + depends on TIVA_HAVE_TIMER0 select TIVA_TIMER config TIVA_TIMER1 bool "16-/32-bit Timer 1" default n + depends on TIVA_HAVE_TIMER1 select TIVA_TIMER config TIVA_TIMER2 bool "16-/32-bit Timer 2" default n + depends on TIVA_HAVE_TIMER2 select TIVA_TIMER config TIVA_TIMER3 @@ -792,7 +836,6 @@ endif # TIVA_TIMER_16BIT config TIVA_TIMER_REGDEBUG bool "Register level debug" default n - depends on DEBUG ---help--- Enables extremely detailed register access debug output. @@ -1084,3 +1127,4 @@ config TIVA_FLASH_STARTPAGE endmenu endif + diff --git a/nuttx/arch/arm/src/tiva/chip.h b/nuttx/arch/arm/src/tiva/chip.h index 993ea9d66..3195ac77c 100644 --- a/nuttx/arch/arm/src/tiva/chip.h +++ b/nuttx/arch/arm/src/tiva/chip.h @@ -53,6 +53,7 @@ #include "chip/tiva_ssi.h" /* SSI modules */ #include "chip/tiva_ethernet.h" /* Ethernet MAC and PHY */ #include "chip/tiva_flash.h" /* FLASH */ +#include "chip/tiva_timer.h" /* Timer */ /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/tiva/tiva_timerlib.c b/nuttx/arch/arm/src/tiva/tiva_timerlib.c index 2a006fee6..6eb253ce7 100644 --- a/nuttx/arch/arm/src/tiva/tiva_timerlib.c +++ b/nuttx/arch/arm/src/tiva/tiva_timerlib.c @@ -122,31 +122,31 @@ static void tiva_putreg(struct tiva_gptmstate_s *priv, unsigned int offset, #ifdef CONFIG_TIVA_TIMER_32BIT static int tiva_timer32_interrupt(struct tiva_gptmstate_s *priv); -#ifdef CONFIG_TIVA_TIMER0 +# ifdef CONFIG_TIVA_TIMER0 static int tiva_gptm0_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER1 +# endif +# ifdef CONFIG_TIVA_TIMER1 static int tiva_gptm1_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER2 +# endif +# ifdef CONFIG_TIVA_TIMER2 static int tiva_gptm2_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER3 +# endif +# ifdef CONFIG_TIVA_TIMER3 static int tiva_gptm3_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER4 +# endif +# ifdef CONFIG_TIVA_TIMER4 static int tiva_gptm4_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER5 +# endif +# ifdef CONFIG_TIVA_TIMER5 static int tiva_gptm5_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER6 +# endif +# ifdef CONFIG_TIVA_TIMER6 static int tiva_gptm6_interrupt(int irq, FAR void *context); -#endif -#ifdef CONFIG_TIVA_TIMER7 +# endif +# ifdef CONFIG_TIVA_TIMER7 static int tiva_gptm7_interrupt(int irq, FAR void *context); #endif -#endif +#endif /* CONFIG_TIVA_TIMER_32BIT */ #ifdef CONFIG_TIVA_TIMER_16BIT static int tiva_timer16_interrupt(struct tiva_gptmstate_s *priv, @@ -183,14 +183,14 @@ static int tiva_timer6b_interrupt(int irq, FAR void *context); static int tiva_timer7a_interrupt(int irq, FAR void *context); static int tiva_timer7b_interrupt(int irq, FAR void *context); #endif -#endif +#endif /* CONFIG_TIVA_TIMER_16BIT */ /* Timer initialization and configuration */ #ifdef CONFIG_TIVA_TIMER32_PERIODIC static int tiva_oneshot_periodic_mode32(struct tiva_gptmstate_s *priv, const struct tiva_timer32config_s *timer); -#endif +#endif /* CONFIG_TIVA_TIMER32_PERIODIC */ #ifdef CONFIG_TIVA_TIMER16_PERIODIC static int tiva_oneshot_periodic_mode16(struct tiva_gptmstate_s *priv, const struct tiva_timer16config_s *timer, int tmndx); @@ -213,7 +213,7 @@ static int tiva_pwm_mode16(struct tiva_gptmstate_s *priv, #endif #ifdef CONFIG_TIVA_TIMER_32BIT -static int tiva_timer32_configure(struct tiva_gptmstate_s *priv, +static int tiva_timer32_configure(struct tiva_gptmstate_s *priv, const struct tiva_timer32config_s *timer); #endif #ifdef CONFIG_TIVA_TIMER_16BIT @@ -780,7 +780,7 @@ static int tiva_timer7b_interrupt(int irq, FAR void *context) * Name: tiva_oneshot_periodic_mode32 * * Description: - * Configure a 32-bit timer to operate in one-short or periodic mode + * Configure a 32-bit timer to operate in one-shot or periodic mode * ****************************************************************************/ @@ -863,7 +863,9 @@ static int tiva_oneshot_periodic_mode32(struct tiva_gptmstate_s *priv, /* Setup defaults */ regval &= (TIMER_TnMR_TnCDIR | TIMER_TnMR_TnWOT | TIMER_TnMR_TnCDIR); +#ifdef CONFIG_ARCH_CHIP_TM4C129 regval |= TIMER_TnMR_TnCINTD; +#endif /* Enable snapshot mode? * @@ -897,7 +899,6 @@ static int tiva_oneshot_periodic_mode32(struct tiva_gptmstate_s *priv, tiva_putreg(priv, TIVA_TIMER_TAMR_OFFSET, regval); /* Enable and configure ADC trigger outputs */ - if (TIMER_ISADCTIMEOUT(timer) || TIMER_ISADCMATCH(timer)) { /* Enable ADC trigger outputs by setting the TAOTE bit in the @@ -908,6 +909,7 @@ static int tiva_oneshot_periodic_mode32(struct tiva_gptmstate_s *priv, regval |= TIMER_CTL_TAOTE; tiva_putreg(priv, TIVA_TIMER_CTL_OFFSET, regval); +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Enable timeout triggers now (match triggers will be * enabled when the first match value is set). */ @@ -916,6 +918,7 @@ static int tiva_oneshot_periodic_mode32(struct tiva_gptmstate_s *priv, { tiva_putreg(priv, TIVA_TIMER_ADCEV_OFFSET, TIMER_ADCEV_TATOADCEN); } +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ } /* In addition, if using CCP pins, the TCACT field can be programmed to @@ -1068,7 +1071,9 @@ static int tiva_oneshot_periodic_mode16(struct tiva_gptmstate_s *priv, /* Setup defaults */ regval &= (TIMER_TnMR_TnCDIR | TIMER_TnMR_TnWOT | TIMER_TnMR_TnCDIR); +#ifdef CONFIG_ARCH_CHIP_TM4C129 regval |= TIMER_TnMR_TnCINTD; +#endif /* Enable snapshot mode? * @@ -1113,6 +1118,7 @@ static int tiva_oneshot_periodic_mode16(struct tiva_gptmstate_s *priv, regval |= tmndx ? TIMER_CTL_TBOTE : TIMER_CTL_TAOTE; tiva_putreg(priv, TIVA_TIMER_CTL_OFFSET, regval); +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Enable timeout triggers now (match triggers will be * enabled when the first match value is set). */ @@ -1122,6 +1128,7 @@ static int tiva_oneshot_periodic_mode16(struct tiva_gptmstate_s *priv, regval = tmndx ? TIMER_ADCEV_TBTOADCEN : TIMER_ADCEV_TATOADCEN; tiva_putreg(priv, TIVA_TIMER_ADCEV_OFFSET, regval); } +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ } /* TODO: Enable and configure uDMA trigger outputs */ @@ -1519,13 +1526,12 @@ static int tiva_pwm_mode16(struct tiva_gptmstate_s *priv, #endif /**************************************************************************** - * Name: tiva_timer16_configure + * Name: tiva_timer32_configure * * Description: * Configure the 32-bit timer to operate in the provided mode. * ****************************************************************************/ - #ifdef CONFIG_TIVA_TIMER_32BIT static int tiva_timer32_configure(struct tiva_gptmstate_s *priv, const struct tiva_timer32config_s *timer) @@ -1536,7 +1542,7 @@ static int tiva_timer32_configure(struct tiva_gptmstate_s *priv, case TIMER32_MODE_ONESHOT: /* 32-bit programmable one-shot timer */ case TIMER32_MODE_PERIODIC: /* 32-bit programmable periodic timer */ return tiva_oneshot_periodic_mode32(priv, timer); -#endif +#endif /* CONFIG_TIVA_TIMER32_PERIODIC */ #ifdef CONFIG_TIVA_TIMER32_RTC case TIMER32_MODE_RTC: /* 32-bit RTC with external 32.768-KHz @@ -1761,6 +1767,7 @@ TIMER_HANDLE tiva_gptm_configure(const struct tiva_gptmconfig_s *config) if (config->alternate) { +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Enable the alternate clock source */ regval = tiva_getreg(priv, TIVA_TIMER_CC_OFFSET); @@ -1770,6 +1777,10 @@ TIMER_HANDLE tiva_gptm_configure(const struct tiva_gptmconfig_s *config) /* Remember the frequency of the input clock */ priv->clkin = ALTCLK_FREQUENCY; +#else + timvdbg("tiva_gptm_configure: Error: alternate clock only available on TM4C129 devices\n"); + return (TIMER_HANDLE)NULL; +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ } else { @@ -2301,11 +2312,13 @@ void tiva_timer32_setinterval(TIMER_HANDLE handle, uint32_t interval) const struct tiva_timer32config_s *timer; irqstate_t flags; uintptr_t base; - uintptr_t moder; uintptr_t loadr; uintptr_t imrr; +#ifdef CONFIG_ARCH_CHIP_TM4C129 + uintptr_t moder; uint32_t modev1; uint32_t modev2; +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ bool toints; DEBUGASSERT(priv && priv->attr && priv->config && @@ -2329,7 +2342,6 @@ void tiva_timer32_setinterval(TIMER_HANDLE handle, uint32_t interval) } loadr = base + TIVA_TIMER_TAILR_OFFSET; - moder = base + TIVA_TIMER_TAMR_OFFSET; imrr = base + TIVA_TIMER_IMR_OFFSET; /* Make the following atomic */ @@ -2344,13 +2356,15 @@ void tiva_timer32_setinterval(TIMER_HANDLE handle, uint32_t interval) if (toints) { +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Clearing the TACINTD bit allows the time-out interrupt to be * generated as normal */ - + moder = base + TIVA_TIMER_TAMR_OFFSET; modev1 = getreg32(moder); modev2 = modev1 & ~TIMER_TnMR_TnCINTD; putreg32(modev2, moder); +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ /* Set the new interrupt mask */ @@ -2366,8 +2380,10 @@ void tiva_timer32_setinterval(TIMER_HANDLE handle, uint32_t interval) lldbg("%08x<-%08x\n", loadr, interval); if (toints) { +# ifdef CONFIG_ARCH_CHIP_TM4C129 lldbg("%08x->%08x\n", moder, modev1); lldbg("%08x<-%08x\n", moder, modev2); +# endif /* CONFIG_ARCH_CHIP_TM4C129 */ lldbg("%08x<-%08x\n", imrr, priv->imr); } #endif @@ -2421,12 +2437,14 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) const struct tiva_timer16config_s *timer; irqstate_t flags; uintptr_t base; - uintptr_t moder; uintptr_t loadr; uintptr_t imrr; - uint32_t intbit; +#ifdef CONFIG_ARCH_CHIP_TM4C129 + uintptr_t moder; uint32_t modev1; uint32_t modev2; +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ + uint32_t intbit; bool toints; DEBUGASSERT(priv && priv->attr && priv->config && @@ -2441,13 +2459,11 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) { intbit = TIMER_INT_TBTO; loadr = base + TIVA_TIMER_TBILR_OFFSET; - moder = base + TIVA_TIMER_TBMR_OFFSET; } else { intbit = TIMER_INT_TATO; loadr = base + TIVA_TIMER_TAILR_OFFSET; - moder = base + TIVA_TIMER_TAMR_OFFSET; } imrr = base + TIVA_TIMER_IMR_OFFSET; @@ -2478,6 +2494,16 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) if (toints) { +#ifdef CONFIG_ARCH_CHIP_TM4C129 + if (tmndx) + { + moder = base + TIVA_TIMER_TBMR_OFFSET; + } + else + { + moder = base + TIVA_TIMER_TAMR_OFFSET; + } + /* Clearing the TACINTD bit allows the time-out interrupt to be * generated as normal */ @@ -2485,6 +2511,7 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) modev1 = getreg32(moder); modev2 = modev1 & ~TIMER_TnMR_TnCINTD; putreg32(modev2, moder); +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ /* Set the new interrupt mask */ @@ -2500,8 +2527,10 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx) lldbg("%08x<-%08x\n", loadr, interval); if (toints) { +#ifdef CONFIG_ARCH_CHIP_TM4C129 lldbg("%08x->%08x\n", moder, modev1); lldbg("%08x<-%08x\n", moder, modev2); +#endif lldbg("%08x<-%08x\n", imrr, priv->imr); } #endif @@ -2613,7 +2642,7 @@ uint32_t tiva_timer32_remaining(TIMER_HANDLE handle) irqrestore(flags); return remaining; } -#endif +#endif /* CONFIG_TIVA_TIMER32_PERIODIC */ /**************************************************************************** * Name: tiva_rtc_setalarm @@ -2644,8 +2673,10 @@ void tiva_rtc_setalarm(TIMER_HANDLE handle, uint32_t delay) uintptr_t base; uint32_t counter; uint32_t match; +#ifdef CONFIG_ARCH_CHIP_TM4C129 uint32_t adcev; uint32_t adcbits; +#endif DEBUGASSERT(priv && priv->attr && priv->config && priv->config->mode == TIMER32_MODE_RTC); @@ -2667,7 +2698,6 @@ void tiva_rtc_setalarm(TIMER_HANDLE handle, uint32_t delay) */ base = priv->attr->base; - adcbits = TIMER_ISADCRTCM(config) ? TIMER_ADCEV_RTCADCEN : 0; flags = irqsave(); @@ -2679,12 +2709,15 @@ void tiva_rtc_setalarm(TIMER_HANDLE handle, uint32_t delay) match = counter + delay; putreg32(match, base + TIVA_TIMER_TAMATCHR_OFFSET); +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Enable ADC trigger (if selected). NOTE the TAOTE bit was already * selected in the GPTMCTL register when the timer was configured. */ adcev = getreg32(base + TIVA_TIMER_ADCEV_OFFSET); + adcbits = TIMER_ISADCRTCM(config) ? TIMER_ADCEV_RTCADCEN : 0; putreg32(adcev | adcbits, base + TIVA_TIMER_ADCEV_OFFSET); +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ /* TODO: Set uDMA trigger in the same manner */ @@ -2698,8 +2731,10 @@ void tiva_rtc_setalarm(TIMER_HANDLE handle, uint32_t delay) lldbg("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter); lldbg("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match); +#ifdef CONFIG_ARCH_CHIP_TM4C129 lldbg("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev); lldbg("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits); +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ lldbg("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr); #endif } @@ -2743,8 +2778,10 @@ void tiva_timer32_relmatch(TIMER_HANDLE handle, uint32_t relmatch) irqstate_t flags; uint32_t counter; uint32_t match; +#ifdef CONFIG_ARCH_CHIP_TM4C129 uint32_t adcev; uint32_t adcbits; +#endif DEBUGASSERT(priv && priv->attr && priv->config && priv->config->mode != TIMER16_MODE); @@ -2766,8 +2803,6 @@ void tiva_timer32_relmatch(TIMER_HANDLE handle, uint32_t relmatch) */ base = priv->attr->base; - adcbits = TIMER_ISADCMATCH(config) ? TIMER_ADCEV_CAMADCEN : 0; - flags = irqsave(); /* Set the match register to the current value of the timer counter plus @@ -2780,12 +2815,15 @@ void tiva_timer32_relmatch(TIMER_HANDLE handle, uint32_t relmatch) match = counter + relmatch; putreg32(match, base + TIVA_TIMER_TAMATCHR_OFFSET); +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Enable ADC trigger (if selected). NOTE the TAOTE bit was already * selected in the GPTMCTL register when the timer was configured. */ - adcev = getreg32(base + TIVA_TIMER_ADCEV_OFFSET); + adcev = getreg32(base + TIVA_TIMER_ADCEV_OFFSET); + adcbits = TIMER_ISADCMATCH(config) ? TIMER_ADCEV_CAMADCEN : 0; putreg32(adcev | adcbits, base + TIVA_TIMER_ADCEV_OFFSET); +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ /* Enable interrupts as necessary */ @@ -2797,12 +2835,15 @@ void tiva_timer32_relmatch(TIMER_HANDLE handle, uint32_t relmatch) lldbg("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter); lldbg("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match); +#ifdef CONFIG_ARCH_CHIP_TM4C129 lldbg("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev); lldbg("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits); +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ lldbg("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr); -#endif +#endif /* CONFIG_TIVA_TIMER_REGDEBUG */ + } -#endif +#endif /* CONFIG_TIVA_TIMER32_PERIODIC */ /**************************************************************************** * Name: tiva_timer16_relmatch @@ -2856,15 +2897,17 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx) uintptr_t prescr; uintptr_t matchr; uintptr_t prematchr; - uintptr_t adcevr; uintptr_t imr; +#ifdef CONFIG_ARCH_CHIP_TM4C129 + uintptr_t adcevr; + uint32_t adcevv; + uint32_t adcbits; +#endif uint32_t timerv; uint32_t prescv; uint32_t matchv; uint32_t prematchv; - uint32_t adcevv; uint32_t counter; - uint32_t adcbits; bool countup; DEBUGASSERT(priv && priv->attr && priv->config && @@ -2894,9 +2937,11 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx) matchr = base + TIVA_TIMER_TBMATCHR_OFFSET; prematchr = base + TIVA_TIMER_TBPMR_OFFSET; +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Do we need to enable ADC trigger on the match? */ adcbits = TIMER_ISADCMATCH(config) ? TIMER_ADCEV_CBMADCEN : 0; +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ } else { @@ -2917,12 +2962,17 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx) matchr = base + TIVA_TIMER_TAMATCHR_OFFSET; prematchr = base + TIVA_TIMER_TAPMR_OFFSET; +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Do we need to enable ADC trigger on the match? */ adcbits = TIMER_ISADCMATCH(config) ? TIMER_ADCEV_CAMADCEN : 0; +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ } +#ifdef CONFIG_ARCH_CHIP_TM4C129 adcevr = base + TIVA_TIMER_ADCEV_OFFSET; +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ + imr = base + TIVA_TIMER_IMR_OFFSET; countup = TIMER_ISCOUNTUP(config); @@ -2968,12 +3018,14 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx) putreg32(matchv, matchr); putreg32(prematchv, prematchr); +#ifdef CONFIG_ARCH_CHIP_TM4C129 /* Enable ADC trigger (if selected). NOTE the TnOTE bit was already * selected in the GPTMCTL register when the timer was configured. */ adcevv = getreg32(adcevr); putreg32(adcevv | adcbits, adcevr); +#endif /* Enable interrupts as necessary */ @@ -2987,8 +3039,10 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx) lldbg("%08x->%08x\n", prescr, prescv); lldbg("%08x<-%08x\n", matchr, matchv); lldbg("%08x<-%08x\n", prematchr, prematchv); +#ifdef CONFIG_ARCH_CHIP_TM4C129 lldbg("%08x->%08x\n", adcevr, adcevv); lldbg("%08x<-%08x\n", adcevr, adcevv | adcbits); +#endif lldbg("%08x<-%08x\n", imr, priv->imr); #endif } diff --git a/nuttx/arch/arm/src/tiva/tiva_timerlow32.c b/nuttx/arch/arm/src/tiva/tiva_timerlow32.c index 53252e3bf..90492678d 100644 --- a/nuttx/arch/arm/src/tiva/tiva_timerlow32.c +++ b/nuttx/arch/arm/src/tiva/tiva_timerlow32.c @@ -572,7 +572,19 @@ int tiva_timer_register(FAR const char *devpath, int gptm, bool altclk) /* Initialize the non-zero elements of lower half state structure */ priv->ops = &g_timer_ops; +#ifdef CONFIG_ARCH_CHIP_TM4C129 priv->clkin = altclk ? ALTCLK_FREQUENCY : SYSCLK_FREQUENCY; +#else + if (altclk) + { + timdbg("ERROR: Alternate clock unsupported on TM4C123 architecture\n"); + return -ENOMEM; + } + else + { + priv->clkin = SYSCLK_FREQUENCY; + } +#endif /* CONFIG_ARCH_CHIP_TM4C129 */ config = &priv->config; config->cmn.gptm = gptm; diff --git a/nuttx/configs/tm4c123g-launchpad/nsh/defconfig b/nuttx/configs/tm4c123g-launchpad/nsh/defconfig index 66e601c2f..851b8b897 100644 --- a/nuttx/configs/tm4c123g-launchpad/nsh/defconfig +++ b/nuttx/configs/tm4c123g-launchpad/nsh/defconfig @@ -42,8 +42,9 @@ CONFIG_RAW_BINARY=y # Debug Options # # CONFIG_DEBUG is not set -CONFIG_ARCH_HAVE_STACKCHECK=y # CONFIG_ARCH_HAVE_HEAPCHECK is not set +CONFIG_ARCH_HAVE_STACKCHECK=y +# CONFIG_STACK_COLORATION is not set # CONFIG_DEBUG_SYMBOLS is not set CONFIG_ARCH_HAVE_CUSTOMOPT=y # CONFIG_DEBUG_NOOPT is not set @@ -121,21 +122,51 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y # # CONFIG_ARCH_CHIP_TM4C123GH6ZRB is not set CONFIG_ARCH_CHIP_TM4C123GH6PMI=y +# CONFIG_ARCH_CHIP_TM4C1294NC is not set +# CONFIG_ARCH_CHIP_TM4C129XNC is not set # CONFIG_ARCH_CHIP_CC3200 is not set -CONFIG_ARCH_CHIP_TM4C=y CONFIG_ARCH_CHIP_TM4C123=y +CONFIG_ARCH_CHIP_TM4C=y # CONFIG_TIVA_BOARD_EARLYINIT is not set # # Tiva/Stellaris Peripheral Support # +# CONFIG_TIVA_ADC is not set +CONFIG_TIVA_HAVE_ADC0=y +CONFIG_TIVA_HAVE_ADC1=y +# CONFIG_TIVA_I2C is not set +CONFIG_TIVA_HAVE_I2C1=y CONFIG_TIVA_HAVE_I2C2=y CONFIG_TIVA_HAVE_I2C3=y +# CONFIG_TIVA_HAVE_I2C4 is not set +# CONFIG_TIVA_HAVE_I2C5 is not set +# CONFIG_TIVA_HAVE_I2C6 is not set +# CONFIG_TIVA_HAVE_I2C7 is not set +# CONFIG_TIVA_HAVE_I2C8 is not set +# CONFIG_TIVA_HAVE_I2C9 is not set CONFIG_TIVA_HAVE_UART3=y CONFIG_TIVA_HAVE_UART4=y CONFIG_TIVA_HAVE_UART5=y CONFIG_TIVA_HAVE_UART6=y CONFIG_TIVA_HAVE_UART7=y +CONFIG_TIVA_HAVE_SSI0=y +CONFIG_TIVA_HAVE_SSI1=y +CONFIG_TIVA_HAVE_SSI2=y +CONFIG_TIVA_HAVE_SSI3=y +# CONFIG_TIVA_HAVE_ETHERNET is not set +CONFIG_TIVA_SSI=y +# CONFIG_TIVA_TIMER is not set +CONFIG_TIVA_HAVE_TIMER0=y +CONFIG_TIVA_HAVE_TIMER1=y +CONFIG_TIVA_HAVE_TIMER2=y +CONFIG_TIVA_HAVE_TIMER3=y +CONFIG_TIVA_HAVE_TIMER4=y +CONFIG_TIVA_HAVE_TIMER5=y +# CONFIG_TIVA_HAVE_TIMER6 is not set +# CONFIG_TIVA_HAVE_TIMER7 is not set +# CONFIG_TIVA_ADC0 is not set +# CONFIG_TIVA_ADC1 is not set # CONFIG_TIVA_I2C0 is not set # CONFIG_TIVA_I2C1 is not set # CONFIG_TIVA_I2C2 is not set @@ -150,27 +181,46 @@ CONFIG_TIVA_UART0=y # CONFIG_TIVA_UART7 is not set CONFIG_TIVA_SSI0=y # CONFIG_TIVA_SSI1 is not set +# CONFIG_TIVA_SSI2 is not set +# CONFIG_TIVA_SSI3 is not set +# CONFIG_TIVA_TIMER0 is not set +# CONFIG_TIVA_TIMER1 is not set +# CONFIG_TIVA_TIMER2 is not set +# CONFIG_TIVA_TIMER3 is not set +# CONFIG_TIVA_TIMER4 is not set +# CONFIG_TIVA_TIMER5 is not set # CONFIG_TIVA_ETHERNET is not set # CONFIG_TIVA_FLASH is not set # -# Disable GPIO Interrupts -# +# Enable GPIO Interrupts +# +CONFIG_TIVA_GPIO_IRQS=y +CONFIG_TIVA_HAVE_GPIOA_IRQS=y +CONFIG_TIVA_HAVE_GPIOB_IRQS=y +CONFIG_TIVA_HAVE_GPIOC_IRQS=y +CONFIG_TIVA_HAVE_GPIOD_IRQS=y +CONFIG_TIVA_HAVE_GPIOE_IRQS=y +CONFIG_TIVA_HAVE_GPIOF_IRQS=y +# CONFIG_TIVA_HAVE_GPIOG_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOH_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOJ_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOK_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOL_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOM_IRQS is not set +# CONFIG_TIVA_HAVE_GPION_IRQS is not set +CONFIG_TIVA_HAVE_GPIOP_IRQS=y +# CONFIG_TIVA_HAVE_GPIOQ_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOR_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOS_IRQS is not set +# CONFIG_TIVA_HAVE_GPIOT_IRQS is not set CONFIG_TIVA_GPIOA_IRQS=y CONFIG_TIVA_GPIOB_IRQS=y CONFIG_TIVA_GPIOC_IRQS=y CONFIG_TIVA_GPIOD_IRQS=y CONFIG_TIVA_GPIOE_IRQS=y CONFIG_TIVA_GPIOF_IRQS=y -CONFIG_TIVA_GPIOG_IRQS=y -# CONFIG_TIVA_GPIOH_IRQS is not set -# CONFIG_TIVA_GPIOJ_IRQS is not set -CONFIG_TIVA_GPIOK_IRQS=y -CONFIG_TIVA_GPIOL_IRQS=y -CONFIG_TIVA_GPIOM_IRQS=y -CONFIG_TIVA_GPION_IRQS=y CONFIG_TIVA_GPIOP_IRQS=y -CONFIG_TIVA_GPIOQ_IRQS=y # # Tiva/Stellaris SSI Configuration @@ -423,6 +473,8 @@ CONFIG_ARCH_HAVE_UART0=y # CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y +# CONFIG_SERIAL_IFLOWCONTROL is not set +# CONFIG_SERIAL_OFLOWCONTROL is not set # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set CONFIG_UART0_SERIAL_CONSOLE=y # CONFIG_OTHER_SERIAL_CONSOLE is not set @@ -439,8 +491,6 @@ CONFIG_UART0_PARITY=0 CONFIG_UART0_2STOP=0 # CONFIG_UART0_IFLOWCONTROL is not set # CONFIG_UART0_OFLOWCONTROL is not set -# CONFIG_SERIAL_IFLOWCONTROL is not set -# CONFIG_SERIAL_OFLOWCONTROL is not set # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set @@ -624,7 +674,6 @@ CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set # CONFIG_EXAMPLES_TOUCHSCREEN is not set -# CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_WEBSERVER is not set # CONFIG_EXAMPLES_USBSERIAL is not set # CONFIG_EXAMPLES_USBTERM is not set @@ -634,12 +683,14 @@ CONFIG_EXAMPLES_NSH=y # Graphics Support # # CONFIG_TIFF is not set +# CONFIG_GRAPHICS_TRAVELER is not set # # Interpreters # # CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_PCODE is not set +# CONFIG_INTERPRETERS_MICROPYTHON is not set # # Network Utilities @@ -649,7 +700,6 @@ CONFIG_EXAMPLES_NSH=y # Networking Utilities # # CONFIG_NETUTILS_CODECS is not set -# CONFIG_NETUTILS_DHCPD is not set # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set @@ -747,7 +797,7 @@ CONFIG_NSH_FILEIOSIZE=512 # CONFIG_NSH_CONSOLE=y # CONFIG_NSH_ALTCONDEV is not set -# CONFIG_NSH_ARCHINIT is not set +CONFIG_NSH_ARCHINIT=y # # NxWidgets/NxWM @@ -773,6 +823,11 @@ CONFIG_NSH_CONSOLE=y # CONFIG_SYSTEM_CLE is not set # +# CU Minimal Terminal +# +# CONFIG_SYSTEM_CUTERM is not set + +# # FLASH Program Installation # # CONFIG_SYSTEM_INSTALL is not set @@ -844,6 +899,10 @@ CONFIG_READLINE_ECHO=y # CONFIG_SYSTEM_SYSINFO is not set # +# Temperature +# + +# # VI Work-Alike Editor # # CONFIG_SYSTEM_VI is not set diff --git a/nuttx/configs/tm4c123g-launchpad/src/Makefile b/nuttx/configs/tm4c123g-launchpad/src/Makefile index 27b0cdc32..0cb7605a0 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/Makefile +++ b/nuttx/configs/tm4c123g-launchpad/src/Makefile @@ -49,6 +49,10 @@ ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += tm4c_nsh.c endif +ifeq ($(CONFIG_TIVA_TIMER),y) +CSRCS += tm4c_timer.c +endif + ifeq ($(CONFIG_MTD_AT24XX),y) ifeq ($(CONFIG_TIVA_I2C0),y) CSRCS += tm4c_at24.c diff --git a/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h index 668ef2ef4..f4f8a5122 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h +++ b/nuttx/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h @@ -223,6 +223,20 @@ int tm4c_bringup(void); #ifdef HAVE_AT24 int tm4c_at24_automount(int minor); #endif + +/**************************************************************************** + * Name: tiva_timer_initialize + * + * Description: + * Configure the timer driver + * + ****************************************************************************/ + +#ifdef CONFIG_TIVA_TIMER +int tiva_timer_initialize(void); +#endif + + #endif /* __ASSEMBLY__ */ #endif /* __CONFIGS_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H */ diff --git a/nuttx/configs/tm4c123g-launchpad/src/tm4c_bringup.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_bringup.c index 504c2450e..0ca78e3ce 100644 --- a/nuttx/configs/tm4c123g-launchpad/src/tm4c_bringup.c +++ b/nuttx/configs/tm4c123g-launchpad/src/tm4c_bringup.c @@ -47,7 +47,6 @@ * Pre-Processor Definitions ****************************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -62,19 +61,31 @@ int tm4c_bringup(void) { -#ifdef HAVE_AT24 +#if defined (HAVE_AT24) || defined (CONFIG_TIVA_TIMER) int ret; +#endif /* defined (HAVE_AT24) || defined (CONFIG_TIVA_TIMER) */ +#ifdef HAVE_AT24 /* Initialize the AT24 driver */ ret = tm4c_at24_automount(AT24_MINOR); if (ret < 0) { syslog(LOG_ERR, "ERROR: tm4c_at24_automount failed: %d\n", ret); + return ret; + } +#endif /* HAVE_AT24 */ + +#ifdef CONFIG_TIVA_TIMER + /* Initialize the timer driver */ + + ret = tiva_timer_initialize(); + if (ret < 0) + { + syslog(LOG_ERR, "ERROR: Failed to initialize timer driver: %d\n", ret); + return ret; } +#endif /* CONFIG_TIVA_TIMER */ - return ret; -#else return OK; -#endif /* HAVE_AT24 */ } diff --git a/nuttx/configs/tm4c123g-launchpad/src/tm4c_timer.c b/nuttx/configs/tm4c123g-launchpad/src/tm4c_timer.c new file mode 100644 index 000000000..17dd5842e --- /dev/null +++ b/nuttx/configs/tm4c123g-launchpad/src/tm4c_timer.c @@ -0,0 +1,90 @@ +/**************************************************************************** + * config/tm4c123g-launchpad/src/tm4c_timer.c + * + * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * With modifications from Calvin Maguranis + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <debug.h> + +#include "tiva_timer.h" +#include "tm4c123g-launchpad.h" + +#ifdef CONFIG_TIVA_TIMER + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ +/* Configuration ************************************************************/ + +#ifndef CONFIG_TIVA_TIMER32_PERIODIC +# error CONFIG_TIVA_TIMER32_PERIODIC is not defined +#endif + +#define GPTM 0 +#define CONFIG_TM4C_TIMER_DEVNAME "/dev/timer0" +#define ALTCLK false + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: tiva_timer_initialize + * + * Description: + * Configure the timer driver + * + ****************************************************************************/ + +int tiva_timer_initialize(void) +{ + int ret; + + timvdbg("Registering TIMER%d at %s\n", GPTM, CONFIG_TM4C_TIMER_DEVNAME); + + ret = tiva_timer_register(CONFIG_TM4C_TIMER_DEVNAME, GPTM, ALTCLK); + if (ret < 0) + { + timdbg("ERROR: Failed to register timer driver: %d\n", ret); + } + + return ret; +} +#endif /* CONFIG_TIVA_TIMER */ |