esp32/esp32_freerun.c: Use device specific locks.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2021-08-30 11:36:24 +02:00 committed by Xiang Xiao
parent 04bd27400a
commit 698af43d78

View File

@ -34,9 +34,10 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/clock.h> #include <nuttx/clock.h>
#include <nuttx/spinlock.h>
#include "esp32_freerun.h"
#include "esp32_clockconfig.h" #include "esp32_clockconfig.h"
#include "esp32_freerun.h"
#ifdef CONFIG_ESP32_FREERUN #ifdef CONFIG_ESP32_FREERUN
@ -48,6 +49,12 @@
#define MAX_US_RESOLUTION 819 #define MAX_US_RESOLUTION 819
#define ESP32_TIMER_WIDTH 64 #define ESP32_TIMER_WIDTH 64
/****************************************************************************
* Private Data
****************************************************************************/
static spinlock_t g_lock; /* Device specific lock */
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -189,9 +196,9 @@ int esp32_freerun_initialize(struct esp32_freerun_s *freerun, int chan,
/* Register the handler */ /* Register the handler */
flags = enter_critical_section(); flags = spin_lock_irqsave(&g_lock);
ret = ESP32_TIM_SETISR(freerun->tch, esp32_freerun_handler, freerun); ret = ESP32_TIM_SETISR(freerun->tch, esp32_freerun_handler, freerun);
leave_critical_section(flags); spin_unlock_irqrestore(&g_lock, flags);
if (ret == OK) if (ret == OK)
{ {
ESP32_TIM_ENABLEINT(freerun->tch); ESP32_TIM_ENABLEINT(freerun->tch);
@ -244,7 +251,7 @@ int esp32_freerun_counter(struct esp32_freerun_s *freerun,
/* Temporarily disable the overflow counter. */ /* Temporarily disable the overflow counter. */
flags = enter_critical_section(); flags = spin_lock_irqsave(&g_lock);
overflow = freerun->overflow; overflow = freerun->overflow;
ESP32_TIM_GETCTR(freerun->tch, &counter); ESP32_TIM_GETCTR(freerun->tch, &counter);
@ -271,7 +278,7 @@ int esp32_freerun_counter(struct esp32_freerun_s *freerun,
freerun->overflow = overflow; freerun->overflow = overflow;
} }
leave_critical_section(flags); spin_unlock_irqrestore(&g_lock, flags);
tmrinfo("counter=%" PRIu64 " (%" PRIu64 ") overflow=%" PRIu32 tmrinfo("counter=%" PRIu64 " (%" PRIu64 ") overflow=%" PRIu32
", pending=%i\n", ", pending=%i\n",