blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

feat(storage/vfs): move jtag driver to new vfs API

Browse Source
This commit is contained in:
Tomáš Rohlínek 2024-11-01 12:23:59 +01:00
parent 0aa10dcb43
commit 4ff53bc9c7
No known key found for this signature in database
GPG Key ID: BDE1CEDD10F7E372
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_driver_usb_serial_jtag/include/driver/esp_private/usb_serial_jtag_vfs.h
View File

@ -20,7 +20,7 @@ extern "C" {
* *
* @return pointer to structure esp_vfs_t * @return pointer to structure esp_vfs_t
*/ */
const esp_vfs_t *esp_vfs_usb_serial_jtag_get_vfs(void); const esp_vfs_fs_ops_t *esp_vfs_usb_serial_jtag_get_vfs(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

36
components/esp_driver_usb_serial_jtag/src/usb_serial_jtag_vfs.c
View File

@ -571,8 +571,22 @@ void usb_serial_jtag_vfs_set_rx_line_endings(esp_line_endings_t mode)
s_ctx.rx_mode = mode; s_ctx.rx_mode = mode;
} }
static const esp_vfs_t usj_vfs = { #ifdef CONFIG_VFS_SUPPORT_SELECT
.flags = ESP_VFS_FLAG_DEFAULT, static const esp_vfs_select_ops_t s_vfs_jtag_select = {
.start_select = &usb_serial_jtag_start_select,
.end_select = &usb_serial_jtag_end_select,
};
#endif // CONFIG_VFS_SUPPORT_SELECT
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
static const esp_vfs_termios_ops_t s_vfs_jtag_termios = {
.tcsetattr = &usb_serial_jtag_tcsetattr,
.tcgetattr = &usb_serial_jtag_tcgetattr,
.tcdrain = &usb_serial_jtag_tcdrain,
.tcflush = &usb_serial_jtag_tcflush,
};
#endif // CONFIG_VFS_SUPPORT_TERMIOS
static const esp_vfs_fs_ops_t s_vfs_jtag = {
.write = &usb_serial_jtag_write, .write = &usb_serial_jtag_write,
.open = &usb_serial_jtag_open, .open = &usb_serial_jtag_open,
.fstat = &usb_serial_jtag_fstat, .fstat = &usb_serial_jtag_fstat,
@ -580,27 +594,25 @@ static const esp_vfs_t usj_vfs = {
.read = &usb_serial_jtag_read, .read = &usb_serial_jtag_read,
.fcntl = &usb_serial_jtag_fcntl, .fcntl = &usb_serial_jtag_fcntl,
.fsync = &usb_serial_jtag_fsync, .fsync = &usb_serial_jtag_fsync,
#ifdef CONFIG_VFS_SUPPORT_SELECT #ifdef CONFIG_VFS_SUPPORT_SELECT
.start_select = &usb_serial_jtag_start_select, .select = &s_vfs_jtag_select,
.end_select = &usb_serial_jtag_end_select,
#endif // CONFIG_VFS_SUPPORT_SELECT #endif // CONFIG_VFS_SUPPORT_SELECT
#ifdef CONFIG_VFS_SUPPORT_TERMIOS #ifdef CONFIG_VFS_SUPPORT_TERMIOS
.tcsetattr = &usb_serial_jtag_tcsetattr, .termios = &s_vfs_jtag_termios,
.tcgetattr = &usb_serial_jtag_tcgetattr,
.tcdrain = &usb_serial_jtag_tcdrain,
.tcflush = &usb_serial_jtag_tcflush,
#endif // CONFIG_VFS_SUPPORT_TERMIOS #endif // CONFIG_VFS_SUPPORT_TERMIOS
}; };
const esp_vfs_t* esp_vfs_usb_serial_jtag_get_vfs(void) const esp_vfs_fs_ops_t* esp_vfs_usb_serial_jtag_get_vfs(void)
{ {
return &usj_vfs; return &s_vfs_jtag;
} }
esp_err_t usb_serial_jtag_vfs_register(void) esp_err_t usb_serial_jtag_vfs_register(void)
{ {
// "/dev/usb_serial_jtag" unfortunately is too long for vfs // "/dev/usb_serial_jtag" unfortunately is too long for vfs
return esp_vfs_register("/dev/usbserjtag", &usj_vfs, NULL); return esp_vfs_register_fs("/dev/usbserjtag", &s_vfs_jtag, ESP_VFS_FLAG_STATIC, NULL);
} }
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
@ -615,7 +627,7 @@ ESP_SYSTEM_INIT_FN(init_vfs_usj, CORE, BIT(0), 111)
ESP_SYSTEM_INIT_FN(init_vfs_usj_sec, CORE, BIT(0), 112) ESP_SYSTEM_INIT_FN(init_vfs_usj_sec, CORE, BIT(0), 112)
{ {
// "/dev/seccondary_usb_serial_jtag" unfortunately is too long for vfs // "/dev/seccondary_usb_serial_jtag" unfortunately is too long for vfs
esp_vfs_register("/dev/secondary", &usj_vfs, NULL); esp_vfs_register_fs("/dev/secondary", &s_vfs_jtag, ESP_VFS_FLAG_STATIC, NULL);
return ESP_OK; return ESP_OK;
} }
#endif #endif