Merge branch 'feature/update_vfs_for_fatfs' into 'master'

feat(vfs): update vfs for ESP8266

See merge request sdk/ESP8266_RTOS_SDK!1317

Author: donghengqaz

components/esp8266/driver/uart.c

@@ -667,16 +667,12 @@ static void uart_rx_intr_handler_default(void *param)
             notify = UART_SELECT_ERROR_NOTIF;
         }
 
-#ifdef CONFIG_USING_ESP_VFS
         if (uart_event.type != UART_EVENT_MAX && p_uart->uart_select_notif_callback) {
             p_uart->uart_select_notif_callback(uart_num, notify, &task_woken);
             if (task_woken == pdTRUE) {
                 portYIELD_FROM_ISR();
             }
         }
-#else
-        (void)notify;
-#endif
 
         if (uart_event.type != UART_EVENT_MAX && p_uart->xQueueUart) {
             if (pdFALSE == xQueueSendFromISR(p_uart->xQueueUart, (void *)&uart_event, &task_woken)) {
@@ -1094,3 +1090,8 @@ esp_err_t uart_set_rx_timeout(uart_port_t uart_num, const uint8_t tout_thresh)
     UART_EXIT_CRITICAL();
     return ESP_OK;
 }
+
+bool uart_is_driver_installed(uart_port_t uart_num)
+{
+    return uart_num < UART_NUM_MAX && (p_uart_obj[uart_num] != NULL);
+}

components/esp8266/include/driver/uart.h

@@ -20,6 +20,7 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
 #include "esp_err.h"
 #include "esp_log.h"
 #include "freertos/queue.h"
@@ -553,6 +554,17 @@ esp_err_t uart_get_buffered_data_len(uart_port_t uart_num, size_t *size);
  */
 esp_err_t uart_set_rx_timeout(uart_port_t uart_num, const uint8_t tout_thresh);
 
+/**
+ * @brief Checks whether the driver is installed or not
+ *
+ * @param uart_num UART port number, the max port number is (UART_NUM_MAX -1).
+ *
+ * @return
+ *     - true  driver is installed
+ *     - false driver is not installed
+ */
+bool uart_is_driver_installed(uart_port_t uart_num);
+
 #ifdef __cplusplus
 }
 #endif

components/lwip/port/esp8266/vfs_lwip.c

@@ -21,28 +21,35 @@
 #include "esp_vfs.h"
 #include "esp_vfs_dev.h"
 #include "esp_attr.h"
-#include "esp8266/uart_struct.h"
 #include "lwip/sockets.h"
 #include "sdkconfig.h"
 #include "lwip/sys.h"
 
 _Static_assert(MAX_FDS >= CONFIG_LWIP_MAX_SOCKETS, "MAX_FDS < CONFIG_LWIP_MAX_SOCKETS");
 
-static void lwip_stop_socket_select()
+static void lwip_stop_socket_select(void *sem)
 {
-    sys_sem_signal(sys_thread_sem_get()); //socket_select will return
+    sys_sem_signal(sem); //socket_select will return
 }
 
-static void lwip_stop_socket_select_isr(BaseType_t *woken)
+static void lwip_stop_socket_select_isr(void *sem, BaseType_t *woken)
 {
-    if (sys_sem_signal_isr(sys_thread_sem_get()) && woken) {
+    if (sys_sem_signal_isr(sem) && woken) {
         *woken = pdTRUE;
     }
 }
 
-static int lwip_fcntl_r_wrapper(int fd, int cmd, va_list args)
+static void *lwip_get_socket_select_semaphore(void)
 {
-    return lwip_fcntl(fd, cmd, va_arg(args, int));
+    /* Calling this from the same process as select() will ensure that the semaphore won't be allocated from
+     * ISR (lwip_stop_socket_select_isr).
+     */
+    return (void *) sys_thread_sem_get();
+}
+
+static int lwip_fcntl_r_wrapper(int fd, int cmd, int arg)
+{
+    return lwip_fcntl(fd, cmd, arg);
 }
 
 static int lwip_ioctl_r_wrapper(int fd, int cmd, va_list args)
@@ -62,6 +69,7 @@ void esp_vfs_lwip_sockets_register(void)
         .fcntl = &lwip_fcntl_r_wrapper,
         .ioctl = &lwip_ioctl_r_wrapper,
         .socket_select = &lwip_select,
+        .get_socket_select_semaphore = &lwip_get_socket_select_semaphore,
         .stop_socket_select = &lwip_stop_socket_select,
         .stop_socket_select_isr = &lwip_stop_socket_select_isr,
     };

