Merge branch 'fix/fsync-call-propagation-to-secondary-console_v5.2' into 'release/v5.2'

fix(console): Fsync not propagated to secondary output (backport v5.2)

See merge request espressif/esp-idf!30262
This commit is contained in:
Marius Vikhammer
2024-06-25 16:08:14 +08:00

View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -104,7 +104,11 @@ int console_fcntl(int fd, int cmd, int arg)
int console_fsync(int fd) int console_fsync(int fd)
{ {
return get_vfs_for_index(primary_vfs_index)->vfs.fsync(vfs_console.fd_primary); const int ret_val = get_vfs_for_index(primary_vfs_index)->vfs.fsync(vfs_console.fd_primary);
#if CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG
(void)get_vfs_for_index(secondary_vfs_index)->vfs.fsync(vfs_console.fd_secondary);
#endif
return ret_val;
} }
#ifdef CONFIG_VFS_SUPPORT_DIR #ifdef CONFIG_VFS_SUPPORT_DIR