espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/twai_tag_not_defined_in_configure_gpio' into 'release/v5.0'

Browse Source 
fix(twai): fix build error TWAI_TAG used but not defined (v5.0)

See merge request espressif/esp-idf!27811
This commit is contained in:
Jiang Jiang Jian
2023-12-15 19:29:27 +08:00
parent 9b28d121f0 62efb02ecf
commit 2808077645
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/twai.c
View File

@ -27,6 +27,7 @@
/* ---------------------------- Definitions --------------------------------- */ /* ---------------------------- Definitions --------------------------------- */
//Internal Macros //Internal Macros
#define TWAI_TAG "TWAI"
#define TWAI_CHECK(cond, ret_val) ({ \ #define TWAI_CHECK(cond, ret_val) ({ \
if (!(cond)) { \ if (!(cond)) { \
return (ret_val); \ return (ret_val); \
@ -40,11 +41,11 @@
}) })
#define TWAI_SET_FLAG(var, mask) ((var) |= (mask)) #define TWAI_SET_FLAG(var, mask) ((var) |= (mask))
#define TWAI_RESET_FLAG(var, mask) ((var) &= ~(mask)) #define TWAI_RESET_FLAG(var, mask) ((var) &= ~(mask))
#ifdef CONFIG_TWAI_ISR_IN_IRAM #ifdef CONFIG_TWAI_ISR_IN_IRAM
#define TWAI_ISR_ATTR IRAM_ATTR #define TWAI_ISR_ATTR IRAM_ATTR
#define TWAI_MALLOC_CAPS (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT) #define TWAI_MALLOC_CAPS (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
#else #else
#define TWAI_TAG "TWAI"
#define TWAI_ISR_ATTR #define TWAI_ISR_ATTR
#define TWAI_MALLOC_CAPS MALLOC_CAP_DEFAULT #define TWAI_MALLOC_CAPS MALLOC_CAP_DEFAULT
#endif //CONFIG_TWAI_ISR_IN_IRAM #endif //CONFIG_TWAI_ISR_IN_IRAM
@ -463,7 +464,6 @@ esp_err_t twai_driver_install(const twai_general_config_t *g_config, const twai_
//Assign GPIO //Assign GPIO
ret = twai_configure_gpio(g_config->tx_io, g_config->rx_io, g_config->clkout_io, g_config->bus_off_io); ret = twai_configure_gpio(g_config->tx_io, g_config->rx_io, g_config->clkout_io, g_config->bus_off_io);
if (ESP_OK != ret) { if (ESP_OK != ret) {
ESP_LOGE(TWAI_TAG, "init gpio for twai failed");
goto err; goto err;
} }