components/newlib/newlib/port/esp_newlib.c

@@ -18,9 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef CONFIG_USING_ESP_VFS
 #include "esp_vfs_dev.h"
-#endif
 
 #define _STR(_s)    #_s
 #define STR(_s)     _STR(_s)
@@ -56,9 +54,7 @@ int esp_newlib_init(void)
 
     esp_reent_init(_global_impure_ptr);
 
-#ifdef CONFIG_USING_ESP_VFS
     esp_vfs_dev_uart_register();
-#endif
 
     _GLOBAL_REENT->_stdout = fopen(default_uart_dev, "w");
     if (!_GLOBAL_REENT->_stdout)

components/newlib/newlib/port/select.c

@@ -15,7 +15,6 @@
 #include <sys/select.h>
 #include "sdkconfig.h"
 
-#ifdef CONFIG_USING_ESP_VFS
 #include "esp_vfs.h"
 
 #ifdef CONFIG_USE_ONLY_LWIP_SELECT
@@ -64,4 +63,3 @@ int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct
     return esp_vfs_select(nfds, readfds, writefds, errorfds, timeout);
 #endif
 }
-#endif /* CONFIG_USING_ESP_VFS */

components/newlib/newlib/port/syscall.c

@@ -16,119 +16,17 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <reent.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
+#include <sys/fcntl.h>
 
 #include "esp_libc.h"
 #include "FreeRTOS.h"
 #include "esp_log.h"
 
-#ifdef CONFIG_USING_ESP_VFS
-
 #include "esp_vfs.h"
 
-int _open_r(struct _reent *r, const char *filename, int flags, int mode)
-{
-    return esp_vfs_open(r, filename, flags, mode);
-}
-
-_ssize_t _read_r(struct _reent *r, int fd, void *buf, size_t len)
-{
-    return esp_vfs_read(r, fd, buf, len);
-}
-
-_ssize_t _write_r(struct _reent *r, int fd, const void *buf, size_t len)
-{
-    return esp_vfs_write(r, fd, buf, len);
-}
-
-_off_t _lseek_r(struct _reent *r, int fd, _off_t where, int whence)
-{
-    return esp_vfs_lseek(r, fd, where, whence);
-}
-
-int _close_r(struct _reent *r, int fd)
-{
-    return esp_vfs_close(r, fd);
-}
-
-int _rename_r(struct _reent *r, const char *from, const char *to)
-{
-    return esp_vfs_rename(r, from, to);
-}
-
-int _unlink_r(struct _reent *r, const char *filename)
-{
-    return esp_vfs_unlink(r, filename);
-}
-
-int _fstat_r(struct _reent *r, int fd, struct stat *s)
-{
-    return esp_vfs_fstat(r, fd, s);
-}
-
-int _stat_r(struct _reent *r, const char *path, struct stat *st)
-{
-    return esp_vfs_stat(r, path, st);
-}
-
-#else
-
-int _open_r(struct _reent *r, const char *filename, int flags, int mode)
-{
-    return 0;
-}
-
-_ssize_t _read_r(struct _reent *r, int fd, void *buf, size_t len)
-{
-    return 0;
-}
-
-_ssize_t _write_r(struct _reent *r, int fd, const void *buf, size_t len)
-{
-    int i;
-    const char *cbuf = buf;
-
-    for (i = 0; i < len; i++)
-        ets_putc(cbuf[i]);
-
-    return len;
-}
-
-_off_t _lseek_r(struct _reent *r, int fd, _off_t where, int whence)
-{
-    return 0;
-}
-
-int _close_r(struct _reent *r, int fd)
-{
-    return 0;
-}
-
-int _rename_r(struct _reent *r, const char *from, const char *to)
-{
-    return 0;
-}
-
-int _unlink_r(struct _reent *r, const char *filename)
-{
-    return 0;
-}
-
-int _fstat_r(struct _reent *r, int fd, struct stat *s)
-{
-    s->st_mode = S_IFCHR;
-
-    return 0;
-}
-
-int _stat_r(struct _reent *r, const char *path, struct stat *st)
-{
-    return 0;
-}
-
-#endif /* CONFIG_USING_ESP_VFS */
-
 void *_malloc_r(struct _reent *r, size_t n)
 {
     void *return_addr = (void *)__builtin_return_address(0);
@@ -184,3 +82,14 @@ int _getpid_r(struct _reent *r)
     __errno_r(r) = ENOSYS;
     return -1;
 }
