Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master

Ubiquitous/XiZi_IIoT/board/edu-riscv64/board.c

@@ -73,7 +73,7 @@ extern int HwSoftSPIInit(void);
  * @description: Mount USB
  * @return 0
  */
-int  MountUSB(void)
+int  MountUsb(void)
 {
     if (MountFilesystem(USB_BUS_NAME, USB_DEVICE_NAME, USB_DRIVER_NAME, FSTYPE_CH376, "/") == 0)
         KPrintf("usb mount to '/'\n");

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

@@ -80,8 +80,7 @@ static struct io_config
     IOCONFIG(BSP_I2C_SCL, FUNC_GPIO4),
 #endif
 #ifdef BSP_USING_TOUCH
-    // IOCONFIG(BSP_TOUCH_TP_INT, HS_GPIO(FPIOA_TOUCH_TP_INT)),
-    IOCONFIG(BSP_TOUCH_TP_INT, HS_GPIO(FUNC_GPIOHS30)),
+    IOCONFIG(BSP_TOUCH_TP_INT, HS_GPIO(FPIOA_TOUCH_TP_INT)),
 #endif
 
 #ifdef BSP_USING_SOFT_SPI