feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/uart_new_critical_section_api' into 'master'

Browse Source 
driver: added new critical section API to UART driver

See merge request espressif/esp-idf!19678
This commit is contained in:
Jakob Hasse
2022-11-30 19:53:44 +08:00
parent cb7686eec7 fd04374aa5
commit 56acd2ee03
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/driver/uart.c
View File

@@ -15,6 +15,7 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/semphr.h" #include "freertos/semphr.h"
#include "freertos/ringbuf.h" #include "freertos/ringbuf.h"
#include "esp_private/critical_section.h"
#include "hal/uart_hal.h" #include "hal/uart_hal.h"
#include "hal/gpio_hal.h" #include "hal/gpio_hal.h"
#include "hal/clk_tree_ll.h" #include "hal/clk_tree_ll.h"
@@ -65,12 +66,12 @@ static const char *UART_TAG = "uart";
#endif #endif
#define UART_ENTER_CRITICAL_SAFE(mux) portENTER_CRITICAL_SAFE(mux) #define UART_ENTER_CRITICAL_SAFE(spinlock) esp_os_enter_critical_safe(spinlock)
#define UART_EXIT_CRITICAL_SAFE(mux) portEXIT_CRITICAL_SAFE(mux) #define UART_EXIT_CRITICAL_SAFE(spinlock) esp_os_exit_critical_safe(spinlock)
#define UART_ENTER_CRITICAL_ISR(mux) portENTER_CRITICAL_ISR(mux) #define UART_ENTER_CRITICAL_ISR(spinlock) esp_os_enter_critical_isr(spinlock)
#define UART_EXIT_CRITICAL_ISR(mux) portEXIT_CRITICAL_ISR(mux) #define UART_EXIT_CRITICAL_ISR(spinlock) esp_os_exit_critical_isr(spinlock)
#define UART_ENTER_CRITICAL(mux) portENTER_CRITICAL(mux) #define UART_ENTER_CRITICAL(spinlock) esp_os_enter_critical(spinlock)
#define UART_EXIT_CRITICAL(mux) portEXIT_CRITICAL(mux) #define UART_EXIT_CRITICAL(spinlock) esp_os_exit_critical(spinlock)
// Check actual UART mode set // Check actual UART mode set
@@ -78,7 +79,7 @@ static const char *UART_TAG = "uart";
#define UART_CONTEX_INIT_DEF(uart_num) {\ #define UART_CONTEX_INIT_DEF(uart_num) {\
.hal.dev = UART_LL_GET_HW(uart_num),\ .hal.dev = UART_LL_GET_HW(uart_num),\
.spinlock = portMUX_INITIALIZER_UNLOCKED,\ INIT_CRIT_SECTION_LOCK_IN_STRUCT(spinlock)\
.hw_enabled = false,\ .hw_enabled = false,\
} }
@@ -150,7 +151,7 @@ typedef struct {
typedef struct { typedef struct {
uart_hal_context_t hal; /*!< UART hal context*/ uart_hal_context_t hal; /*!< UART hal context*/
portMUX_TYPE spinlock; DECLARE_CRIT_SECTION_LOCK_IN_STRUCT(spinlock)
bool hw_enabled; bool hw_enabled;
} uart_context_t; } uart_context_t;

6
components/esp_system/include/esp_private/critical_section.h
View File

@@ -20,14 +20,14 @@
extern "C" { extern "C" {
#endif #endif
#if CONFIG_FREERTOS_UNICORE && !CONFIG_IDF_TARGET_ESP32S2 #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
/** /**
* This macro also helps users switching between spinlock declarations/definitions for multi-/single core environments * This macro also helps users switching between spinlock declarations/definitions for multi-/single core environments
* if the macros below aren't sufficient. * if the macros below aren't sufficient.
*/ */
#define OS_SPINLOCK 0
#else
#define OS_SPINLOCK 1 #define OS_SPINLOCK 1
#else
#define OS_SPINLOCK 0
#endif #endif
#if OS_SPINLOCK == 1 #if OS_SPINLOCK == 1