From e3cb10835ca155567a1d0501d2e23ebde05dff97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Rohl=C3=ADnek?=
 <tomas.rohlinek@espressif.com>
Date: Wed, 3 Dec 2025 14:09:25 +0100
Subject: [PATCH] feat(storage/vfs): Make lwip specific API private

---
 components/lwip/port/esp32xx/vfs_lwip.c     |  1 +
 components/vfs/include/esp_private/socket.h | 34 +++++++++++++++++++++
 components/vfs/include/esp_vfs.h            | 17 -----------
 components/vfs/test_apps/main/test_vfs_fd.c |  1 +
 components/vfs/vfs.c                        |  2 +-
 components/vfs/vfs_calls.c                  |  1 +
 6 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 components/vfs/include/esp_private/socket.h

diff --git a/components/lwip/port/esp32xx/vfs_lwip.c b/components/lwip/port/esp32xx/vfs_lwip.c
index d59922d594..c4c42d8220 100644
--- a/components/lwip/port/esp32xx/vfs_lwip.c
+++ b/components/lwip/port/esp32xx/vfs_lwip.c
@@ -13,6 +13,7 @@
 #include <sys/select.h>
 #include "esp_attr.h"
 #include "esp_vfs.h"
+#include "esp_private/socket.h"
 #include "sdkconfig.h"
 #include "lwip/sockets.h"
 #include "lwip/sys.h"
diff --git a/components/vfs/include/esp_private/socket.h b/components/vfs/include/esp_private/socket.h
new file mode 100644
index 0000000000..fad5bf5114
--- /dev/null
+++ b/components/vfs/include/esp_private/socket.h
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include "esp_vfs.h"
+#include "esp_err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Special case function for registering a VFS that uses a method other than
+ * open() to open new file descriptors from the interval <min_fd; max_fd).
+ *
+ * This is a special-purpose function intended for registering LWIP sockets to VFS.
+ *
+ * @param vfs Pointer to esp_vfs_fs_ops_t. Meaning is the same as for esp_vfs_register_fs().
+ * @param ctx Pointer to context structure. Meaning is the same as for esp_vfs_register_fs().
+ * @param min_fd The smallest file descriptor this VFS will use.
+ * @param max_fd Upper boundary for file descriptors this VFS will use (the biggest file descriptor plus one).
+ *
+ * @return  ESP_OK if successful,
+ *          ESP_ERR_NO_MEM if too many VFSes are registered,
+ *          ESP_ERR_INVALID_ARG if the file descriptor boundaries are incorrect.
+ */
+esp_err_t esp_vfs_register_fd_range(const esp_vfs_fs_ops_t *vfs, int flags, void *ctx, int min_fd, int max_fd);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/components/vfs/include/esp_vfs.h b/components/vfs/include/esp_vfs.h
index 9f7cc88cb2..e117557c40 100644
--- a/components/vfs/include/esp_vfs.h
+++ b/components/vfs/include/esp_vfs.h
@@ -275,23 +275,6 @@ typedef struct
  */
 esp_err_t esp_vfs_register(const char* base_path, const esp_vfs_t* vfs, void* ctx);
 
-/**
- * Special case function for registering a VFS that uses a method other than
- * open() to open new file descriptors from the interval <min_fd; max_fd).
- *
- * This is a special-purpose function intended for registering LWIP sockets to VFS.
- *
- * @param vfs Pointer to esp_vfs_t. Meaning is the same as for esp_vfs_register().
- * @param ctx Pointer to context structure. Meaning is the same as for esp_vfs_register().
- * @param min_fd The smallest file descriptor this VFS will use.
- * @param max_fd Upper boundary for file descriptors this VFS will use (the biggest file descriptor plus one).
- *
- * @return  ESP_OK if successful, ESP_ERR_NO_MEM if too many VFSes are
- *          registered, ESP_ERR_INVALID_ARG if the file descriptor boundaries
- *          are incorrect.
- */
-esp_err_t esp_vfs_register_fd_range(const esp_vfs_fs_ops_t *vfs, int flags, void *ctx, int min_fd, int max_fd);
-
 /**
  * Special case function for registering a VFS that uses a method other than
  * open() to open new file descriptors. In comparison with
diff --git a/components/vfs/test_apps/main/test_vfs_fd.c b/components/vfs/test_apps/main/test_vfs_fd.c
index 904e864032..a8c6932dcc 100644
--- a/components/vfs/test_apps/main/test_vfs_fd.c
+++ b/components/vfs/test_apps/main/test_vfs_fd.c
@@ -15,6 +15,7 @@
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "esp_vfs.h"
+#include "esp_private/socket.h"
 #include "unity.h"
 #include "esp_log.h"
 #include "test_utils.h"
diff --git a/components/vfs/vfs.c b/components/vfs/vfs.c
index 9aef5b2136..3aa2e87c61 100644
--- a/components/vfs/vfs.c
+++ b/components/vfs/vfs.c
@@ -19,7 +19,7 @@
 #include "freertos/semphr.h"
 #include "esp_vfs.h"
 #include "esp_vfs_private.h"
-#include "include/esp_vfs.h"
+#include "esp_private/socket.h"
 #include "sdkconfig.h"
 
 // Warn about using deprecated option
diff --git a/components/vfs/vfs_calls.c b/components/vfs/vfs_calls.c
index 2c50e1eb50..bdc7acb9a8 100644
--- a/components/vfs/vfs_calls.c
+++ b/components/vfs/vfs_calls.c
@@ -19,6 +19,7 @@
 #include "freertos/semphr.h"
 #include "esp_log.h"
 #include "esp_vfs.h"
+#include "esp_private/socket.h"
 #include "esp_vfs_private.h"
 #include "esp_vfs_utils.h"
 #include "sdkconfig.h"