Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(storage/vfs): Remove usage of context less VFS APIs

Browse Source
This commit is contained in:
Tomáš Rohlínek
2026-03-11 11:03:43 +01:00
parent 859ca9e5e2
commit a46fec8d96
9 changed files with 178 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_uart/src/uart_vfs.c
+25 -25
View File
@@ -147,7 +147,7 @@ static esp_err_t uart_end_select(void *end_select_args);
#endif // CONFIG_VFS_SUPPORT_SELECT
static int uart_open(const char *path, int flags, int mode)
static int uart_open(__attribute__((unused)) void *ctx, const char *path, int flags, int mode)
{
// this is fairly primitive, we should check if file is opened read only,
// and error out if write is requested
@@ -223,7 +223,7 @@ static int uart_rx_char_via_driver(int fd)
return c;
}
static ssize_t uart_write(int fd, const void * data, size_t size)
static ssize_t uart_write(__attribute__((unused)) void *ctx, int fd, const void * data, size_t size)
{
assert(fd >= 0 && fd < 3);
tx_func_t tx_func = s_ctx[fd]->tx_func;
@@ -270,7 +270,7 @@ static void uart_return_char(int fd, int c)
s_ctx[fd]->peek_char = c;
}
static ssize_t uart_read(int fd, void* data, size_t size)
static ssize_t uart_read(__attribute__((unused)) void *ctx, int fd, void* data, size_t size)
{
assert(fd >= 0 && fd < 3);
char *data_c = (char *) data;
@@ -343,7 +343,7 @@ static ssize_t uart_read(int fd, void* data, size_t size)
return -1;
}
static int uart_fstat(int fd, struct stat * st)
static int uart_fstat(__attribute__((unused)) void *ctx, int fd, struct stat * st)
{
assert(fd >= 0 && fd < 3);
memset(st, 0, sizeof(*st));
@@ -351,13 +351,13 @@ static int uart_fstat(int fd, struct stat * st)
return 0;
}
static int uart_close(int fd)
static int uart_close(__attribute__((unused)) void *ctx, int fd)
{
assert(fd >= 0 && fd < 3);
return 0;
}
static int uart_fcntl(int fd, int cmd, int arg)
static int uart_fcntl(__attribute__((unused)) void *ctx, int fd, int cmd, int arg)
{
assert(fd >= 0 && fd < 3);
int result = 0;
@@ -378,7 +378,7 @@ static int uart_fcntl(int fd, int cmd, int arg)
#ifdef CONFIG_VFS_SUPPORT_DIR
static int uart_access(const char *path, int amode)
static int uart_access(__attribute__((unused)) void *ctx, const char *path, int amode)
{
int ret = -1;
@@ -401,7 +401,7 @@ static int uart_access(const char *path, int amode)
#endif // CONFIG_VFS_SUPPORT_DIR
static int uart_fsync(int fd)
static int uart_fsync(__attribute__((unused)) void *ctx, int fd)
{
assert(fd >= 0 && fd < 3);
_lock_acquire_recursive(&s_ctx[fd]->write_lock);
@@ -602,7 +602,7 @@ static esp_err_t uart_end_select(void *end_select_args)
#endif // CONFIG_VFS_SUPPORT_SELECT
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
static int uart_tcsetattr(int fd, int optional_actions, const struct termios *p)
static int uart_tcsetattr(__attribute__((unused)) void *ctx, int fd, int optional_actions, const struct termios *p)
{
if (fd < 0 || fd >= UART_NUM) {
errno = EBADF;
@@ -807,7 +807,7 @@ static int uart_tcsetattr(int fd, int optional_actions, const struct termios *p)
return 0;
}
static int uart_tcgetattr(int fd, struct termios *p)
static int uart_tcgetattr(__attribute__((unused)) void *ctx, int fd, struct termios *p)
{
if (fd < 0 || fd >= UART_NUM) {
errno = EBADF;
@@ -1016,7 +1016,7 @@ static int uart_tcgetattr(int fd, struct termios *p)
return 0;
}
static int uart_tcdrain(int fd)
static int uart_tcdrain(__attribute__((unused)) void *ctx, int fd)
{
if (fd < 0 || fd >= UART_NUM) {
errno = EBADF;
@@ -1031,7 +1031,7 @@ static int uart_tcdrain(int fd)
return 0;
}
static int uart_tcflush(int fd, int select)
static int uart_tcflush(__attribute__((unused)) void *ctx, int fd, int select)
{
if (fd < 0 || fd >= UART_NUM) {
errno = EBADF;
@@ -1055,7 +1055,7 @@ static int uart_tcflush(int fd, int select)
#ifdef CONFIG_VFS_SUPPORT_DIR
static const esp_vfs_dir_ops_t s_vfs_uart_dir = {
.access = &uart_access,
.access_p = &uart_access,
};
#endif // CONFIG_VFS_SUPPORT_DIR
@@ -1068,21 +1068,21 @@ static const esp_vfs_select_ops_t s_vfs_uart_select = {
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
static const esp_vfs_termios_ops_t s_vfs_uart_termios = {
.tcsetattr = &uart_tcsetattr,
.tcgetattr = &uart_tcgetattr,
.tcdrain = &uart_tcdrain,
.tcflush = &uart_tcflush,
.tcsetattr_p = &uart_tcsetattr,
.tcgetattr_p = &uart_tcgetattr,
.tcdrain_p = &uart_tcdrain,
.tcflush_p = &uart_tcflush,
};
#endif // CONFIG_VFS_SUPPORT_TERMIOS
static const esp_vfs_fs_ops_t s_vfs_uart = {
.write = &uart_write,
.open = &uart_open,
.fstat = &uart_fstat,
.close = &uart_close,
.read = &uart_read,
.fcntl = &uart_fcntl,
.fsync = &uart_fsync,
.write_p = &uart_write,
.open_p = &uart_open,
.fstat_p = &uart_fstat,
.close_p = &uart_close,
.read_p = &uart_read,
.fcntl_p = &uart_fcntl,
.fsync_p = &uart_fsync,
#ifdef CONFIG_VFS_SUPPORT_DIR
.dir = &s_vfs_uart_dir,
#endif // CONFIG_VFS_SUPPORT_DIR
@@ -1101,7 +1101,7 @@ const esp_vfs_fs_ops_t *esp_vfs_uart_get_vfs(void)
void uart_vfs_dev_register(void)
{
ESP_ERROR_CHECK(esp_vfs_register_fs("/dev/uart", &s_vfs_uart, ESP_VFS_FLAG_STATIC, NULL));
ESP_ERROR_CHECK(esp_vfs_register_fs("/dev/uart", &s_vfs_uart, ESP_VFS_FLAG_STATIC | ESP_VFS_FLAG_CONTEXT_PTR, NULL));
}
int uart_vfs_dev_port_set_rx_line_endings(int uart_num, esp_line_endings_t mode)