From a101e994fffe9d34c9314df8a043898a7262bd9b Mon Sep 17 00:00:00 2001 From: wlyu Date: Tue, 15 Feb 2022 16:12:49 +0800 Subject: [PATCH] changed demo task name with hump style --- .../socket_demo/lwip_tcp_socket_demo.c | 16 +++++------ .../socket_demo/lwip_udp_socket_demo.c | 20 +++++++------- .../control_app/opcua_demo/opcua_demo.c | 24 ++++++++--------- .../control_app/plc_demo/plc_demo.c | 8 +++--- .../ethernet/cmd_lwip/lwip_config_demo.c | 17 ++++++------ .../resources/ethernet/cmd_lwip/lwip_demo.h | 27 ------------------- .../ethernet/cmd_lwip/lwip_dhcp_demo.c | 8 +++--- .../ethernet/cmd_lwip/lwip_ping_demo.c | 4 +-- .../ethernet/cmd_lwip/lwip_tcp_demo.c | 14 +++++----- .../ethernet/cmd_lwip/lwip_udp_demo.c | 25 +++++++---------- 10 files changed, 65 insertions(+), 98 deletions(-) delete mode 100755 Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_demo.h diff --git a/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c b/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c index 95372addc..758e13609 100755 --- a/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c +++ b/APP_Framework/Applications/connection_app/socket_demo/lwip_tcp_socket_demo.c @@ -44,7 +44,7 @@ char tcp_socket_ip[] = {192, 168, 250, 252}; * Code ******************************************************************************/ -static void tcp_recv_demo(void *arg) +static void TCPSocketRecvTask(void *arg) { int fd = -1, clientfd; int recv_len; @@ -114,7 +114,7 @@ static void tcp_recv_demo(void *arg) } } -void tcp_socket_recv_run(int argc, char *argv[]) +void TCPSocketRecvTest(int argc, char *argv[]) { int result = 0; pthread_t th_id; @@ -127,13 +127,13 @@ void tcp_socket_recv_run(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr); - sys_thread_new("tcp_recv_demo", tcp_recv_demo, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); + sys_thread_new("TCPSocketRecvTask", TCPSocketRecvTask, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - TCPSocketRecv, tcp_socket_recv_run, TCP recv echo); + TCPSocketRecv, TCPSocketRecvTest, TCP recv echo); -static void tcp_send_demo(void *arg) +static void TCPSocketSendTask(void *arg) { int cnt = LWIP_DEMO_TIMES; int fd = -1; @@ -181,7 +181,7 @@ __exit: } -void tcp_socket_send_run(int argc, char *argv[]) +void TCPSocketSendTest(int argc, char *argv[]) { if(argc == 2) { @@ -190,9 +190,9 @@ void tcp_socket_send_run(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, tcp_socket_ip); - sys_thread_new("tcp socket", tcp_send_demo, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); + sys_thread_new("tcp socket", TCPSocketSendTask, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0), - TCPSocketSend, tcp_socket_send_run, TCP send demo); + TCPSocketSend, TCPSocketSendTest, TCP send demo); diff --git a/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c b/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c index 3b37aa5a6..eb7b6b138 100755 --- a/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c +++ b/APP_Framework/Applications/connection_app/socket_demo/lwip_udp_socket_demo.c @@ -47,9 +47,9 @@ char udp_socket_ip[] = {192, 168, 250, 252}; /******************************************************************************* * Code ******************************************************************************/ -static void udp_recv_demo(void *arg) +static void UdpSocketRecvTask(void *arg) { - lw_print("udp_recv_demo start.\n"); + lw_print("UdpSocketRecvTask start.\n"); int socket_fd = -1; char *recv_buf; @@ -109,7 +109,7 @@ static void udp_recv_demo(void *arg) } } -void udp_socket_recv_run(int argc, char *argv[]) +void UdpSocketRecvTask(int argc, char *argv[]) { int result = 0; pthread_t th_id; @@ -122,18 +122,18 @@ void udp_socket_recv_run(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr); - sys_thread_new("udp_recv_demo", udp_recv_demo, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); + sys_thread_new("UdpSocketRecvTask", UdpSocketRecvTask, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - UDPSocketRecv, udp_socket_recv_run, UDP recv echo); + UDPSocketRecv, UdpSocketRecvTask, UDP recv echo); -static void udp_send_demo(void *arg) +static void UdpSocketSendTask(void *arg) { int cnt = LWIP_DEMO_TIMES; char send_str[128]; - lw_print("udp_send_demo start.\n"); + lw_print("UdpSocketSendTask start.\n"); int socket_fd = -1; memset(send_str, 0, sizeof(send_str)); @@ -177,7 +177,7 @@ __exit: return; } -void udp_socket_send_run(int argc, char *argv[]) +void UdpSocketSendTest(int argc, char *argv[]) { int result = 0; pthread_t th_id; @@ -190,9 +190,9 @@ void udp_socket_send_run(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr); - sys_thread_new("udp_send_demo", udp_send_demo, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); + sys_thread_new("UdpSocketSendTask", UdpSocketSendTask, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - UDPSocketSend, udp_socket_send_run, UDP send echo); + UDPSocketSend, UdpSocketSendTest, UDP send echo); diff --git a/APP_Framework/Applications/control_app/opcua_demo/opcua_demo.c b/APP_Framework/Applications/control_app/opcua_demo/opcua_demo.c index 9890b96cc..a5526d093 100755 --- a/APP_Framework/Applications/control_app/opcua_demo/opcua_demo.c +++ b/APP_Framework/Applications/control_app/opcua_demo/opcua_demo.c @@ -48,7 +48,7 @@ char test_ua_ip[] = {192, 168, 250, 5}; * Code ******************************************************************************/ -static void test_ua_connect(void *arg) +static void UaConnectTestTask(void *arg) { struct netif net; UA_StatusCode retval; @@ -85,16 +85,16 @@ static void test_ua_connect(void *arg) UA_Client_delete(client); } -void test_sh_ua_connect(void *arg) +void UaConnectTest(void *arg) { lwip_config_tcp(lwip_ipaddr, lwip_netmask, test_ua_ip); - sys_thread_new("ua test", test_ua_connect, NULL, UA_STACK_SIZE, UA_TASK_PRIO); + sys_thread_new("ua test", UaConnectTestTask, NULL, UA_STACK_SIZE, UA_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0), - UaConnect, test_sh_ua_connect, Test Opc UA connection); + UaConnect, UaConnectTest, Test Opc UA connection); -void test_ua_browser_objects(void *param) +void UaBrowserObjectsTestTask(void *param) { UA_Client *client = UA_Client_new(); @@ -129,7 +129,7 @@ void test_ua_browser_objects(void *param) UA_Client_delete(client); /* Disconnects the client internally */ } -void *test_sh_ua_brower_objects(int argc, char *argv[]) +void *UaBrowserObjectsTest(int argc, char *argv[]) { if(argc == 2) { @@ -144,14 +144,14 @@ void *test_sh_ua_brower_objects(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, test_ua_ip); - sys_thread_new("ua object", test_ua_browser_objects, NULL, UA_STACK_SIZE, UA_TASK_PRIO); + sys_thread_new("ua object", UaBrowserObjectsTestTask, NULL, UA_STACK_SIZE, UA_TASK_PRIO); return NULL; } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - UaObj, test_sh_ua_brower_objects, UaObj [IP]); + UaObj, UaBrowserObjectsTest, UaObj [IP]); -void test_ua_get_info(void *param) +void UaGetInfoTestTask(void *param) { UA_Client *client = UA_Client_new(); @@ -182,7 +182,7 @@ void test_ua_get_info(void *param) UA_Client_delete(client); /* Disconnects the client internally */ } -void *test_sh_ua_get_info(int argc, char *argv[]) +void *UaGetInfoTest(int argc, char *argv[]) { if(argc == 2) { @@ -197,10 +197,10 @@ void *test_sh_ua_get_info(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, test_ua_ip); - sys_thread_new("ua info", test_ua_get_info, NULL, UA_STACK_SIZE, UA_TASK_PRIO); + sys_thread_new("ua info", UaGetInfoTestTask, NULL, UA_STACK_SIZE, UA_TASK_PRIO); return NULL; } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - UaInfo, test_sh_ua_get_info, UaInfo [IP]); + UaInfo, UaGetInfoTest, UaInfo [IP]); diff --git a/APP_Framework/Applications/control_app/plc_demo/plc_demo.c b/APP_Framework/Applications/control_app/plc_demo/plc_demo.c index 3f0b241b8..6b8621d77 100755 --- a/APP_Framework/Applications/control_app/plc_demo/plc_demo.c +++ b/APP_Framework/Applications/control_app/plc_demo/plc_demo.c @@ -69,7 +69,7 @@ void PlcTestInit(void) PlcDevRegister(&plc_demo_dev, NULL, "plc test device"); } -void PlcTestRead(void *arg) +void PlcReadUATask(void *arg) { int ret = 0; struct PlcOps *ops = NULL; @@ -101,11 +101,11 @@ void PlcTestRead(void *arg) ops->close(&plc_demo_dev); } -void PlcTestTask(int argc, char *argv[]) +void PlcReadTest(int argc, char *argv[]) { - sys_thread_new("plc read", PlcTestRead, NULL, PLC_STACK_SIZE, PLC_TASK_PRIO); + sys_thread_new("plc read", PlcReadUATask, NULL, PLC_STACK_SIZE, PLC_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - plc, PlcTestTask, test PLC); + plc, PlcReadTest, test PLC); diff --git a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_config_demo.c b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_config_demo.c index 026cf5f3c..682288efc 100755 --- a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_config_demo.c +++ b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_config_demo.c @@ -40,7 +40,6 @@ #include #include #include "connect_ethernet.h" -#include "lwip_demo.h" /******************************************************************************* * Definitions @@ -58,12 +57,12 @@ * Code ******************************************************************************/ -static void *lwip_config_test(void *param) +static void *LwipSetIPTask(void *param) { lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr); } -void lwip_setip_thread(int argc, char *argv[]) +void LwipSetIPTest(int argc, char *argv[]) { int result = 0; pthread_t th_id; @@ -85,19 +84,19 @@ void lwip_setip_thread(int argc, char *argv[]) sscanf(argv[1], "%d.%d.%d.%d", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); } - result = pthread_create(&th_id, &attr, lwip_config_test, NULL); + result = pthread_create(&th_id, &attr, LwipSetIPTask, NULL); if (0 == result) { - lw_print("lwip_config_test %d successfully!\n", th_id); + lw_print("lw: [%s] thread %d successfully!\n", __func__, th_id); } else { - lw_print("lwip_config_test failed! error code is %d\n", result); + lw_print("lw: [%s] failed! error code is %d\n", __func__, result); } } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - setip, lwip_setip_thread, SetIp [IP] [Netmask] [Gateway]); + setip, LwipSetIPTest, SetIp [IP] [Netmask] [Gateway]); -void lwip_showip_thread(int argc, char *argv[]) +void LwipShowIPTask(int argc, char *argv[]) { char mac_addr[] = configMAC_ADDR; @@ -116,6 +115,6 @@ void lwip_showip_thread(int argc, char *argv[]) } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0), - showip, lwip_showip_thread, GetIp [IP] [Netmask] [Gateway]); + showip, LwipShowIPTask, GetIp [IP] [Netmask] [Gateway]); #endif diff --git a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_demo.h b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_demo.h deleted file mode 100755 index f1077106a..000000000 --- a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_demo.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2021 AIIT XUOS Lab - * XiUOS is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -/** - * @file lwip_demo.h - * @brief lwip demo header - * @version 1.0 - * @author AIIT XUOS Lab - * @date 2022.1.18 - */ - -#ifndef __LWIP_DEMO_H__ -#define __LWIP_DEMO_H__ - -#define LWIP_TEST_STACK_SIZE 4096 -#define LWIP_TEST_TASK_PRIO 20 - -#endif /* __LWIP_DEMO_H__ */ diff --git a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c index 98960a067..108a20841 100755 --- a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c +++ b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_dhcp_demo.c @@ -62,7 +62,7 @@ * * @param netif network interface structure */ -int print_dhcp_state(struct netif *netif) +int LwipPrintDHCP(struct netif *netif) { static u8_t dhcp_last_state = DHCP_STATE_OFF; struct dhcp *dhcp = netif_dhcp_data(netif); @@ -132,7 +132,7 @@ int print_dhcp_state(struct netif *netif) /*! * @brief Main function. */ -void lwip_dhcp_test(void) +void LwipDHCPTest(void) { u32_t dhcp_time; static int flag = 0; @@ -158,7 +158,7 @@ void lwip_dhcp_test(void) sys_check_timeouts(); /* Print DHCP progress */ - if(print_dhcp_state(&gnetif)) + if(LwipPrintDHCP(&gnetif)) { sscanf(ipaddr_ntoa(&gnetif.ip_addr), "%d.%d.%d.%d", &lwip_ipaddr[0], &lwip_ipaddr[1], &lwip_ipaddr[2], &lwip_ipaddr[3]); @@ -178,6 +178,6 @@ void lwip_dhcp_test(void) SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0), - getdynip, lwip_dhcp_test, DHCP_Test); + getdynip, LwipDHCPTest, DHCP_Test); #endif diff --git a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_ping_demo.c b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_ping_demo.c index 0850f06e1..13480bdfe 100755 --- a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_ping_demo.c +++ b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_ping_demo.c @@ -60,7 +60,7 @@ ip4_addr_t ping_addr; * Code ******************************************************************************/ -void lwip_ping_thread(int argc, char *argv[]) +void LwipPingTest(int argc, char *argv[]) { int result = 0; @@ -99,6 +99,6 @@ void lwip_ping_thread(int argc, char *argv[]) } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - ping, lwip_ping_thread, ping [IP] 3 times); + ping, LwipPingTest, ping [IP] 3 times); #endif diff --git a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_tcp_demo.c b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_tcp_demo.c index baa6d4348..3fa2763e6 100755 --- a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_tcp_demo.c +++ b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_tcp_demo.c @@ -46,9 +46,9 @@ char tcp_target[] = {192, 168, 250, 252}; * Code ******************************************************************************/ -static void lwip_tcp_send_thread(void *arg) +static void LwipTcpSendTask(void *arg) { - lw_print("lwip_tcp_send_thread start.\n"); + lw_print("LwipTcpSendTask start.\n"); int fd = -1; fd = socket(AF_INET, SOCK_STREAM, 0); @@ -84,7 +84,7 @@ __exit: return; } -void lwip_tcp_send_run(int argc, char *argv[]) +void LwipTcpSendTest(int argc, char *argv[]) { memset(tcp_send_msg, 0, MSG_SIZE); if(argc >= 2) @@ -103,18 +103,18 @@ void lwip_tcp_send_run(int argc, char *argv[]) } lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr); - sys_thread_new("tcp send", lwip_tcp_send_thread, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); + sys_thread_new("tcp send", LwipTcpSendTask, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - TCPSend, lwip_tcp_send_run, TCP Send message); + TCPSend, LwipTcpSendTest, TCP Send message); -void lwip_tcp_recv_run(void) +void LwipTcpRecvTest(void) { lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr); tcpecho_raw_init(); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0), - TCPRecv, lwip_tcp_recv_run, TCP Recv message); + TCPRecv, LwipTcpRecvTest, TCP Recv message); diff --git a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_udp_demo.c b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_udp_demo.c index bfb4eb24d..ba9cf501b 100755 --- a/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_udp_demo.c +++ b/Ubiquitous/XiUOS/resources/ethernet/cmd_lwip/lwip_udp_demo.c @@ -50,7 +50,7 @@ char udp_send_msg[] = "\n\nThis one is UDP pkg. Congratulations on you.\n\n"; * Code ******************************************************************************/ -static void lwip_udp_send(void *arg) +static void LwipUDPSendTask(void *arg) { int cnt = LWIP_DEMO_TIMES; @@ -91,7 +91,7 @@ __exit: return; } -void *lwip_udp_send_run(int argc, char *argv[]) +void *LwipUdpSendTest(int argc, char *argv[]) { int result = 0; sys_thread_t th_id; @@ -115,13 +115,13 @@ void *lwip_udp_send_run(int argc, char *argv[]) lw_print("lw: [%s] gw %d.%d.%d.%d\n", __func__, udp_target[0], udp_target[1], udp_target[2], udp_target[3]); lwip_config_tcp(lwip_ipaddr, lwip_netmask, lwip_gwaddr); - sys_thread_new("udp socket send", lwip_udp_send, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); + sys_thread_new("udp socket send", LwipUDPSendTask, NULL, LWIP_TASK_STACK_SIZE, LWIP_DEMO_TASK_PRIO); } SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(3), - UDPSend, lwip_udp_send_run, UDP send echo); + UDPSend, LwipUdpSendTest, UDP send echo); -static void udpecho_raw_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, +static void LwipUdpRecvTask(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port) { int udp_len; @@ -156,10 +156,11 @@ static void udpecho_raw_recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, pbuf_free(udp_buf); } -void udpecho_raw_init(void) +void LwipUdpRecvTest(void) { err_t err; - lw_print("udpecho_raw_init\r\n"); + + lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr); udpecho_raw_pcb = udp_new_ip_type(IPADDR_TYPE_ANY); if (udpecho_raw_pcb == NULL) @@ -170,16 +171,10 @@ void udpecho_raw_init(void) err = udp_bind(udpecho_raw_pcb, IP_ANY_TYPE, LWIP_LOCAL_PORT); if (err == ERR_OK) { - udp_recv(udpecho_raw_pcb, udpecho_raw_recv, NULL); + udp_recv(udpecho_raw_pcb, LwipUdpRecvTask, NULL); } } -void lwip_udp_server(void) -{ - lwip_config_net(lwip_ipaddr, lwip_netmask, lwip_gwaddr); - udpecho_raw_init(); -} - SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) | SHELL_CMD_PARAM_NUM(0), - UDPRecv, lwip_udp_server, UDP server echo); + UDPRecv, LwipUdpRecvTest, UDP server echo);