pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/cdcacm-callback-placement_v5.5' into 'release/v5.5'

Browse Source 
fix(esp_vfs_console): Update placement of cdcacm_xx_cb when ETS print enabled (v5.5)

See merge request espressif/esp-idf!41330
This commit is contained in:
Jiang Jiang Jian
2025-10-31 07:10:47 +08:00
parent d7bdd17dba 175e885555
commit 24a36e5c01
8 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_system/linker.lf
-8
View File
@@ -51,14 +51,6 @@ entries:
if APP_BUILD_TYPE_RAM = n:
image_process (noflash)
[mapping:vfs_cdcacm]
archive: libvfs.a
entries:
if ESP_SYSTEM_IN_IRAM = y:
if ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF:
vfs_cdcacm:cdcacm_tx_cb (noflash)
vfs_cdcacm:cdcacm_rx_cb (noflash)
[mapping:esp_system_hal]
archive: libhal.a
entries:
components/esp_system/port/usb_console.c
+5 -3
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -494,11 +494,13 @@ void esp_usb_console_write_char(char c)
esp_usb_console_write_buf(&c, 1);
}
}
static inline void write_lock_acquire(void)
static inline __attribute__((always_inline)) void write_lock_acquire(void)
{
portENTER_CRITICAL_SAFE(&s_lock);
}
static inline void write_lock_release(void)
static inline __attribute__((always_inline)) void write_lock_release(void)
{
portEXIT_CRITICAL_SAFE(&s_lock);
}