增加文件系统

2026-07-21 00:30:59 +08:00
parent e06d849007
commit fbe0726991
50 changed files with 12921 additions and 893 deletions
--- a/Drivers/BSP/CH395F/ch395f_test.c
+++ b/Drivers/BSP/CH395F/ch395f_test.c
@@ -2,8 +2,8 @@
 * 模块名称：CH395F Driver Test Suite
 * 模块功能：CH395F 驱动各功能模块的测试入口，分阶段组织测试用例
 * 适用平台：STM32F4 系列（CH395F 以太网芯片）
- * ä½œè€…ï¼šçŽ‹å»ºï¿? * åˆ›å»ºæ—¥æœŸï¿?026-07-19
- * ä¿®æ”¹è®°å½•ï¿? *     2026-07-19  Phase 1/2/3 implemented
+ * 作者：王建<EFBFBD>? * 创建日期<E697A5>?026-07-19
+ * 修改记录<EFBFBD>? *     2026-07-19  Phase 1/2/3 implemented
 */

 /* 头文件包含区 */
@@ -18,7 +18,7 @@
 test_stats_t g_test_stats;

 /*
- * Phase 2 é…<EFBFBD>ç½®é»˜è®¤ï¿? */
+ * Phase 2 配置默认<EFBFBD>? */
 #ifndef PHASE2_REMOTE_IP
 #define PHASE2_REMOTE_IP        "192.168.1.2"
 #endif
@@ -36,7 +36,7 @@ test_stats_t g_test_stats;
 #endif

 /*
- * Phase 3 é…<EFBFBD>ç½®é»˜è®¤ï¿? */
+ * Phase 3 配置默认<EFBFBD>? */
 #ifndef PHASE3_REMOTE_IP
 #define PHASE3_REMOTE_IP        "192.168.1.2"
 #endif
