yystopf
/
xiuos
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix bug: config_w5500_network

This commit is contained in:
TXuian 2022-11-25 17:08:41 +08:00
parent a6ed20e9b5
commit 91fef32f7f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Ubiquitous/XiZi_IIoT/board/xidatong-riscv64/third_party_driver/ethernet/connect_w5500.c
View File

@ -456,18 +456,18 @@ void ifconfig() {
ctlnetwork(CN_GET_NETINFO, (void *)&wiz_netinfo); ctlnetwork(CN_GET_NETINFO, (void *)&wiz_netinfo);
uint8_t tmpstr[6]; uint8_t tmpstr[6];
ctlwizchip(CW_GET_ID, (void *)tmpstr); ctlwizchip(CW_GET_ID, (void *)tmpstr);
KPrintf("=== %s NET CONF ===\r\n", (char *)tmpstr); KPrintf("===== %s NET CONF =====\r\n", (char *)tmpstr);
KPrintf("MAC: %02X:%02X:%02X:%02X:%02X:%02X\r\n", wiz_netinfo.mac[0], KPrintf("[W5500] MAC: %02X:%02X:%02X:%02X:%02X:%02X\r\n", wiz_netinfo.mac[0],
wiz_netinfo.mac[1], wiz_netinfo.mac[2], wiz_netinfo.mac[3], wiz_netinfo.mac[1], wiz_netinfo.mac[2], wiz_netinfo.mac[3],
wiz_netinfo.mac[4], wiz_netinfo.mac[5]); wiz_netinfo.mac[4], wiz_netinfo.mac[5]);
KPrintf("SIP: %d.%d.%d.%d\r\n", wiz_netinfo.ip[0], wiz_netinfo.ip[1], KPrintf("[W5500] SIP: %d.%d.%d.%d\r\n", wiz_netinfo.ip[0], wiz_netinfo.ip[1],
wiz_netinfo.ip[2], wiz_netinfo.ip[3]); wiz_netinfo.ip[2], wiz_netinfo.ip[3]);
KPrintf("GAR: %d.%d.%d.%d\r\n", wiz_netinfo.gw[0], wiz_netinfo.gw[1], KPrintf("[W5500] GAR: %d.%d.%d.%d\r\n", wiz_netinfo.gw[0], wiz_netinfo.gw[1],
wiz_netinfo.gw[2], wiz_netinfo.gw[3]); wiz_netinfo.gw[2], wiz_netinfo.gw[3]);
KPrintf("SUB: %d.%d.%d.%d\r\n", wiz_netinfo.sn[0], wiz_netinfo.sn[1], KPrintf("[W5500] SUB: %d.%d.%d.%d\r\n", wiz_netinfo.sn[0], wiz_netinfo.sn[1],
wiz_netinfo.sn[2], wiz_netinfo.sn[3]); wiz_netinfo.sn[2], wiz_netinfo.sn[3]);
KPrintf("DNS: %d.%d.%d.%d\r\n", wiz_netinfo.dns[0], wiz_netinfo.dns[1], KPrintf("[W5500] DNS: %d.%d.%d.%d\r\n", wiz_netinfo.dns[0],
wiz_netinfo.dns[2], wiz_netinfo.dns[3]); wiz_netinfo.dns[1], wiz_netinfo.dns[2], wiz_netinfo.dns[3]);
KPrintf("======================\r\n"); KPrintf("======================\r\n");
} }
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC), SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC),
@ -483,7 +483,7 @@ char *network_param_name[] = {"ip", "sn", "gw"};
void config_w5500_network(int argc, char *argv[]) { void config_w5500_network(int argc, char *argv[]) {
if (argc < 2) { if (argc < 2) {
KPrintf("[W5500] Network config require params."); KPrintf("[W5500] Network config require params.\n");
return; return;
} }
@ -494,7 +494,7 @@ void config_w5500_network(int argc, char *argv[]) {
while (argv[cur_arg_idx] != NULL) { while (argv[cur_arg_idx] != NULL) {
if (argv[cur_arg_idx + 1] == NULL) { if (argv[cur_arg_idx + 1] == NULL) {
KPrintf("[W5500] Network config %s requires value.", argv[cur_arg_idx]); KPrintf("[W5500] Network config %s requires value.\n", argv[cur_arg_idx]);
return; return;
} }
uint32_t tmp_arr[4]; uint32_t tmp_arr[4];
@ -510,13 +510,13 @@ void config_w5500_network(int argc, char *argv[]) {
2 * sizeof(char)) == 0) { 2 * sizeof(char)) == 0) {
char_arr_assign(wiz_netinfo.gw, tmp_arr, 4); char_arr_assign(wiz_netinfo.gw, tmp_arr, 4);
} else { } else {
KPrintf("[W5500] Invalid network param."); KPrintf("[W5500] Invalid network param.\n");
} }
cur_arg_idx += 2; cur_arg_idx += 2;
} }
ctlnetwork(CN_SET_NETINFO, (void *)&wiz_netinfo); ctlnetwork(CN_SET_NETINFO, (void *)&wiz_netinfo);
KPrintf("[W5500] Network config success.", argv[cur_arg_idx]); KPrintf("[W5500] Network config success.\n", argv[cur_arg_idx]);
ifconfig(); ifconfig();
} }
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN), SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),