This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ab8262eb62ee2cdf0a113b31d20bc5e42dc50734 Author: raiden00pl <[email protected]> AuthorDate: Wed May 20 10:17:10 2026 +0200 !arch/tivia: separate pulse count from PWM driver BREAKING CHANGE: separate pulse count from PWM driver Pulse count handling was removed from PWM driver and moved to a separate driver. For details about this change, look at previous commit. Signed-off-by: raiden00pl <[email protected]> --- arch/arm/src/tiva/Kconfig | 48 ++ arch/arm/src/tiva/Make.defs | 6 + arch/arm/src/tiva/common/CMakeLists.txt | 4 + .../tiva/common/{tiva_pwm.c => tiva_pulsecount.c} | 555 +++++++++------------ arch/arm/src/tiva/common/tiva_pwm.c | 264 ---------- arch/arm/src/tiva/tiva_pulsecount.h | 38 ++ 6 files changed, 319 insertions(+), 596 deletions(-) diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig index e8c89b7b112..78ce2f833e7 100644 --- a/arch/arm/src/tiva/Kconfig +++ b/arch/arm/src/tiva/Kconfig @@ -593,6 +593,18 @@ config TIVA_TIMER bool default n +config TIVA_PWM + bool + default n + +config TIVA_PULSECOUNT + bool "PWM pulse count" + default n + select ARCH_HAVE_PULSECOUNT + select PULSECOUNT + ---help--- + Enables the Tiva PWM peripheral pulse count lower-half driver. + # Peripheral Selections config TIVA_ADC0 @@ -606,6 +618,42 @@ config TIVA_ADC1 depends on TIVA_HAVE_ADC0 select TIVA_ADC +if TIVA_PULSECOUNT + +config TIVA_PULSECOUNT0_CHAN0 + bool "Pulse count 0 channel 0" + default n + +config TIVA_PULSECOUNT0_CHAN1 + bool "Pulse count 0 channel 1" + default n + +config TIVA_PULSECOUNT0_CHAN2 + bool "Pulse count 0 channel 2" + default n + +config TIVA_PULSECOUNT0_CHAN3 + bool "Pulse count 0 channel 3" + default n + +config TIVA_PULSECOUNT0_CHAN4 + bool "Pulse count 0 channel 4" + default n + +config TIVA_PULSECOUNT0_CHAN5 + bool "Pulse count 0 channel 5" + default n + +config TIVA_PULSECOUNT0_CHAN6 + bool "Pulse count 0 channel 6" + default n + +config TIVA_PULSECOUNT0_CHAN7 + bool "Pulse count 0 channel 7" + default n + +endif # TIVA_PULSECOUNT + config TIVA_CAN0 bool "CAN0" default n diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index 914850234fa..d8a9efa595d 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -77,6 +77,12 @@ ifeq ($(CONFIG_TIVA_PWM),y) CHIP_CSRCS += tiva_pwm.c endif +ifeq ($(CONFIG_TIVA_PULSECOUNT),y) +ifeq ($(CONFIG_PULSECOUNT),y) + CHIP_CSRCS += tiva_pulsecount.c +endif +endif + ifeq ($(CONFIG_TIVA_QEI),y) CHIP_CSRCS += tiva_qencoder.c endif diff --git a/arch/arm/src/tiva/common/CMakeLists.txt b/arch/arm/src/tiva/common/CMakeLists.txt index 47c5790f82b..c7d938f9cbb 100644 --- a/arch/arm/src/tiva/common/CMakeLists.txt +++ b/arch/arm/src/tiva/common/CMakeLists.txt @@ -64,6 +64,10 @@ if(CONFIG_TIVA_PWM) list(APPEND SRCS tiva_pwm.c) endif() +if(CONFIG_TIVA_PULSECOUNT AND CONFIG_PULSECOUNT) + list(APPEND SRCS tiva_pulsecount.c) +endif() + if(CONFIG_TIVA_QEI) list(APPEND SRCS tiva_qencoder.c) endif() diff --git a/arch/arm/src/tiva/common/tiva_pwm.c b/arch/arm/src/tiva/common/tiva_pulsecount.c similarity index 50% copy from arch/arm/src/tiva/common/tiva_pwm.c copy to arch/arm/src/tiva/common/tiva_pulsecount.c index 59612c58eda..5ec7401b578 100644 --- a/arch/arm/src/tiva/common/tiva_pwm.c +++ b/arch/arm/src/tiva/common/tiva_pulsecount.c @@ -1,38 +1,22 @@ /**************************************************************************** - * arch/arm/src/tiva/common/tiva_pwm.c - * - * SPDX-License-Identifier: BSD-3-Clause - * SPDX-FileCopyrightText: 2016 Young Mu. All rights reserved. - * SPDX-FileCopyrightText: 2013 Gregory Nutt. All rights reserved. - * SPDX-FileContributor: Young Mu <[email protected]> - * SPDX-FileContributor: Gregory Nutt <[email protected]> - * - * 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. + * arch/arm/src/tiva/common/tiva_pulsecount.c + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ****************************************************************************/ @@ -46,11 +30,11 @@ #include <errno.h> #include <nuttx/debug.h> -#include <nuttx/timers/pwm.h> +#include <nuttx/timers/pulsecount.h> #include "arm_internal.h" #include "tiva_gpio.h" -#include "tiva_pwm.h" +#include "tiva_pulsecount.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" @@ -62,7 +46,7 @@ * Private Types ****************************************************************************/ -uint32_t g_pwm_pinset[] = +uint32_t g_pulsecount_pinset[] = { GPIO_M0_PWM0, GPIO_M0_PWM1, @@ -74,288 +58,225 @@ uint32_t g_pwm_pinset[] = GPIO_M0_PWM7, }; -struct tiva_pwm_chan_s +struct tiva_pulsecount_chan_s { - const struct pwm_ops_s *ops; + const struct pulsecount_ops_s *ops; uint8_t controller_id; uintptr_t controller_base; uint8_t generator_id; uintptr_t generator_base; uint8_t channel_id; - bool complementary; -#ifdef CONFIG_PWM_PULSECOUNT bool inited; uint8_t irq; uint32_t count; uint32_t cur_count; void *handle; -#endif }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN0) -static int tiva_pwm_gen0_interrupt(int irq, +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN0 +static int tiva_pulsecount_gen0_interrupt(int irq, void *context, void *arg); #endif -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN2) -static int tiva_pwm_gen1_interrupt(int irq, +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN2 +static int tiva_pulsecount_gen1_interrupt(int irq, void *context, void *arg); #endif -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN4) -static int tiva_pwm_gen2_interrupt(int irq, +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN4 +static int tiva_pulsecount_gen2_interrupt(int irq, void *context, void *arg); #endif -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN6) -static int tiva_pwm_gen3_interrupt(int irq, +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN6 +static int tiva_pulsecount_gen3_interrupt(int irq, void *context, void *arg); #endif -#if defined(CONFIG_PWM_PULSECOUNT) && \ - (defined(CONFIG_TIVA_PWM0_CHAN0) || defined(CONFIG_TIVA_PWM0_CHAN2) || \ - defined(CONFIG_TIVA_PWM0_CHAN4) || defined(CONFIG_TIVA_PWM0_CHAN6)) -static int tiva_pwm_interrupt(struct tiva_pwm_chan_s *chan); +#if defined(CONFIG_TIVA_PULSECOUNT0_CHAN0) || defined(CONFIG_TIVA_PULSECOUNT0_CHAN2) || \ + defined(CONFIG_TIVA_PULSECOUNT0_CHAN4) || defined(CONFIG_TIVA_PULSECOUNT0_CHAN6) +static int tiva_pulsecount_interrupt(struct tiva_pulsecount_chan_s *chan); #endif -static inline void tiva_pwm_putreg(struct tiva_pwm_chan_s *chan, - unsigned int offset, uint32_t regval); -static inline uint32_t tiva_pwm_getreg(struct tiva_pwm_chan_s *chan, - unsigned int offset); -static inline int tiva_pwm_timer(struct tiva_pwm_chan_s *chan, - const struct pwm_info_s *info); - -static int tiva_pwm_setup(struct pwm_lowerhalf_s *dev); -static int tiva_pwm_shutdown(struct pwm_lowerhalf_s *dev); -#ifdef CONFIG_PWM_PULSECOUNT -static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, - const struct pwm_info_s *info, +static inline void +tiva_pulsecount_putreg(struct tiva_pulsecount_chan_s *chan, + unsigned int offset, uint32_t regval); +static inline uint32_t +tiva_pulsecount_getreg(struct tiva_pulsecount_chan_s *chan, + unsigned int offset); +static inline int tiva_pulsecount_timer(struct tiva_pulsecount_chan_s *chan, + const struct pulsecount_info_s *info); + +static int tiva_pulsecount_setup(struct pulsecount_lowerhalf_s *dev); +static int tiva_pulsecount_shutdown(struct pulsecount_lowerhalf_s *dev); +static int tiva_pulsecount_start(struct pulsecount_lowerhalf_s *dev, + const struct pulsecount_info_s *info, void *handle); -#else -static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, - const struct pwm_info_s *info); -#endif -static int tiva_pwm_stop(struct pwm_lowerhalf_s *dev); -static int tiva_pwm_ioctl(struct pwm_lowerhalf_s *dev, +static int tiva_pulsecount_stop(struct pulsecount_lowerhalf_s *dev); +static int tiva_pulsecount_ioctl(struct pulsecount_lowerhalf_s *dev, int cmd, unsigned long arg); /**************************************************************************** * Private Data ****************************************************************************/ -static uint32_t g_pwm_freq = 1875000; -static uint32_t g_pwm_counter = (1 << 16); +static uint32_t g_pulsecount_freq = 1875000; +static uint32_t g_pulsecount_counter = (1 << 16); -static const struct pwm_ops_s g_pwm_ops = +static const struct pulsecount_ops_s g_pulsecount_ops = { - .setup = tiva_pwm_setup, - .shutdown = tiva_pwm_shutdown, - .start = tiva_pwm_start, - .stop = tiva_pwm_stop, - .ioctl = tiva_pwm_ioctl, + .setup = tiva_pulsecount_setup, + .shutdown = tiva_pulsecount_shutdown, + .start = tiva_pulsecount_start, + .stop = tiva_pulsecount_stop, + .ioctl = tiva_pulsecount_ioctl, }; -#ifdef CONFIG_TIVA_PWM0_CHAN0 -static struct tiva_pwm_chan_s g_pwm_chan0 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN0 +static struct tiva_pulsecount_chan_s g_pulsecount_chan0 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 0, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 0, .channel_id = 0, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G0 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN0, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN1 -static struct tiva_pwm_chan_s g_pwm_chan1 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN1 +static struct tiva_pulsecount_chan_s g_pulsecount_chan1 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 0, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 0, .channel_id = 1, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G0 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN0, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN2 -static struct tiva_pwm_chan_s g_pwm_chan2 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN2 +static struct tiva_pulsecount_chan_s g_pulsecount_chan2 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 1, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 1, .channel_id = 2, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G1 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN1, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN3 -static struct tiva_pwm_chan_s g_pwm_chan3 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN3 +static struct tiva_pulsecount_chan_s g_pulsecount_chan3 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 1, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 1, .channel_id = 3, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G1 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN1, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN4 -static struct tiva_pwm_chan_s g_pwm_chan4 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN4 +static struct tiva_pulsecount_chan_s g_pulsecount_chan4 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 2, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 2, .channel_id = 4, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G2 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN2, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN5 -static struct tiva_pwm_chan_s g_pwm_chan5 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN5 +static struct tiva_pulsecount_chan_s g_pulsecount_chan5 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 2, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 2, .channel_id = 5, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G2 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN2, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN6 -static struct tiva_pwm_chan_s g_pwm_chan6 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN6 +static struct tiva_pulsecount_chan_s g_pulsecount_chan6 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 3, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 3, .channel_id = 6, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G3 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN3, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN7 -static struct tiva_pwm_chan_s g_pwm_chan7 = +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN7 +static struct tiva_pulsecount_chan_s g_pulsecount_chan7 = { - .ops = &g_pwm_ops, + .ops = &g_pulsecount_ops, .controller_id = 0, .controller_base = TIVA_PWM0_BASE, .generator_id = 3, .generator_base = TIVA_PWM0_BASE + TIVA_PWMN_BASE + TIVA_PWMN_INTERVAL * 3, .channel_id = 7, -#ifdef CONFIG_TIVA_PWM_COMPLEMENTARY_G3 - .complementary = true, -#else - .complementary = false, -#endif -#ifdef CONFIG_PWM_PULSECOUNT .inited = false, .irq = TIVA_IRQ_PWM0_GEN3, .count = 0, .cur_count = 0, .handle = NULL, -#endif }; #endif @@ -364,70 +285,69 @@ static struct tiva_pwm_chan_s g_pwm_chan7 = ****************************************************************************/ /**************************************************************************** - * Name: tiva_pwm_gen[n]_interrupt + * Name: tiva_pulsecount_gen[n]_interrupt * * Description: * Pulse count interrupt handlers for PWM[n] * ****************************************************************************/ -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN0) -static int tiva_pwm_gen0_interrupt(int irq, void *context, void *arg) +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN0 +static int tiva_pulsecount_gen0_interrupt(int irq, void *context, void *arg) { - return tiva_pwm_interrupt(&g_pwm_chan0); + return tiva_pulsecount_interrupt(&g_pulsecount_chan0); } #endif -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN2) -static int tiva_pwm_gen1_interrupt(int irq, void *context, void *arg) +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN2 +static int tiva_pulsecount_gen1_interrupt(int irq, void *context, void *arg) { - return tiva_pwm_interrupt(&g_pwm_chan2); + return tiva_pulsecount_interrupt(&g_pulsecount_chan2); } #endif -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN4) -static int tiva_pwm_gen2_interrupt(int irq, void *context, void *arg) +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN4 +static int tiva_pulsecount_gen2_interrupt(int irq, void *context, void *arg) { - return tiva_pwm_interrupt(&g_pwm_chan4); + return tiva_pulsecount_interrupt(&g_pulsecount_chan4); } #endif -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN6) -static int tiva_pwm_gen3_interrupt(int irq, void *context, void *arg) +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN6 +static int tiva_pulsecount_gen3_interrupt(int irq, void *context, void *arg) { - return tiva_pwm_interrupt(&g_pwm_chan6); + return tiva_pulsecount_interrupt(&g_pulsecount_chan6); } #endif /**************************************************************************** - * Name: tiva_pwm_interrupt + * Name: tiva_pulsecount_interrupt * * Description: * Common pulse count interrupt handler. * ****************************************************************************/ -#if defined(CONFIG_PWM_PULSECOUNT) && \ - (defined(CONFIG_TIVA_PWM0_CHAN0) || defined(CONFIG_TIVA_PWM0_CHAN2) || \ - defined(CONFIG_TIVA_PWM0_CHAN4) || defined(CONFIG_TIVA_PWM0_CHAN6)) -static int tiva_pwm_interrupt(struct tiva_pwm_chan_s *chan) +#if defined(CONFIG_TIVA_PULSECOUNT0_CHAN0) || defined(CONFIG_TIVA_PULSECOUNT0_CHAN2) || \ + defined(CONFIG_TIVA_PULSECOUNT0_CHAN4) || defined(CONFIG_TIVA_PULSECOUNT0_CHAN6) +static int tiva_pulsecount_interrupt(struct tiva_pulsecount_chan_s *chan) { /* Clear interrupt */ - tiva_pwm_putreg(chan, TIVA_PWMN_ISC_OFFSET, INT_SET << INTCMPAD); + tiva_pulsecount_putreg(chan, TIVA_PWMN_ISC_OFFSET, INT_SET << INTCMPAD); /* Count down current pulse count */ chan->cur_count--; - /* Disable PWM generator and reload current pulse count */ + /* Disable generator and reload current pulse count */ if (chan->cur_count == 0) { - tiva_pwm_putreg(chan, TIVA_PWMN_CTL_OFFSET, + tiva_pulsecount_putreg(chan, TIVA_PWMN_CTL_OFFSET, CTL_DISABLE << TIVA_PWMN_CTL_ENABLE); chan->cur_count = chan->count; - pwm_expired(chan->handle); + pulsecount_expired(chan->handle); } return 0; @@ -435,37 +355,39 @@ static int tiva_pwm_interrupt(struct tiva_pwm_chan_s *chan) #endif /**************************************************************************** - * Name: tiva_pwm_getreg + * Name: tiva_pulsecount_getreg * * Description: * Get a 32-bit register value by offset * ****************************************************************************/ -static inline uint32_t tiva_pwm_getreg(struct tiva_pwm_chan_s *chan, - unsigned int offset) +static inline uint32_t +tiva_pulsecount_getreg(struct tiva_pulsecount_chan_s *chan, + unsigned int offset) { uintptr_t regaddr = chan->generator_base + offset; return getreg32(regaddr); } /**************************************************************************** - * Name: tiva_pwm_putreg + * Name: tiva_pulsecount_putreg * * Description: * Put a 32-bit register value by offset * ****************************************************************************/ -static inline void tiva_pwm_putreg(struct tiva_pwm_chan_s *chan, - unsigned int offset, uint32_t regval) +static inline void +tiva_pulsecount_putreg(struct tiva_pulsecount_chan_s *chan, + unsigned int offset, uint32_t regval) { - uintptr_t regaddr = chan->generator_base + offset; - putreg32(regval, regaddr); + uintptr_t regaddr = chan->generator_base + offset; + putreg32(regval, regaddr); } /**************************************************************************** - * Name: tiva_pwm_setup + * Name: tiva_pulsecount_setup * * Description: * This method is called when the driver is opened. The lower half driver @@ -474,27 +396,27 @@ static inline void tiva_pwm_putreg(struct tiva_pwm_chan_s *chan, * called. * * Input Parameters: - * dev - A reference to the lower half PWM driver state structure + * dev - A reference to the lower half pulsecount driver state structure * * Returned Value: * Zero on success; a negated errno value on failure * ****************************************************************************/ -static int tiva_pwm_setup(struct pwm_lowerhalf_s *dev) +static int tiva_pulsecount_setup(struct pulsecount_lowerhalf_s *dev) { - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("setup PWM for channel %d\n", chan->channel_id); + struct tiva_pulsecount_chan_s *chan = (struct tiva_pulsecount_chan_s *)dev; + _info("setup pulsecount for channel %d\n", chan->channel_id); /* Enable GPIO port, GPIO pin type and GPIO alternate function (refer to * TM4C1294NCPDT 23.4.2-4) */ - int ret = tiva_configgpio(g_pwm_pinset[chan->channel_id]); + int ret = tiva_configgpio(g_pulsecount_pinset[chan->channel_id]); if (ret < 0) { - pwmerr("ERROR: tiva_configgpio failed (%x)\n", - g_pwm_pinset[chan->channel_id]); + _err("ERROR: tiva_configgpio failed (%x)\n", + g_pulsecount_pinset[chan->channel_id]); return ret; } @@ -502,7 +424,7 @@ static int tiva_pwm_setup(struct pwm_lowerhalf_s *dev) } /**************************************************************************** - * Name: tiva_pwm_shutdown + * Name: tiva_pulsecount_shutdown * * Description: * This method is called when the driver is closed. The lower half driver @@ -510,17 +432,17 @@ static int tiva_pwm_setup(struct pwm_lowerhalf_s *dev) * put the system into the lowest possible power usage state * * Input Parameters: - * dev - A reference to the lower half PWM driver state structure + * dev - A reference to the lower half pulsecount driver state structure * * Returned Value: * Zero on success; a negated errno value on failure * ****************************************************************************/ -static int tiva_pwm_shutdown(struct pwm_lowerhalf_s *dev) +static int tiva_pulsecount_shutdown(struct pulsecount_lowerhalf_s *dev) { - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("shutdown PWM for channel %d\n", chan->channel_id); + struct tiva_pulsecount_chan_s *chan = (struct tiva_pulsecount_chan_s *)dev; + _info("shutdown pulsecount for channel %d\n", chan->channel_id); /* Remove unused-variable warning */ @@ -528,19 +450,19 @@ static int tiva_pwm_shutdown(struct pwm_lowerhalf_s *dev) /* Ensure the PWM channel has been stopped */ - tiva_pwm_stop(dev); + tiva_pulsecount_stop(dev); return OK; } /**************************************************************************** - * Name: tiva_pwm_start + * Name: tiva_pulsecount_start * * Description: * (Re-)initialize the timer resources and start the pulsed output * * Input Parameters: - * dev - A reference to the lower half PWM driver state structure + * dev - A reference to the lower half pulsecount driver state structure * info - A reference to the characteristics of the pulsed output * handle - This is the handle that was provided to the lower-half * start() method. @@ -550,13 +472,12 @@ static int tiva_pwm_shutdown(struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -#ifdef CONFIG_PWM_PULSECOUNT -static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, - const struct pwm_info_s *info, +static int tiva_pulsecount_start(struct pulsecount_lowerhalf_s *dev, + const struct pulsecount_info_s *info, void *handle) { - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("start PWM for channel %d\n", chan->channel_id); + struct tiva_pulsecount_chan_s *chan = (struct tiva_pulsecount_chan_s *)dev; + _info("start pulsecount for channel %d\n", chan->channel_id); /* Save the handle */ @@ -568,8 +489,8 @@ static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, * Count should be add 1 for the first time */ - chan->count = info->channels[0].count; - chan->cur_count = info->channels[0].count; + chan->count = info->count; + chan->cur_count = info->count; if (!chan->inited) { @@ -580,9 +501,9 @@ static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, /* Count 0 means to generate indefinite number of pulses */ - if (info->channels[0].count == 0) + if (info->count == 0) { - pwm_expired(chan->handle); + pulsecount_expired(chan->handle); /* Disable interrupt */ @@ -603,29 +524,17 @@ static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, /* Start the timer */ - return tiva_pwm_timer(chan, info); -} -#else -static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, - const struct pwm_info_s *info) -{ - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("start PWM for channel %d\n", chan->channel_id); - - /* Start the timer */ - - return tiva_pwm_timer(chan, info); + return tiva_pulsecount_timer(chan, info); } -#endif /**************************************************************************** - * Name: tiva_pwm_timer + * Name: tiva_pulsecount_timer * * Description: - * Configure PWM registers and start the PWM timer + * Configure PWM registers and start pulsecount * * Input Parameters: - * dev - A reference to the lower half PWM driver state structure + * dev - A reference to the lower half pulsecount driver state structure * info - A reference to the characteristics of the pulsed output * * Returned Value: @@ -633,59 +542,51 @@ static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static inline int tiva_pwm_timer(struct tiva_pwm_chan_s *chan, - const struct pwm_info_s *info) +static inline int tiva_pulsecount_timer(struct tiva_pulsecount_chan_s *chan, + const struct pulsecount_info_s *info) { - uint16_t duty = info->channels[0].duty; - uint32_t frequency = info->frequency; + uint16_t duty = pulsecount_duty(info); + uint32_t frequency = pulsecount_frequency(info); - pwminfo("> frequency = %d\n", frequency); - pwminfo("> duty = %d\n", duty); + _info("> high = %" PRIu32 " ns\n", info->high_ns); + _info("> low = %" PRIu32 " ns\n", info->low_ns); + _info("> frequency = %" PRIu32 "\n", frequency); + _info("> duty = %u\n", duty); /* Configure PWM countdown mode (refer to TM4C1294NCPDT 23.4.6) */ - tiva_pwm_putreg(chan, TIVA_PWMN_CTL_OFFSET, 0); - if (chan->complementary) + tiva_pulsecount_putreg(chan, TIVA_PWMN_CTL_OFFSET, 0); + + if (chan->channel_id % 2 == 0) { - tiva_pwm_putreg(chan, TIVA_PWMN_GENA_OFFSET, - GENX_HIGH << TIVA_PWMN_GENX_ACTCMPAD | - GENX_LOW << TIVA_PWMN_GENX_ACTLOAD); - tiva_pwm_putreg(chan, TIVA_PWMN_GENB_OFFSET, - GENX_LOW << TIVA_PWMN_GENX_ACTCMPBD | + tiva_pulsecount_putreg(chan, TIVA_PWMN_GENA_OFFSET, + GENX_LOW << TIVA_PWMN_GENX_ACTCMPAD | GENX_HIGH << TIVA_PWMN_GENX_ACTLOAD); } else { - if (chan->channel_id % 2 == 0) - { - tiva_pwm_putreg(chan, TIVA_PWMN_GENA_OFFSET, - GENX_LOW << TIVA_PWMN_GENX_ACTCMPAD | - GENX_HIGH << TIVA_PWMN_GENX_ACTLOAD); - } - else - { - tiva_pwm_putreg(chan, TIVA_PWMN_GENB_OFFSET, - GENX_LOW << TIVA_PWMN_GENX_ACTCMPBD | - GENX_HIGH << TIVA_PWMN_GENX_ACTLOAD); - } + tiva_pulsecount_putreg(chan, TIVA_PWMN_GENB_OFFSET, + GENX_LOW << TIVA_PWMN_GENX_ACTCMPBD | + GENX_HIGH << TIVA_PWMN_GENX_ACTLOAD); } /* Set the PWM period (refer to TM4C1294NCPDT 23.4.7) */ - uint32_t pwm_min_freq = (uint32_t)(g_pwm_freq / g_pwm_counter) + 1; - uint32_t pwm_max_freq = g_pwm_freq; - uint32_t load = (uint32_t)(g_pwm_freq / frequency); + uint32_t pulsecount_min_freq = + (uint32_t)(g_pulsecount_freq / g_pulsecount_counter) + 1; + uint32_t pulsecount_max_freq = g_pulsecount_freq; + uint32_t load = (uint32_t)(g_pulsecount_freq / frequency); - pwminfo("> load = %u (%08x)\n", load, load); + _info("> load = %u (%08x)\n", load, load); - if (load >= g_pwm_counter || load < 1) + if (load >= g_pulsecount_counter || load < 1) { - pwmerr("ERROR: frequency should be in [%d, %d] Hz\n", - pwm_min_freq, pwm_max_freq); + _err("ERROR: frequency should be in [%d, %d] Hz\n", + pulsecount_min_freq, pulsecount_max_freq); return -ERANGE; } - tiva_pwm_putreg(chan, TIVA_PWMN_LOAD_OFFSET, load - 1); + tiva_pulsecount_putreg(chan, TIVA_PWMN_LOAD_OFFSET, load - 1); /* Configure PWM duty (refer to TM4C1294NCPDT 23.4.8-9) * @@ -694,30 +595,23 @@ static inline int tiva_pwm_timer(struct tiva_pwm_chan_s *chan, * so let comp equals to (comp-1) */ - uint32_t comp = (uint32_t)((1 - (float)duty / g_pwm_counter) * load); + uint32_t comp = + (uint32_t)((1 - (float)duty / g_pulsecount_counter) * load); comp = (duty == 0) ? (comp - 1) : (comp); - pwminfo("> comp = %u (%08x)\n", comp, comp); + _info("> comp = %u (%08x)\n", comp, comp); - if (chan->complementary) + if (chan->channel_id % 2 == 0) { - tiva_pwm_putreg(chan, TIVA_PWMN_CMPA_OFFSET, comp - 1); - tiva_pwm_putreg(chan, TIVA_PWMN_CMPB_OFFSET, comp - 1); + tiva_pulsecount_putreg(chan, TIVA_PWMN_CMPA_OFFSET, comp - 1); } else { - if (chan->channel_id % 2 == 0) - { - tiva_pwm_putreg(chan, TIVA_PWMN_CMPA_OFFSET, comp - 1); - } - else - { - tiva_pwm_putreg(chan, TIVA_PWMN_CMPB_OFFSET, comp - 1); - } + tiva_pulsecount_putreg(chan, TIVA_PWMN_CMPB_OFFSET, comp - 1); } /* Enable the PWM generator (refer to TM4C1294NCPDT 23.4.10) */ - tiva_pwm_putreg(chan, + tiva_pulsecount_putreg(chan, TIVA_PWMN_CTL_OFFSET, CTL_ENABLE << TIVA_PWMN_CTL_ENABLE); @@ -731,13 +625,13 @@ static inline int tiva_pwm_timer(struct tiva_pwm_chan_s *chan, } /**************************************************************************** - * Name: tiva_pwm_stop + * Name: tiva_pulsecount_stop * * Description: * Stop the pulsed output and reset the timer resources * * Input Parameters: - * dev - A reference to the lower half PWM driver state structure + * dev - A reference to the lower half pulsecount driver state structure * * Returned Value: * Zero on success; a negated errno value on failure @@ -749,10 +643,10 @@ static inline int tiva_pwm_timer(struct tiva_pwm_chan_s *chan, * ****************************************************************************/ -static int tiva_pwm_stop(struct pwm_lowerhalf_s *dev) +static int tiva_pulsecount_stop(struct pulsecount_lowerhalf_s *dev) { - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("stop PWM for channel %d\n", chan->channel_id); + struct tiva_pulsecount_chan_s *chan = (struct tiva_pulsecount_chan_s *)dev; + _info("stop pulsecount for channel %d\n", chan->channel_id); /* Disable PWM channel */ @@ -764,13 +658,13 @@ static int tiva_pwm_stop(struct pwm_lowerhalf_s *dev) } /**************************************************************************** - * Name: tiva_pwm_ioctl + * Name: tiva_pulsecount_ioctl * * Description: * Lower-half logic may support platform-specific ioctl commands * * Input Parameters: - * dev - A reference to the lower half PWM driver state structure + * dev - A reference to the lower half pulsecount driver state structure * cmd - The ioctl command * arg - The argument accompanying the ioctl command * @@ -779,11 +673,11 @@ static int tiva_pwm_stop(struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int tiva_pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, +static int tiva_pulsecount_ioctl(struct pulsecount_lowerhalf_s *dev, int cmd, unsigned long arg) { - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("ioctl PWM for channel %d\n", chan->channel_id); + struct tiva_pulsecount_chan_s *chan = (struct tiva_pulsecount_chan_s *)dev; + _info("ioctl pulsecount for channel %d\n", chan->channel_id); /* Remove unused-variable warning */ @@ -799,86 +693,87 @@ static int tiva_pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, ****************************************************************************/ /**************************************************************************** - * Name: tiva_pwm_initialize + * Name: tiva_pulsecount_initialize * * Description: - * Initialize one PWM channel for use with the upper_level PWM driver. + * Initialize one channel for use with the upper-level pulsecount driver. * * Input Parameters: - * channel - A number identifying the PWM channel use. + * channel - A number identifying the pulsecount channel to use. * * Returned Value: - * On success, a pointer to the SAMA5 lower half PWM driver is returned. + * On success, a pointer to the Tiva lower half pulsecount driver is + * returned. * NULL is returned on any failure. * ****************************************************************************/ -struct pwm_lowerhalf_s *tiva_pwm_initialize(int channel) +struct pulsecount_lowerhalf_s *tiva_pulsecount_initialize(int channel) { ASSERT(channel >= 0 && channel <= 7); - struct tiva_pwm_chan_s *chan; + struct tiva_pulsecount_chan_s *chan; switch (channel) { -#ifdef CONFIG_TIVA_PWM0_CHAN0 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN0 case 0: - chan = &g_pwm_chan0; + chan = &g_pulsecount_chan0; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN1 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN1 case 1: - chan = &g_pwm_chan1; + chan = &g_pulsecount_chan1; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN2 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN2 case 2: - chan = &g_pwm_chan2; + chan = &g_pulsecount_chan2; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN3 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN3 case 3: - chan = &g_pwm_chan3; + chan = &g_pulsecount_chan3; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN4 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN4 case 4: - chan = &g_pwm_chan4; + chan = &g_pulsecount_chan4; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN5 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN5 case 5: - chan = &g_pwm_chan5; + chan = &g_pulsecount_chan5; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN6 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN6 case 6: - chan = &g_pwm_chan6; + chan = &g_pulsecount_chan6; break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN7 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN7 case 7: - chan = &g_pwm_chan7; + chan = &g_pulsecount_chan7; break; #endif default: - pwmerr("ERROR: invalid channel %d\n", channel); + _err("ERROR: invalid channel %d\n", channel); return NULL; } - pwminfo("channel %d:\n", channel); - pwminfo("> channel_id = %d\n", chan->channel_id); - pwminfo("> controller_id = %d\n", chan->controller_id); - pwminfo("> controller_base = %08x\n", chan->controller_base); - pwminfo("> generator_id = %d\n", chan->generator_id); - pwminfo("> generator_base = %08x\n", chan->generator_base); + _info("channel %d:\n", channel); + _info("> channel_id = %d\n", chan->channel_id); + _info("> controller_id = %d\n", chan->controller_id); + _info("> controller_base = %08x\n", chan->controller_base); + _info("> generator_id = %d\n", chan->generator_id); + _info("> generator_base = %08x\n", chan->generator_base); /* Enable PWM controller (refer to TM4C1294NCPDT 23.4.1) */ @@ -891,53 +786,49 @@ struct pwm_lowerhalf_s *tiva_pwm_initialize(int channel) * On TM4C1294NCPDT, configure the PWM clock source as 1.875MHz (the system * clock 120MHz divided by 64) * - * TODO: need an algorithm to choose the best divider and load value combo. + * Keep the existing fixed divider/load selection in this split. */ putreg32(CC_USEPWM << TIVA_PWM_CC_USEPWM | CC_PWMDIV_64 << TIVA_PWM_CC_PWMDIV, chan->controller_base + TIVA_PWM_CC); -#ifdef CONFIG_PWM_PULSECOUNT - /* Enable interrupt INTCMPAD mode */ - tiva_pwm_putreg(chan, TIVA_PWMN_INTEN_OFFSET, INT_SET << INTCMPAD); + tiva_pulsecount_putreg(chan, TIVA_PWMN_INTEN_OFFSET, INT_SET << INTCMPAD); /* Attach IRQ handler and enable interrupt */ switch (chan->channel_id) { -#ifdef CONFIG_TIVA_PWM0_CHAN0 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN0 case 0: - irq_attach(chan->irq, tiva_pwm_gen0_interrupt, NULL); + irq_attach(chan->irq, tiva_pulsecount_gen0_interrupt, NULL); up_enable_irq(chan->irq); break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN2 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN2 case 2: - irq_attach(chan->irq, tiva_pwm_gen1_interrupt, NULL); + irq_attach(chan->irq, tiva_pulsecount_gen1_interrupt, NULL); up_enable_irq(chan->irq); break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN4 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN4 case 4: - irq_attach(chan->irq, tiva_pwm_gen2_interrupt, NULL); + irq_attach(chan->irq, tiva_pulsecount_gen2_interrupt, NULL); up_enable_irq(chan->irq); break; #endif -#ifdef CONFIG_TIVA_PWM0_CHAN6 +#ifdef CONFIG_TIVA_PULSECOUNT0_CHAN6 case 6: - irq_attach(chan->irq, tiva_pwm_gen3_interrupt, NULL); + irq_attach(chan->irq, tiva_pulsecount_gen3_interrupt, NULL); up_enable_irq(chan->irq); break; #endif } -#endif - - return (struct pwm_lowerhalf_s *)chan; + return (struct pulsecount_lowerhalf_s *)chan; } diff --git a/arch/arm/src/tiva/common/tiva_pwm.c b/arch/arm/src/tiva/common/tiva_pwm.c index 59612c58eda..53c31600f6f 100644 --- a/arch/arm/src/tiva/common/tiva_pwm.c +++ b/arch/arm/src/tiva/common/tiva_pwm.c @@ -83,45 +83,12 @@ struct tiva_pwm_chan_s uintptr_t generator_base; uint8_t channel_id; bool complementary; -#ifdef CONFIG_PWM_PULSECOUNT - bool inited; - uint8_t irq; - uint32_t count; - uint32_t cur_count; - void *handle; -#endif }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN0) -static int tiva_pwm_gen0_interrupt(int irq, - void *context, void *arg); -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN2) -static int tiva_pwm_gen1_interrupt(int irq, - void *context, void *arg); -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN4) -static int tiva_pwm_gen2_interrupt(int irq, - void *context, void *arg); -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN6) -static int tiva_pwm_gen3_interrupt(int irq, - void *context, void *arg); -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && \ - (defined(CONFIG_TIVA_PWM0_CHAN0) || defined(CONFIG_TIVA_PWM0_CHAN2) || \ - defined(CONFIG_TIVA_PWM0_CHAN4) || defined(CONFIG_TIVA_PWM0_CHAN6)) -static int tiva_pwm_interrupt(struct tiva_pwm_chan_s *chan); -#endif - static inline void tiva_pwm_putreg(struct tiva_pwm_chan_s *chan, unsigned int offset, uint32_t regval); static inline uint32_t tiva_pwm_getreg(struct tiva_pwm_chan_s *chan, @@ -131,14 +98,8 @@ static inline int tiva_pwm_timer(struct tiva_pwm_chan_s *chan, static int tiva_pwm_setup(struct pwm_lowerhalf_s *dev); static int tiva_pwm_shutdown(struct pwm_lowerhalf_s *dev); -#ifdef CONFIG_PWM_PULSECOUNT -static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, - const struct pwm_info_s *info, - void *handle); -#else static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, const struct pwm_info_s *info); -#endif static int tiva_pwm_stop(struct pwm_lowerhalf_s *dev); static int tiva_pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); @@ -174,13 +135,6 @@ static struct tiva_pwm_chan_s g_pwm_chan0 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN0, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -199,13 +153,6 @@ static struct tiva_pwm_chan_s g_pwm_chan1 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN0, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -224,13 +171,6 @@ static struct tiva_pwm_chan_s g_pwm_chan2 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN1, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -249,13 +189,6 @@ static struct tiva_pwm_chan_s g_pwm_chan3 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN1, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -274,13 +207,6 @@ static struct tiva_pwm_chan_s g_pwm_chan4 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN2, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -299,13 +225,6 @@ static struct tiva_pwm_chan_s g_pwm_chan5 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN2, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -324,13 +243,6 @@ static struct tiva_pwm_chan_s g_pwm_chan6 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN3, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -349,13 +261,6 @@ static struct tiva_pwm_chan_s g_pwm_chan7 = #else .complementary = false, #endif -#ifdef CONFIG_PWM_PULSECOUNT - .inited = false, - .irq = TIVA_IRQ_PWM0_GEN3, - .count = 0, - .cur_count = 0, - .handle = NULL, -#endif }; #endif @@ -363,77 +268,6 @@ static struct tiva_pwm_chan_s g_pwm_chan7 = * Private Functions ****************************************************************************/ -/**************************************************************************** - * Name: tiva_pwm_gen[n]_interrupt - * - * Description: - * Pulse count interrupt handlers for PWM[n] - * - ****************************************************************************/ - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN0) -static int tiva_pwm_gen0_interrupt(int irq, void *context, void *arg) -{ - return tiva_pwm_interrupt(&g_pwm_chan0); -} -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN2) -static int tiva_pwm_gen1_interrupt(int irq, void *context, void *arg) -{ - return tiva_pwm_interrupt(&g_pwm_chan2); -} -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN4) -static int tiva_pwm_gen2_interrupt(int irq, void *context, void *arg) -{ - return tiva_pwm_interrupt(&g_pwm_chan4); -} -#endif - -#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_TIVA_PWM0_CHAN6) -static int tiva_pwm_gen3_interrupt(int irq, void *context, void *arg) -{ - return tiva_pwm_interrupt(&g_pwm_chan6); -} -#endif - -/**************************************************************************** - * Name: tiva_pwm_interrupt - * - * Description: - * Common pulse count interrupt handler. - * - ****************************************************************************/ - -#if defined(CONFIG_PWM_PULSECOUNT) && \ - (defined(CONFIG_TIVA_PWM0_CHAN0) || defined(CONFIG_TIVA_PWM0_CHAN2) || \ - defined(CONFIG_TIVA_PWM0_CHAN4) || defined(CONFIG_TIVA_PWM0_CHAN6)) -static int tiva_pwm_interrupt(struct tiva_pwm_chan_s *chan) -{ - /* Clear interrupt */ - - tiva_pwm_putreg(chan, TIVA_PWMN_ISC_OFFSET, INT_SET << INTCMPAD); - - /* Count down current pulse count */ - - chan->cur_count--; - - /* Disable PWM generator and reload current pulse count */ - - if (chan->cur_count == 0) - { - tiva_pwm_putreg(chan, TIVA_PWMN_CTL_OFFSET, - CTL_DISABLE << TIVA_PWMN_CTL_ENABLE); - chan->cur_count = chan->count; - pwm_expired(chan->handle); - } - - return 0; -} -#endif - /**************************************************************************** * Name: tiva_pwm_getreg * @@ -550,62 +384,6 @@ static int tiva_pwm_shutdown(struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -#ifdef CONFIG_PWM_PULSECOUNT -static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, - const struct pwm_info_s *info, - void *handle) -{ - struct tiva_pwm_chan_s *chan = (struct tiva_pwm_chan_s *)dev; - pwminfo("start PWM for channel %d\n", chan->channel_id); - - /* Save the handle */ - - chan->handle = handle; - - /* Load pulse count and current pulse count - * - * Workaround: - * Count should be add 1 for the first time - */ - - chan->count = info->channels[0].count; - chan->cur_count = info->channels[0].count; - - if (!chan->inited) - { - chan->count++; - chan->cur_count++; - chan->inited = true; - } - - /* Count 0 means to generate indefinite number of pulses */ - - if (info->channels[0].count == 0) - { - pwm_expired(chan->handle); - - /* Disable interrupt */ - - uint32_t enable = getreg32(chan->controller_base + - TIVA_PWM_INTEN_OFFSET); - enable &= ~(INT_ENABLE << chan->generator_id); - putreg32(enable, chan->controller_base + TIVA_PWM_INTEN_OFFSET); - } - else - { - /* Enable interrupt */ - - uint32_t enable = getreg32(chan->controller_base + - TIVA_PWM_INTEN_OFFSET); - enable |= (INT_ENABLE << chan->generator_id); - putreg32(enable, chan->controller_base + TIVA_PWM_INTEN_OFFSET); - } - - /* Start the timer */ - - return tiva_pwm_timer(chan, info); -} -#else static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, const struct pwm_info_s *info) { @@ -616,7 +394,6 @@ static int tiva_pwm_start(struct pwm_lowerhalf_s *dev, return tiva_pwm_timer(chan, info); } -#endif /**************************************************************************** * Name: tiva_pwm_timer @@ -898,46 +675,5 @@ struct pwm_lowerhalf_s *tiva_pwm_initialize(int channel) CC_PWMDIV_64 << TIVA_PWM_CC_PWMDIV, chan->controller_base + TIVA_PWM_CC); -#ifdef CONFIG_PWM_PULSECOUNT - - /* Enable interrupt INTCMPAD mode */ - - tiva_pwm_putreg(chan, TIVA_PWMN_INTEN_OFFSET, INT_SET << INTCMPAD); - - /* Attach IRQ handler and enable interrupt */ - - switch (chan->channel_id) - { -#ifdef CONFIG_TIVA_PWM0_CHAN0 - case 0: - irq_attach(chan->irq, tiva_pwm_gen0_interrupt, NULL); - up_enable_irq(chan->irq); - break; -#endif - -#ifdef CONFIG_TIVA_PWM0_CHAN2 - case 2: - irq_attach(chan->irq, tiva_pwm_gen1_interrupt, NULL); - up_enable_irq(chan->irq); - break; -#endif - -#ifdef CONFIG_TIVA_PWM0_CHAN4 - case 4: - irq_attach(chan->irq, tiva_pwm_gen2_interrupt, NULL); - up_enable_irq(chan->irq); - break; -#endif - -#ifdef CONFIG_TIVA_PWM0_CHAN6 - case 6: - irq_attach(chan->irq, tiva_pwm_gen3_interrupt, NULL); - up_enable_irq(chan->irq); - break; -#endif - } - -#endif - return (struct pwm_lowerhalf_s *)chan; } diff --git a/arch/arm/src/tiva/tiva_pulsecount.h b/arch/arm/src/tiva/tiva_pulsecount.h new file mode 100644 index 00000000000..30a660e607f --- /dev/null +++ b/arch/arm/src/tiva/tiva_pulsecount.h @@ -0,0 +1,38 @@ +/**************************************************************************** + * arch/arm/src/tiva/tiva_pulsecount.h + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +#ifndef __ARCH_ARM_SRC_TIVA_TIVA_PULSECOUNT_H +#define __ARCH_ARM_SRC_TIVA_TIVA_PULSECOUNT_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/timers/pulsecount.h> + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +struct pulsecount_lowerhalf_s *tiva_pulsecount_initialize(int channel); + +#endif /* __ARCH_ARM_SRC_TIVA_TIVA_PULSECOUNT_H */