@@ -54,9 +54,9 @@ test_stats_t g_test_stats;
 #endif

 /*
- * å‡½æ•°åŠŸèƒ½ï¼šæ<EFBFBD>¢ï¿?TCP Server å¤šè¿žæŽ¥æ¨¡å¼<C3A5>çš„æ•°æ<C2B0>® Socket é…<EFBFBD>ç½®
+ * 函数功能：恢<EFBFBD>?TCP Server 多连接模式的数据 Socket 配置
 * 入口参数：port - TCP 源端口号
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šCH395F å<><C3A5>è®®æ ˆå·²åˆ<C3A5>å§‹ï¿? * å‡½æ•°è¯´æ˜Žï¼šé‡<C3A9>æ–°è®¾ç½®æ•°ï¿?Socket çš„å<E2809E><C3A5>è®®ç±»åž‹å’Œæº<C3A6>ç«¯ï¿? */
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：CH395F 协议栈已初始<E5889D>? * 函数说明：重新设置数<E7BDAE>?Socket 的协议类型和源端<E6BA90>? */
 static void restore_data_sockets(uint16_t port) {
    int i = 0;
    for (i = NET_TCP_SERVER_DATA_SOCK_START; i < NET_MAX_SOCKETS; i++) {
@@ -70,8 +70,8 @@ static void restore_data_sockets(uint16_t port) {
 * ============================ Phase 1 ============================
 * 函数功能：寄存器读写 + 中断一致性基础测试
 * 入口参数：无
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šCH395F èŠ¯ç‰‡æ£å¸¸åº”ç”
- * å‡½æ•°è¯´æ˜Žï¼šåŒ…ï¿?GET_VERSION / GET_CMD_STATUS / GET_IP_INF ï¿?9 ï¿? */
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：CH395F 芯片正常应答
+ * 函数说明：包<EFBFBD>?GET_VERSION / GET_CMD_STATUS / GET_IP_INF <EFBFBD>?9 <EFBFBD>? */

 void ch395f_phase1_tests(void) {
    uint8_t i = 0;
@@ -112,7 +112,7 @@ void ch395f_phase1_tests(void) {
               "GINT_STATUS_ALL: 0x%04X (lo=0x%02X hi=0x%02X)",
               gint_all, gint_all & 0xFF, (gint_all >> 8) & 0xFF);

-    /* Test 5: GINT_STATUS (1-byte version) ï¿?read-clear check */
+    /* Test 5: GINT_STATUS (1-byte version) <EFBFBD>?read-clear check */
    uint8_t gint_1b = ch395f_get_glob_int_status();
    TEST_CHECK(gint_1b == 0x00,
               "GINT_STATUS_1byte: 0x%02X (expect 0x00 after read-clear)", gint_1b);
@@ -146,8 +146,8 @@ void ch395f_phase1_tests(void) {

 /*
 * ============================ Phase 2 ============================
- * å‡½æ•°åŠŸèƒ½ï¼šTCP Client æ”¶å<C2B6>‘ + å…³é—é‡<C3A9>è¿ž Ã—3 ï¿? * å…¥å<C2A5>£å<C2A3>‚æ•°ï¼šæ— 
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šPC ç«¯å·²å<C2B2>¯åŠ¨ TCP Serverï¼ˆé»˜ï¿?192.168.1.2:8081ï¿? * å‡½æ•°è¯´æ˜Žï¼šæ¯<EFBFBD>è½®è¿žæŽ¥â†’å<EFBFBD>‘é€<EFBFBD>â†’æŽ¥æ”¶â†’å…³é—ï¼Œè¿žç» 3 ï¿? */
+ * 函数功能：TCP Client 收发 + 关闭重连 ×3 <20>? * 入口参数：无
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：PC 端已启动 TCP Server（默<EFBFBD>?192.168.1.2:8081<EFBFBD>? * 函数说明：每轮连接→发送→接收→关闭，连续 3 <EFBFBD>? */

 void ch395f_phase2_tests(void) {
    uint8_t sock = 0;
@@ -174,7 +174,7 @@ void ch395f_phase2_tests(void) {

    sock = (uint8_t)(NET_MAX_SOCKETS - 1);

-    /* ä¸€æ¬¡æ€§é…<EFBFBD>ï¿?*/
+    /* 一次性配<EFBFBD>?*/
    ch395f_set_proto_type(sock, CH395F_PROTO_TYPE_TCP);
    ch395f_set_send_buf(sock, 28, 2);
    ch395f_set_recv_buf(sock, 30, 2);
@@ -204,7 +204,7 @@ void ch395f_phase2_tests(void) {

        HAL_Delay(100);

-        /* å<EFBFBD>‘é€<EFBFBD>æµ‹è¯•æ•°ï¿?*/
+        /* 发送测试数<EFBFBD>?*/
        {
            uint8_t test_buf[64] = {0};
            const char *msg = "HelloFromCH395F_TCP_Client! This is a 64-byte test message.";
@@ -214,7 +214,7 @@ void ch395f_phase2_tests(void) {
            ch395f_write_send_buf(sock, test_buf, 64);
        }

-        /* Echo å¾ªçŽ¯ï¼šæ”¶æ•°æ<EFBFBD>® ï¿?å›žå<C5BE>‘ */
+        /* Echo 循环：收数据 <20>?回发 */
        {
            int got_echo = 0;
            tick = HAL_GetTick();
@@ -266,7 +266,7 @@ phase2_iter_done:
 * ============================ Phase 3 ============================
 * 函数功能：UDP Server Echo + PING + 大包测试
 * 入口参数：无
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šPC ç«¯å·²å<C2B2>¯åŠ¨ UDP Clientï¼ˆé»˜ï¿?192.168.1.2:8082ï¿? * å‡½æ•°è¯´æ˜Žï¼šåŒ…ï¿?20 æ¬¡å›žæ˜¾ï¿½? ï¿?PINGï¿?0 æ¬¡å¤§åŒ…æ”¶ï¿? */
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：PC 端已启动 UDP Client（默<EFBFBD>?192.168.1.2:8082<EFBFBD>? * 函数说明：包<EFBFBD>?20 次回显<E59B9E>? <20>?PING<EFBFBD>?0 次大包收<EFBFBD>? */

 void ch395f_phase3_tests(void) {
    uint8_t sock = 0;
@@ -279,7 +279,7 @@ void ch395f_phase3_tests(void) {

    sock = (uint8_t)(NET_MAX_SOCKETS - 1);

-    /* UDP Server æ¨¡å¼<EFBFBD>ï¼šDesIP=0xFFFFFFFF ï¿?æŽ¥å<C2A5>—ä»»æ„<C3A6>æ<EFBFBD>¥æº<C3A6> */
+    /* UDP Server 模式：DesIP=0xFFFFFFFF <EFBFBD>?接受任意来源 */
    ch395f_set_proto_type(sock, CH395F_PROTO_TYPE_UDP);
    ch395f_set_send_buf(sock, 28, 2);
    ch395f_set_recv_buf(sock, 30, 2);
@@ -295,7 +295,7 @@ void ch395f_phase3_tests(void) {

    HAL_Delay(200);

-    /* Echo å¾ªçŽ¯ï¼šæ”¶ï¿?ï¿?è§£æž<C3A6>æ<EFBFBD>¥æº<C3A6> ï¿?å›žæ˜¾ */
+    /* Echo 循环：收<EFBFBD>?<3F>?解析来源 <20>?回显 */
    for (i = 0; i < PHASE3_ECHO_COUNT; i++) {
        tick = HAL_GetTick();
        echo_ok = 0;
@@ -348,7 +348,7 @@ void ch395f_phase3_tests(void) {

 /*
 * ============================ Phase 4 ============================
- * NET ï¿?TCP Echoï¼šåœ¨ä¸»å¾ªçŽ¯ä¸è°ƒç”¨ï¼Œç”¨ net_recv + net_send å›žæ˜¾
+ * NET <EFBFBD>?TCP Echo：在主循环中调用，用 net_recv + net_send 回显
 */

 #ifdef ENABLE_PHASE4_TESTS
@@ -356,9 +356,9 @@ static char s_phase4_buf[2048];
 #endif

 /*
- * å‡½æ•°åŠŸèƒ½ï¼šNET ï¿?TCP Echo æµ‹è¯•
+ * 函数功能：NET <EFBFBD>?TCP Echo 测试
 * 入口参数：无
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šnet_init å·²å®Œï¿? * å‡½æ•°è¯´æ˜Žï¼šåœ¨ netTask ä¸è¿<C3A8>è¡Œï¼Œè½®è¯¢ Socket 1~7 å›žæ˜¾æŽ¥æ”¶æ•°æ<C2B0>®
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：net_init 已完<E5B7B2>? * 函数说明：在 netTask 中运行，轮询 Socket 1~7 回显接收数据
 */
 void ch395f_phase4_tests(void) {
 #ifdef ENABLE_PHASE4_TESTS
@@ -368,9 +368,9 @@ void ch395f_phase4_tests(void) {
            continue;
        }

-        int n = net_recv(i, s_phase4_buf, sizeof(s_phase4_buf), NET_MSG_DONTWAIT);
+        int n = net_recv_sock(sk, s_phase4_buf, sizeof(s_phase4_buf), NET_MSG_DONTWAIT);
        if (n > 0) {
-            net_send(i, s_phase4_buf, n, 0);
+            net_send_sock(sk, s_phase4_buf, n);
        }
    }
 #endif
@@ -378,7 +378,7 @@ void ch395f_phase4_tests(void) {

 /*
 * ============================ Phase 5 ============================
- * NET ï¿?UDP Echoï¼šnetTask ä¸è¿<EFBFBD>è¡Œï¼Œï¿?net_recvfrom + net_sendto å›žæ˜¾
+ * NET <EFBFBD>?UDP Echo：netTask 中运行，<EFBFBD>?net_recvfrom + net_sendto 回显
 */

 #ifndef PHASE5_LOCAL_PORT
@@ -392,8 +392,8 @@ static uint32_t s_phase5_count = 0;
 #endif

 /*
- * å‡½æ•°åŠŸèƒ½ï¼šNET ï¿?UDP Echo åˆ<EFBFBD>å§‹ï¿? * å…¥å<C2A5>£å<C2A3>‚æ•°ï¼šæ— 
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šnet_init å·²å®Œï¿? * å‡½æ•°è¯´æ˜Žï¼šåˆ›ï¿?UDP Socket å¹¶ç»‘å®šæœ¬åœ°ç«¯ï¿? */
+ * 函数功能：NET <EFBFBD>?UDP Echo 初始<EFBFBD>? * 入口参数：无
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：net_init 已完<E5B7B2>? * 函数说明：创<EFBC9A>?UDP Socket 并绑定本地端<E59CB0>? */
 void ch395f_phase5_init(void) {
 #ifdef ENABLE_PHASE5_TESTS
    struct net_sockaddr_in addr;
@@ -410,7 +410,7 @@ void ch395f_phase5_init(void) {

    if (net_bind(s_phase5_sock, (struct net_sockaddr *)&addr, sizeof(addr)) < 0) {
        DBG_ERROR("Phase5: net_bind failed");
-        net_close(s_phase5_sock);
+        net_close_sock(net_get_sock(s_phase5_sock));
        s_phase5_sock = -1;
        return;
    }
@@ -421,9 +421,9 @@ void ch395f_phase5_init(void) {
 }

 /*
- * å‡½æ•°åŠŸèƒ½ï¼šNET ï¿?UDP Echo æµ‹è¯•
+ * 函数功能：NET <EFBFBD>?UDP Echo 测试
 * 入口参数：无
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šch395f_phase5_init å·²æˆ<C3A6>åŠŸè°ƒï¿? * å‡½æ•°è¯´æ˜Žï¼šåœ¨ netTask ä¸è¿<C3A8>è¡Œï¼Œå›žæ˜¾ UDP æŽ¥æ”¶æ•°æ<C2B0>®
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：ch395f_phase5_init 已成功调<E58A9F>? * 函数说明：在 netTask 中运行，回显 UDP 接收数据
 */
 void ch395f_phase5_tests(void) {
 #ifdef ENABLE_PHASE5_TESTS
@@ -445,7 +445,7 @@ void ch395f_phase5_tests(void) {
 }

 /*
- * Phase 6 é…<EFBFBD>ç½®é»˜è®¤ï¿? */
+ * Phase 6 配置默认<EFBFBD>? */
 #ifndef PHASE6_ANNOUNCE_PORT
 #define PHASE6_ANNOUNCE_PORT    60001
 #endif
@@ -457,8 +457,8 @@ void ch395f_phase5_tests(void) {
 * ============================ Phase 6 ============================
 * 函数功能：DHCP 自动获取 IP 测试
 * 入口参数：无
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šå±€åŸŸç½‘å†…å˜ï¿?DHCP Server
- * å‡½æ•°è¯´æ˜Žï¼šå<EFBFBD>¯ï¿?DHCP ï¿?è½®è¯¢ç‰å¾… IP ï¿?æ‰“å<E2809C>°ç»“æžœ ï¿?å¹¿æ’å®£å‘Š ï¿?HELLO å›žæ˜¾
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：局域网内存<E58685>?DHCP Server
+ * 函数说明：启<EFBFBD>?DHCP <20>?轮询等待 IP <20>?打印结果 <20>?广播宣告 <20>?HELLO 回显
 */

 void ch395f_phase6_tests(void) {
@@ -498,7 +498,7 @@ void ch395f_phase6_tests(void) {
        goto phase6_end;
    }

-    /* 3. è¯»å<EFBFBD>–èŽ·å<EFBFBD>–ï¿?IP */
+    /* 3. 读取获取<EFBFBD>?IP */
    ch395f_get_ip_inf(ip_info);
    DBG_INFO("  IP:   %d.%d.%d.%d", ip_info[0], ip_info[1], ip_info[2], ip_info[3]);
    DBG_INFO("  GW:   %d.%d.%d.%d", ip_info[4], ip_info[5], ip_info[6], ip_info[7]);
@@ -515,7 +515,7 @@ void ch395f_phase6_tests(void) {
        uint8_t bcast_ip[4] = {0xFF, 0xFF, 0xFF, 0xFF};
        uint8_t rx_buf[64] = {0};

-        /* UDP Server æ¨¡å¼<EFBFBD>ï¼šæœ¬åœ°ç«¯ï¿?60000ï¼ˆæŽ¥ï¿?HELLOï¼‰ï¼ŒDesIP=0xFFFFFFFF */
+        /* UDP Server 模式：本地端<EFBFBD>?60000（接<EFBC88>?HELLO），DesIP=0xFFFFFFFF */
        ch395f_set_proto_type(anno_sock, CH395F_PROTO_TYPE_UDP);
        ch395f_set_send_buf(anno_sock, 24, 2);
        ch395f_set_recv_buf(anno_sock, 26, 2);
@@ -524,7 +524,7 @@ void ch395f_phase6_tests(void) {
        ch395f_set_des_port(anno_sock, 0);

        if (ch395f_open_socket(anno_sock) == CH395F_ERR_SUCCESS) {
-            /* å<EFBFBD>‘é€<EFBFBD>å¹¿æ’å®£å‘Šï¼ˆå®£å‘Šç«¯å<EFBFBD>£ = 60001ï¼Œæ<C592>¥æº<C3A6>ç«¯ï¿?= 60000ï¿?*/
+            /* 发送广播宣告（宣告端口 = 60001，来源端<E6BA90>?= 60000<EFBFBD>?*/
            ch395f_set_des_ip(anno_sock, bcast_ip);
            ch395f_set_des_port(anno_sock, PHASE6_ANNOUNCE_PORT);
            ch395f_write_send_buf(anno_sock, ip_info, 4);
@@ -546,14 +546,14 @@ void ch395f_phase6_tests(void) {
                     PHASE6_HELLO_PORT, PHASE6_ANNOUNCE_PORT);
            TEST_CHECK(1, "DHCP announcement sent");

-            /* é‡<EFBFBD>ç½® Server æ¨¡å¼<EFBFBD>ï¼Œç‰ï¿?PC å<>‘ï¿½?HELLO */
+            /* 重置 Server 模式，等<EFBFBD>?PC 发<>?HELLO */
            ch395f_set_des_ip(anno_sock, bcast_ip);
            ch395f_set_des_port(anno_sock, 0);

            uint32_t wait = HAL_GetTick();
            uint8_t hello_ok = 0;
            while (HAL_GetTick() - wait < 5000) {
-                /* è¯»å<EFBFBD>–å…¨å±€ä¸æ–ï¼ˆåˆ·ï¿?socket ä¸æ–çŠ¶æ€<C3A6>ï¼‰ */
+                /* 读取全局中断（刷<EFBFBD>?socket 中断状态） */
                ch395f_get_glob_int_status_all();
                uint16_t rlen = ch395f_get_recv_len(anno_sock);
                if (rlen > 8) {
@@ -593,7 +593,7 @@ phase6_end:

 /*
 * ============================ Phase 7 ============================
- * Select/Poll I/O å¤šè·¯å¤<EFBFBD>ç”¨æµ‹è¯• ï¿?net_select() + net_recv/send echo
+ * Select/Poll I/O 多路复用测试 <20>?net_select() + net_recv/send echo
 */

 #include "net_select.h"
@@ -605,7 +605,7 @@ static char s_phase7_buf[2048];
 /*
 * 函数功能：Select/Poll I/O 多路复用测试
 * 入口参数：无
- * ï¿?ï¿?å€¼ï¼šï¿? * é™<C3A9>å®šæ<C5A1>¡ä»¶ï¼šnet_init å·²å®Œæˆ<C3A6>ï¼Œå¤šè¿žï¿?TCP Server å·²å<C2B2>¯ï¿? * å‡½æ•°è¯´æ˜Žï¼šåœ¨ netTask ä¸è¿<C3A8>è¡Œï¼ŒéªŒè¯<C3A8> select/poll æ£ç¡®è¿”å›žè¯»å†™äº‹ä»¶
+ * <EFBFBD>?<3F>?值：<E580BC>? * 限定条件：net_init 已完成，多连<E5A49A>?TCP Server 已启<E5B7B2>? * 函数说明：在 netTask 中运行，验证 select/poll 正确返回读写事件
 */
 void ch395f_phase7_tests(void) {
 #ifdef ENABLE_PHASE7_TESTS
@@ -630,11 +630,12 @@ void ch395f_phase7_tests(void) {
    if (n <= 0) return;

    for (int i = 0; i < NET_MAX_SOCKETS; i++) {
-        if (!NET_FD_ISSET(i, &readfds)) continue;
+        net_sock_t *sk = net_get_sock(i);
+        if (!sk || !NET_FD_ISSET(i, &readfds)) continue;

-        int len = net_recv(i, s_phase7_buf, sizeof(s_phase7_buf), NET_MSG_DONTWAIT);
+        int len = net_recv_sock(sk, s_phase7_buf, sizeof(s_phase7_buf), NET_MSG_DONTWAIT);
        if (len > 0) {
-            net_send(i, s_phase7_buf, len, 0);
+            net_send_sock(sk, s_phase7_buf, len);
            s_phase7_count++;
            TEST_CHECK(1, "Phase7: select echo #%lu (sock=%d, %d bytes)", s_phase7_count, i, len);
        }