+
+/* Replaces newlib fcntl, which has been compiled without HAVE_FCNTL */
+int fcntl(int fd, int cmd, ...)
+{
+    va_list args;
+    va_start(args, cmd);
+    int arg = va_arg(args, int);
+    va_end(args);
+    struct _reent* r = __getreent();
+    return _fcntl_r(r, fd, cmd, arg);
+}

components/vfs/CMakeLists.txt

@@ -1,13 +1,8 @@
-
-if(CONFIG_USING_ESP_VFS)
-    set(COMPONENT_SRCS "vfs.c"
-                       "vfs_uart.c")
-else()
-    set(COMPONENT_SRCDIRS "port")    
-endif()
-
-set(COMPONENT_ADD_INCLUDEDIRS "include")
-
-set(COMPONENT_REQUIRES "lwip")
-
-register_component()
+idf_component_register(SRCS "vfs.c"
+                            "vfs_uart.c"
+                            "vfs_semihost.c"
+                    INCLUDE_DIRS include)
+
+# Some newlib syscalls are implemented in vfs.c, make sure these are always
+# seen by the linker
+target_link_libraries(${COMPONENT_LIB} INTERFACE "-u vfs_include_syscalls_impl")

components/vfs/Kconfig

@@ -1,27 +1,34 @@
 menu "Virtual file system"
 
-config USING_ESP_VFS
-    bool "Using espressif VFS"
-    default y
-    help
-        Enable this option, espressif  VFS can be used. Users can use APIs like "open", "read", "write"
-        and so on to operate I/O device which is registered.
+    config VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
+        bool "Suppress select() related debug outputs"
+        default y
+        help
+            Select() related functions might produce an unconveniently lot of
+            debug outputs when one sets the default log level to DEBUG or higher.
+            It is possible to suppress these debug outputs by enabling this
+            option.
 
-config SUPPRESS_SELECT_DEBUG_OUTPUT
-    bool "Suppress select() related debug outputs"
-    default n
-    depends on USING_ESP_VFS
-    help
-        Select() related functions might produce an unconveniently lot of
-        debug outputs when one sets the default log level to DEBUG or higher.
-        It is possible to suppress these debug outputs by enabling this
-        option.
+    config VFS_SUPPORT_TERMIOS
+        bool "Add support for termios.h"
+        default y
+        help
+            Disabling this option can save memory when the support for termios.h is not required.
 
-config SUPPORT_TERMIOS
-    bool "Add support for termios.h"
-    default n
-    depends on USING_ESP_VFS
-    help
-        Disabling this option can save memory when the support for termios.h is not required.
+    menu "Host File System I/O (Semihosting)"
+        config SEMIHOSTFS_MAX_MOUNT_POINTS
+            int "Maximum number of the host filesystem mount points"
+            default 1
+            help
+                Define maximum number of host filesystem mount points.
+
+        config SEMIHOSTFS_HOST_PATH_MAX_LEN
+            int "Maximum path length for the host base directory"
+            default 128
+            help
+                Define maximum path length for the host base directory which is to be mounted.
+                If host path passed to esp_vfs_semihost_register() is longer than this value
+                it will be truncated.
+    endmenu
 
 endmenu