Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:43:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

xtensa/esp32: timer driver refactor

Browse Source
This commit is contained in:
Sara Souza
2021-03-03 16:32:45 -03:00
committed by Alan Carvalho de Assis
parent d889350822
commit 4ca0c6e3c8
3 changed files with 177 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/esp32/esp32_tim.c
+110 -310
View File
File diff suppressed because it is too large Load Diff
arch/xtensa/src/esp32/esp32_tim.h
+17 -28
View File
@@ -40,10 +40,8 @@
#define ESP32_TIM_START(d) ((d)->ops->start(d)) #define ESP32_TIM_START(d) ((d)->ops->start(d))
#define ESP32_TIM_STOP(d) ((d)->ops->stop(d)) #define ESP32_TIM_STOP(d) ((d)->ops->stop(d))
#define ESP32_TIM_CLEAR(d) ((d)->ops->clear(d)) #define ESP32_TIM_CLEAR(d) ((d)->ops->clear(d))
#define ESP32_TIM_CONFIGURE(d, p, m, c, av, a, ar) ((d)->ops->configure(d, m, c, av, a, ar))
#define ESP32_TIM_SETMODE(d, m) ((d)->ops->setmode(d, m)) #define ESP32_TIM_SETMODE(d, m) ((d)->ops->setmode(d, m))
#define ESP32_TIM_SETPRE(d, p) ((d)->ops->setpre(d, p)) #define ESP32_TIM_SETPRE(d, p) ((d)->ops->setpre(d, p))
#define ESP32_TIM_GETCONFIG(d, v) ((d)->ops->getconfig(d, v))
#define ESP32_TIM_GETCTR(d, v) ((d)->ops->getcounter(d, v)) #define ESP32_TIM_GETCTR(d, v) ((d)->ops->getcounter(d, v))
#define ESP32_TIM_SETCTR(d, v) ((d)->ops->setcounter(d, v)) #define ESP32_TIM_SETCTR(d, v) ((d)->ops->setcounter(d, v))
#define ESP32_TIM_RLD_NOW(d) ((d)->ops->reloadnow(d)) #define ESP32_TIM_RLD_NOW(d) ((d)->ops->reloadnow(d))
@@ -54,7 +52,6 @@
#define ESP32_TIM_SETISR(d, hnd, arg) ((d)->ops->setisr(d, hnd, arg)) #define ESP32_TIM_SETISR(d, hnd, arg) ((d)->ops->setisr(d, hnd, arg))
#define ESP32_TIM_ENABLEINT(d) ((d)->ops->enableint(d)) #define ESP32_TIM_ENABLEINT(d) ((d)->ops->enableint(d))
#define ESP32_TIM_DISABLEINT(d) ((d)->ops->disableint(d)) #define ESP32_TIM_DISABLEINT(d) ((d)->ops->disableint(d))
#define ESP32_TIM_CHECKINT(d) ((d)->ops->checkint(d))
#define ESP32_TIM_ACKINT(d) ((d)->ops->ackint(d)) #define ESP32_TIM_ACKINT(d) ((d)->ops->ackint(d))
/**************************************************************************** /****************************************************************************
@@ -84,39 +81,31 @@ struct esp32_tim_ops_s
{ {
/* Timer tasks */ /* Timer tasks */
CODE int (*start)(FAR struct esp32_tim_dev_s *dev); CODE void (*start)(FAR struct esp32_tim_dev_s *dev);
CODE int (*stop)(FAR struct esp32_tim_dev_s *dev); CODE void (*stop)(FAR struct esp32_tim_dev_s *dev);
CODE int (*clear)(FAR struct esp32_tim_dev_s *dev); CODE void (*clear)(FAR struct esp32_tim_dev_s *dev);
/* Timer configuration */
CODE int (*configure)(FAR struct esp32_tim_dev_s *dev, uint16_t pre,
uint8_t mode, uint64_t counter_value,
uint64_t alarm_value, bool alarm,
bool autoreload);
/* Timer operations */ /* Timer operations */
CODE int (*setmode)(FAR struct esp32_tim_dev_s *dev, uint8_t mode); CODE void (*setmode)(FAR struct esp32_tim_dev_s *dev, uint8_t mode);
CODE int (*setpre)(FAR struct esp32_tim_dev_s *dev, uint16_t pre); CODE void (*setpre)(FAR struct esp32_tim_dev_s *dev, uint16_t pre);
CODE int (*getconfig)(FAR struct esp32_tim_dev_s *dev, uint32_t *value); CODE void (*getcounter)(FAR struct esp32_tim_dev_s *dev, uint64_t *value);
CODE int (*getcounter)(FAR struct esp32_tim_dev_s *dev, uint64_t *value); CODE void (*setcounter)(FAR struct esp32_tim_dev_s *dev, uint64_t value);
CODE int (*setcounter)(FAR struct esp32_tim_dev_s *dev, uint64_t value); CODE void (*reloadnow)(FAR struct esp32_tim_dev_s *dev);
CODE int (*reloadnow)(FAR struct esp32_tim_dev_s *dev); CODE void (*getalarmvalue)(FAR struct esp32_tim_dev_s *dev,
CODE int (*getalarmvalue)(FAR struct esp32_tim_dev_s *dev,
uint64_t *value); uint64_t *value);
CODE int (*setalarmvalue)(FAR struct esp32_tim_dev_s *dev, uint64_t value); CODE void (*setalarmvalue)(FAR struct esp32_tim_dev_s *dev,
CODE int (*setalarm)(FAR struct esp32_tim_dev_s *dev, bool enable); uint64_t value);
CODE int (*setautoreload)(FAR struct esp32_tim_dev_s *dev, bool enable); CODE void (*setalarm)(FAR struct esp32_tim_dev_s *dev, bool enable);
CODE void (*setautoreload)(FAR struct esp32_tim_dev_s *dev, bool enable);
/* Timer interrupts */ /* Timer interrupts */
CODE int (*setisr)(FAR struct esp32_tim_dev_s *dev, xcpt_t handler, CODE int (*setisr)(FAR struct esp32_tim_dev_s *dev, xcpt_t handler,
FAR void * arg); FAR void * arg);
CODE int (*enableint)(FAR struct esp32_tim_dev_s *dev); CODE void (*enableint)(FAR struct esp32_tim_dev_s *dev);
CODE int (*disableint)(FAR struct esp32_tim_dev_s *dev); CODE void (*disableint)(FAR struct esp32_tim_dev_s *dev);
CODE int (*checkint)(FAR struct esp32_tim_dev_s *dev); CODE void (*ackint)(FAR struct esp32_tim_dev_s *dev);
CODE int (*ackint)(FAR struct esp32_tim_dev_s *dev);
}; };
/**************************************************************************** /****************************************************************************
@@ -124,7 +113,7 @@ struct esp32_tim_ops_s
****************************************************************************/ ****************************************************************************/
FAR struct esp32_tim_dev_s *esp32_tim_init(int timer); FAR struct esp32_tim_dev_s *esp32_tim_init(int timer);
int esp32_tim_deinit(FAR struct esp32_tim_dev_s *dev); void esp32_tim_deinit(FAR struct esp32_tim_dev_s *dev);
FAR struct esp32_tim_dev_s *esp32_tim0_init(void); FAR struct esp32_tim_dev_s *esp32_tim0_init(void);
#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_TIM_H */ #endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_TIM_H */
arch/xtensa/src/esp32/esp32_tim_lowerhalf.c
+50 -92
View File
@@ -23,19 +23,18 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/arch.h>
#include <nuttx/timers/timer.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <stdio.h>
#include <nuttx/arch.h>
#include <nuttx/timers/timer.h>
#include "xtensa.h" #include "xtensa.h"
#include "hardware/esp32_soc.h" #include "hardware/esp32_soc.h"
#include "esp32_tim.h" #include "esp32_tim.h"
#include "esp32_clockconfig.h" #include "esp32_clockconfig.h"
@@ -45,13 +44,7 @@
/* TIMER configuration */ /* TIMER configuration */
/* Lowest divider, Highest Frequency Best Resolution */
#define ESP32_TIMER_PRESCALER 2
/* Number of cycles to complete 1 microsecond */
#define ESP32_1USECOND ((esp_clk_apb_freq()/ESP32_TIMER_PRESCALER)/1000000)
#define ESP32_INIT_CNTR_VALUE 0 /* Initial counter value */
#define ESP32_TIMER_MAX_USECOND 0xffffffff #define ESP32_TIMER_MAX_USECOND 0xffffffff
#define ESP32_TIMER_MAX (ESP32_1USECOND*ESP32_TIMER_MAX_USECOND)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@@ -64,6 +57,7 @@ struct esp32_timer_lowerhalf_s
tccb_t callback; /* Current user interrupt callback */ tccb_t callback; /* Current user interrupt callback */
FAR void *arg; /* Argument passed to upper half callback */ FAR void *arg; /* Argument passed to upper half callback */
bool started; /* True: Timer has been started */ bool started; /* True: Timer has been started */
void *upper; /* Pointer to watchdog_upperhalf_s */
}; };
/**************************************************************************** /****************************************************************************
@@ -160,15 +154,13 @@ static int esp32_timer_handler(int irq, void *context, void *arg)
(FAR struct esp32_timer_lowerhalf_s *)arg; (FAR struct esp32_timer_lowerhalf_s *)arg;
uint32_t next_interval_us = 0; uint32_t next_interval_us = 0;
/* Clear Interrupt Bits */ if (priv->callback(&next_interval_us, priv->upper))
if (priv->callback(&next_interval_us, priv->arg))
{ {
if (next_interval_us > 0) if (next_interval_us > 0)
{ {
/* Set a value to the alarm */ /* Set a value to the alarm */
ESP32_TIM_SETALRVL(priv->tim, next_interval_us*ESP32_1USECOND); ESP32_TIM_SETALRVL(priv->tim, next_interval_us);
} }
} }
else else
@@ -177,7 +169,6 @@ static int esp32_timer_handler(int irq, void *context, void *arg)
} }
ESP32_TIM_SETALRM(priv->tim, true); /* Re-enables the alarm */ ESP32_TIM_SETALRM(priv->tim, true); /* Re-enables the alarm */
ESP32_TIM_CLEAR(priv->tim); /* Reset the counter */
ESP32_TIM_ACKINT(priv->tim); /* Clear the Interrupt */ ESP32_TIM_ACKINT(priv->tim); /* Clear the Interrupt */
return OK; return OK;
} }
@@ -202,6 +193,7 @@ static int esp32_timer_start(FAR struct timer_lowerhalf_s *lower)
FAR struct esp32_timer_lowerhalf_s *priv = FAR struct esp32_timer_lowerhalf_s *priv =
(FAR struct esp32_timer_lowerhalf_s *)lower; (FAR struct esp32_timer_lowerhalf_s *)lower;
int ret = OK; int ret = OK;
uint16_t pre;
irqstate_t flags; irqstate_t flags;
DEBUGASSERT(priv); DEBUGASSERT(priv);
@@ -218,43 +210,33 @@ static int esp32_timer_start(FAR struct timer_lowerhalf_s *lower)
* unpredictable results, so it is disabled before configuring * unpredictable results, so it is disabled before configuring
*/ */
ret = ESP32_TIM_STOP(priv->tim); ESP32_TIM_STOP(priv->tim);
if (ret != OK)
{ /* Calculate the suitable prescaler according to the current apb
goto errout; * frequency to generate a period of 1 us.
} */
pre = esp_clk_apb_freq() / 1000000;
/* Configure TIMER prescaler */ /* Configure TIMER prescaler */
ret = ESP32_TIM_SETPRE(priv->tim, ESP32_TIMER_PRESCALER); ESP32_TIM_SETPRE(priv->tim, pre);
if (ret != OK)
{
goto errout;
}
/* Configure TIMER mode */ /* Configure TIMER mode */
ret = ESP32_TIM_SETMODE(priv->tim, ESP32_TIM_MODE_UP); ESP32_TIM_SETMODE(priv->tim, ESP32_TIM_MODE_UP);
if (ret != OK)
{
goto errout;
}
/* Clear TIMER counter value */ /* Clear TIMER counter value */
ret = ESP32_TIM_CLEAR(priv->tim); ESP32_TIM_CLEAR(priv->tim);
if (ret != OK)
{ /* Enable autoreload */
goto errout;
} ESP32_TIM_SETARLD(priv->tim, true);
/* Enable TIMER alarm */ /* Enable TIMER alarm */
ret = ESP32_TIM_SETALRM(priv->tim, true); ESP32_TIM_SETALRM(priv->tim, true);
if (ret != OK)
{
goto errout;
}
/* Clear Interrupt Bits Status */ /* Clear Interrupt Bits Status */
@@ -265,21 +247,19 @@ static int esp32_timer_start(FAR struct timer_lowerhalf_s *lower)
if (priv->callback != NULL) if (priv->callback != NULL)
{ {
flags = enter_critical_section(); flags = enter_critical_section();
ret = ESP32_TIM_SETISR(priv->tim, esp32_timer_handler, priv);
ESP32_TIM_SETISR(priv->tim, esp32_timer_handler, priv);
ESP32_TIM_ENABLEINT(priv->tim);
leave_critical_section(flags); leave_critical_section(flags);
if (ret != OK)
{
goto errout;
}
ESP32_TIM_ENABLEINT(priv->tim);
} }
/* Finally, start the TIMER */ /* Finally, start the TIMER */
ret = ESP32_TIM_START(priv->tim); ESP32_TIM_START(priv->tim);
if (ret != OK)
{
goto errout;
}
priv->started = true; priv->started = true;
errout: errout:
@@ -306,6 +286,7 @@ static int esp32_timer_stop(FAR struct timer_lowerhalf_s *lower)
FAR struct esp32_timer_lowerhalf_s *priv = FAR struct esp32_timer_lowerhalf_s *priv =
(FAR struct esp32_timer_lowerhalf_s *)lower; (FAR struct esp32_timer_lowerhalf_s *)lower;
int ret = OK; int ret = OK;
irqstate_t flags;
DEBUGASSERT(priv); DEBUGASSERT(priv);
@@ -318,7 +299,9 @@ static int esp32_timer_stop(FAR struct timer_lowerhalf_s *lower)
} }
ESP32_TIM_DISABLEINT(priv->tim); ESP32_TIM_DISABLEINT(priv->tim);
ESP32_TIM_SETISR(priv->tim, NULL, NULL); flags = enter_critical_section();
ret = ESP32_TIM_SETISR(priv->tim, NULL, NULL);
leave_critical_section(flags);
ESP32_TIM_STOP(priv->tim); ESP32_TIM_STOP(priv->tim);
priv->started = false; priv->started = false;
@@ -378,25 +361,15 @@ static int esp32_timer_getstatus(FAR struct timer_lowerhalf_s *lower,
/* Get the current counter value */ /* Get the current counter value */
ret = ESP32_TIM_GETCTR(priv->tim, &current_counter_value); ESP32_TIM_GETCTR(priv->tim, &current_counter_value);
if (ret != OK)
{
goto errout;
}
/* Get the current configured timeout */ /* Get the current configured timeout */
ret = ESP32_TIM_GETALRVL(priv->tim, &alarm_value); ESP32_TIM_GETALRVL(priv->tim, &alarm_value);
if (ret != OK)
{
goto errout;
}
status->timeout = (uint32_t)(alarm_value / ESP32_1USECOND); status->timeout = (uint32_t)(alarm_value);
status->timeleft = (uint32_t)((alarm_value - current_counter_value) status->timeleft = (uint32_t)((alarm_value - current_counter_value));
/ ESP32_1USECOND);
errout:
return ret; return ret;
} }
@@ -422,30 +395,13 @@ static int esp32_timer_settimeout(FAR struct timer_lowerhalf_s *lower,
FAR struct esp32_timer_lowerhalf_s *priv = FAR struct esp32_timer_lowerhalf_s *priv =
(FAR struct esp32_timer_lowerhalf_s *)lower; (FAR struct esp32_timer_lowerhalf_s *)lower;
int ret = OK; int ret = OK;
uint64_t timeout_64;
DEBUGASSERT(priv); DEBUGASSERT(priv);
/* Verify if it is already running (set timeout must be called
* before start)
*/
if (priv->started == true)
{
ret = -EPERM;
goto errout;
}
/* Set the timeout */ /* Set the timeout */
timeout_64 = timeout*ESP32_1USECOND; ESP32_TIM_SETALRVL(priv->tim, (uint64_t)timeout);
ret = ESP32_TIM_SETALRVL(priv->tim, timeout_64);
if (ret != OK)
{
goto errout;
}
errout:
return ret; return ret;
} }
@@ -468,7 +424,7 @@ errout:
static int esp32_timer_maxtimeout(FAR struct timer_lowerhalf_s *lower, static int esp32_timer_maxtimeout(FAR struct timer_lowerhalf_s *lower,
uint32_t *max_timeout) uint32_t *max_timeout)
{ {
DEBUGASSERT(priv); DEBUGASSERT(max_timeout);
*max_timeout = ESP32_TIMER_MAX_USECOND; *max_timeout = ESP32_TIMER_MAX_USECOND;
@@ -501,30 +457,32 @@ static void esp32_timer_setcallback(FAR struct timer_lowerhalf_s *lower,
FAR struct esp32_timer_lowerhalf_s *priv = FAR struct esp32_timer_lowerhalf_s *priv =
(FAR struct esp32_timer_lowerhalf_s *)lower; (FAR struct esp32_timer_lowerhalf_s *)lower;
irqstate_t flags; irqstate_t flags;
int ret = OK;
DEBUGASSERT(priv); DEBUGASSERT(priv);
flags = enter_critical_section();
/* Save the new callback */ /* Save the new callback */
priv->callback = callback; priv->callback = callback;
priv->arg = arg; priv->arg = arg;
flags = enter_critical_section();
/* There is a user callback and the timer has already been started */ /* There is a user callback and the timer has already been started */
if (callback != NULL && priv->started == true) if (callback != NULL && priv->started == true)
{ {
ESP32_TIM_SETISR(priv->tim, esp32_timer_handler, priv); ret = ESP32_TIM_SETISR(priv->tim, esp32_timer_handler, priv);
ESP32_TIM_ENABLEINT(priv->tim); ESP32_TIM_ENABLEINT(priv->tim);
} }
else else
{ {
ESP32_TIM_DISABLEINT(priv->tim); ESP32_TIM_DISABLEINT(priv->tim);
ESP32_TIM_SETISR(priv->tim, NULL, NULL); ret = ESP32_TIM_SETISR(priv->tim, NULL, NULL);
} }
leave_critical_section(flags); leave_critical_section(flags);
assert(ret == OK);
} }
/**************************************************************************** /****************************************************************************
@@ -552,7 +510,6 @@ static void esp32_timer_setcallback(FAR struct timer_lowerhalf_s *lower,
int esp32_timer_initialize(FAR const char *devpath, uint8_t timer) int esp32_timer_initialize(FAR const char *devpath, uint8_t timer)
{ {
struct esp32_timer_lowerhalf_s *lower = NULL; struct esp32_timer_lowerhalf_s *lower = NULL;
FAR void *drvr = NULL;
int ret = OK; int ret = OK;
DEBUGASSERT(devpath); DEBUGASSERT(devpath);
@@ -623,8 +580,9 @@ int esp32_timer_initialize(FAR const char *devpath, uint8_t timer)
* REVISIT: The returned handle is discarded here. * REVISIT: The returned handle is discarded here.
*/ */
drvr = timer_register(devpath, (FAR struct timer_lowerhalf_s *)lower); lower->upper = timer_register(devpath,
if (drvr == NULL) (FAR struct timer_lowerhalf_s *)lower);
if (lower->upper == NULL)
{ {
/* The actual cause of the failure may have been a failure to allocate /* The actual cause of the failure may have been a failure to allocate
* perhaps a failure to register the timer driver (such as if the * perhaps a failure to register the timer driver (such as if the