Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

VFS: Fix Kconfig prefix

Browse source
This commit is contained in:
Roland Dobai 2019-07-02 17:14:58 +02:00
parent 6895ea1624
commit 43eb58da99
9 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/newlib/platform_include/sys/termios.h
View file

@ -27,7 +27,7 @@
#include <sys/types.h>
#include "sdkconfig.h"
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
// subscripts for the array c_cc:
#define VEOF 0 /** EOF character */
@ -291,6 +291,6 @@ int tcsetattr(int fd, int optional_actions, const struct termios *p);
} // extern "C"
#endif
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS
#endif //__ESP_SYS_TERMIOS_H__

4
components/newlib/select.c
View file

@ -19,9 +19,9 @@
#ifdef CONFIG_LWIP_USE_ONLY_LWIP_SELECT
#include "lwip/sockets.h"
#ifdef CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT
#ifdef CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
#define LOG_LOCAL_LEVEL ESP_LOG_NONE
#endif //CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT
#endif //CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
#include "esp_log.h"
static const char *TAG = "newlib_select";

4
components/newlib/termios.c
View file

@ -14,7 +14,7 @@
#include "sdkconfig.h"
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
#include <sys/termios.h>
#include <sys/errno.h>
@ -51,4 +51,4 @@ int cfsetospeed(struct termios *p, speed_t sp)
}
}
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS

4
components/vfs/Kconfig
View file

@ -1,6 +1,6 @@
menu "Virtual file system"
config SUPPRESS_SELECT_DEBUG_OUTPUT
config VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
bool "Suppress select() related debug outputs"
default y
help
@ -9,7 +9,7 @@ menu "Virtual file system"
It is possible to suppress these debug outputs by enabling this
option.
config SUPPORT_TERMIOS
config VFS_SUPPORT_TERMIOS
bool "Add support for termios.h"
default y
help

4
components/vfs/include/esp_vfs.h
View file

@ -196,7 +196,7 @@ typedef struct
int (*utime_p)(void* ctx, const char *path, const struct utimbuf *times);
int (*utime)(const char *path, const struct utimbuf *times);
};
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
union {
int (*tcsetattr_p)(void *ctx, int fd, int optional_actions, const struct termios *p);
int (*tcsetattr)(int fd, int optional_actions, const struct termios *p);
@ -225,7 +225,7 @@ typedef struct
int (*tcsendbreak_p)(void *ctx, int fd, int duration);
int (*tcsendbreak)(int fd, int duration);
};
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS
/** start_select is called for setting up synchronous I/O multiplexing of the desired file descriptors in the given VFS */
esp_err_t (*start_select)(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, esp_vfs_select_sem_t sem);

5
components/vfs/sdkconfig.rename Normal file
View file

@ -0,0 +1,5 @@
# sdkconfig replacement configurations for deprecated options formatted as
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
CONFIG_SUPPORT_TERMIOS CONFIG_VFS_SUPPORT_TERMIOS

4
components/vfs/test/test_vfs_uart.c
View file

@ -202,7 +202,7 @@ TEST_CASE("can write to UART while another task is reading", "[vfs]")
vSemaphoreDelete(write_arg.done);
}
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
TEST_CASE("Can use termios for UART", "[vfs]")
{
uart_config_t uart_config = {
@ -328,4 +328,4 @@ TEST_CASE("Can use termios for UART", "[vfs]")
close(uart_fd);
uart_driver_delete(UART_NUM_1);
}
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS

8
components/vfs/vfs.c
View file

@ -27,9 +27,9 @@
#include "esp_vfs.h"
#include "sdkconfig.h"
#ifdef CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT
#ifdef CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
#define LOG_LOCAL_LEVEL ESP_LOG_NONE
#endif //CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT
#endif //CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
#include "esp_log.h"
static const char *TAG = "vfs";
@ -1032,7 +1032,7 @@ void esp_vfs_select_triggered_isr(esp_vfs_select_sem_t sem, BaseType_t *woken)
}
}
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
int tcgetattr(int fd, struct termios *p)
{
const vfs_entry_t* vfs = get_vfs_for_fd(fd);
@ -1130,7 +1130,7 @@ int tcsendbreak(int fd, int duration)
CHECK_AND_CALL(ret, r, vfs, tcsendbreak, local_fd, duration);
return ret;
}
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS
int esp_vfs_utime(const char *path, const struct utimbuf *times)
{

8
components/vfs/vfs_uart.c
View file

@ -463,7 +463,7 @@ static void uart_end_select()
_lock_release(&s_one_select_lock);
}
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
static int uart_tcsetattr(int fd, int optional_actions, const struct termios *p)
{
if (fd < 0 || fd >= UART_NUM) {
@ -913,7 +913,7 @@ static int uart_tcflush(int fd, int select)
return 0;
}
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS
void esp_vfs_dev_uart_register()
{
@ -929,12 +929,12 @@ void esp_vfs_dev_uart_register()
.access = &uart_access,
.start_select = &uart_start_select,
.end_select = &uart_end_select,
#ifdef CONFIG_SUPPORT_TERMIOS
#ifdef CONFIG_VFS_SUPPORT_TERMIOS
.tcsetattr = &uart_tcsetattr,
.tcgetattr = &uart_tcgetattr,
.tcdrain = &uart_tcdrain,
.tcflush = &uart_tcflush,
#endif // CONFIG_SUPPORT_TERMIOS
#endif // CONFIG_VFS_SUPPORT_TERMIOS
};
ESP_ERROR_CHECK(esp_vfs_register("/dev/uart", &vfs, NULL));
}