fix configure network problem and configure fpio for w5500

Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/ethernet/connect_w5500.c

@@ -26,9 +26,9 @@ const uint32_t socket_tcp = 0;
 const uint32_t g_wiznet_buf_size = 2048;
 
 static wiz_NetInfo g_wiz_netinfo = {.mac = {0x00, 0x08, 0xdc, 0x11, 0x11, 0x11},
-                                    .ip = {192, 168, 31, 13},
+                                    .ip = {192, 168, 131, 42},
-                                    .sn = {255, 255, 255, 0},
+                                    .sn = {255, 255, 254, 0},
-                                    .gw = {192, 168, 31, 1},
+                                    .gw = {192, 168, 130, 1},
                                     .dns = {0, 0, 0, 0},
                                     .dhcp = NETINFO_STATIC};
 
@@ -473,33 +473,52 @@ void ifconfig() {
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC),
                  ifconfig, ifconfig, printf w5500 configurations);
 
-void char_arr_assign(uint8_t **dst, uint32_t *src, uint32_t len) {
+void char_arr_assign(uint8_t *dst, uint32_t *src, int len) {
   for (int i = 0; i < len; ++i) {
-    (*dst)[i] = (uint8_t)(src[i]);
+    dst[i] = (uint8_t)(src[i]);
   }
 }
 
-void config_w5500_network(char *mac, char *ip, char *sn, char *gw, char *dns) {
+char *network_param_name[] = {"ip", "sn", "gw"};
+
+void config_w5500_network(int argc, char *argv[]) {
+  if (argc < 2) {
+    KPrintf("[W5500] Network config require params.\n");
+    return;
+  }
+
   wiz_NetInfo wiz_netinfo;
-  uint32_t tmp_arr[4];
+  memcpy(&wiz_netinfo, &g_wiz_netinfo, sizeof(wiz_NetInfo));
-  // config netinfo
+
-  sscanf(mac, "%d.%d.%d.%d", &tmp_arr[0], &tmp_arr[1], &tmp_arr[2],
+  int cur_arg_idx = 1;
-         &tmp_arr[3]);
+
-  char_arr_assign((uint8_t **)&wiz_netinfo.mac, tmp_arr, 4);
+  while (argv[cur_arg_idx] != NULL) {
-  sscanf(ip, "%d.%d.%d.%d", &tmp_arr[0], &tmp_arr[1], &tmp_arr[2], &tmp_arr[3]);
+    if (argv[cur_arg_idx + 1] == NULL) {
-  char_arr_assign((uint8_t **)&wiz_netinfo.ip, tmp_arr, 4);
+      KPrintf("[W5500] Network config %s requires value.\n", argv[cur_arg_idx]);
-  sscanf(sn, "%d.%d.%d.%d", &tmp_arr[0], &tmp_arr[1], &tmp_arr[2], &tmp_arr[3]);
+      return;
-  char_arr_assign((uint8_t **)&wiz_netinfo.sn, tmp_arr, 4);
+    }
-  sscanf(gw, "%d.%d.%d.%d", &tmp_arr[0], &tmp_arr[1], &tmp_arr[2], &tmp_arr[3]);
+    uint32_t tmp_arr[4];
-  char_arr_assign((uint8_t **)&wiz_netinfo.gw, tmp_arr, 4);
+    sscanf(argv[cur_arg_idx + 1], "%d.%d.%d.%d", &tmp_arr[0], &tmp_arr[1],
-  sscanf(dns, "%d.%d.%d.%d", &tmp_arr[0], &tmp_arr[1], &tmp_arr[2],
+           &tmp_arr[2], &tmp_arr[3]);
-         &tmp_arr[3]);
+    if (memcmp(argv[cur_arg_idx], network_param_name[0], 2 * sizeof(char)) ==
-  char_arr_assign((uint8_t **)&wiz_netinfo.dns, tmp_arr, 4);
+        0) {
-  // set new netinfo
+      char_arr_assign(wiz_netinfo.ip, tmp_arr, 4);
+    } else if (memcmp(argv[cur_arg_idx], network_param_name[1],
+                      2 * sizeof(char)) == 0) {
+      char_arr_assign(wiz_netinfo.sn, tmp_arr, 4);
+    } else if (memcmp(argv[cur_arg_idx], network_param_name[2],
+                      2 * sizeof(char)) == 0) {
+      char_arr_assign(wiz_netinfo.gw, tmp_arr, 4);
+    } else {
+      KPrintf("[W5500] Invalid network param.\n");
+    }
+    cur_arg_idx += 2;
+  }
+
   ctlnetwork(CN_SET_NETINFO, (void *)&wiz_netinfo);
+  KPrintf("[W5500] Network config success.\n", argv[cur_arg_idx]);
   ifconfig();
 }
-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_MAIN),
-                     SHELL_CMD_PARAM_NUM(5),
                  config_w5500_network, config_w5500_network,
                  set w5500 configurations);

Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/gpio/drv_io_config.c

@@ -50,6 +50,11 @@ static struct io_config
     IOCONFIG(BSP_LCD_RST_PIN, HS_GPIO(FPIOA_LCD_RST)),     
 #endif
 
+#ifdef BSP_USING_W5500
+    IOCONFIG(BSP_WIZ_RST_PIN, HS_GPIO(WIZ_RST_PIN)),
+    IOCONFIG(BSP_WIZ_INT_PIN, HS_GPIO(WIZ_INT_PIN)),
+#endif
+
 #ifdef BSP_USING_SPI1
     IOCONFIG(BSP_SPI1_CLK_PIN, FUNC_SPI1_SCLK),
     IOCONFIG(BSP_SPI1_D0_PIN, FUNC_SPI1_D0),

Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/include/drv_io_config.h

@@ -47,7 +47,8 @@ enum HS_GPIO_CONFIG {
     SPI1_CS3_PIN,
 #endif
 #ifdef BSP_USING_W5500
-    WIZ_RST_PIN, WIZ_INT_PIN,
+    WIZ_RST_PIN,
+    WIZ_INT_PIN,
 #endif
     GPIO_ALLOC_START /* index of gpio driver start */
 }

Ubiquitous/XiZi_IIoT/board/edu-riscv64/third_party_driver/spi/Kconfig

@@ -12,13 +12,13 @@ if BSP_USING_SPI1
         default "spi1_drv"    
     config BSP_SPI1_CLK_PIN
         int "spi1 clk pin number"
-        default 6
+        default 9
     config BSP_SPI1_D0_PIN
         int "spi1 d0 pin number"
-        default 8
+        default 11
     config BSP_SPI1_D1_PIN
         int "spi1 d1 pin number"
-        default 7
+        default 10
     menuconfig BSP_SPI1_USING_SS0
         bool "SPI1 Enable SS0"
         default y
@@ -28,7 +28,7 @@ if BSP_USING_SPI1
             default "spi1_dev0"        
         config BSP_SPI1_SS0_PIN
             int "spi1 ss0 pin number"
-            default 9
+            default 12
     menuconfig RESOURCES_SPI_LORA
     bool "Using spi lora function"
     default n