fix MountUsb function error

2022-11-08 17:02:39 +08:00
parent 9a818b1ef4
commit 696c9f6fe0
22 changed files with 154 additions and 47 deletions
@@ -33,6 +33,14 @@ menu "stm32f407-st-discovery feature"
                default 0x20000000
        endmenu

+        menu "config board peripheral"
+            config MOUNT_SDCARD
+                bool
+                default n
+            config MOUNT_USB
+                bool
+                default n
+        endmenu
    endmenu

 endmenu
@@ -50,7 +50,6 @@ extern int Stm32HwRtcInit();
 extern int HwSdioInit();
 extern int Stm32HwAdcInit(void);
 extern int Stm32HwDacInit(void);
-extern int STM32USBHostRegister(void);
 extern int Stm32HwUsbInit(void);
 #ifdef BSP_USING_LWIP
 extern int ETH_BSP_Config();
@@ -143,7 +142,6 @@ struct InitSequenceDesc _board_init[] =
 #endif
 #ifdef BSP_USING_USB
 #ifdef BSP_USING_STM32_USBH
-    { "STM32USBHostRegister", STM32USBHostRegister },
 	{ "hw usb", Stm32HwUsbInit },
 #endif
 #endif
@@ -1,6 +1,7 @@
 config BSP_USING_STM32_USBH
    bool "Using usb host"
-    default y
+    default n
+    if BSP_USING_STM32_USBH
        config USB_BUS_NAME
            string "usb bus name"
            default "usb"
@@ -9,4 +10,15 @@ config BSP_USING_STM32_USBH
            default "usb_drv"
        config USB_DEVICE_NAME
            string "usb bus device name"
-            default "usb_dev"
+            default "usb_dev"
+        config MOUNT_USB_FS
+            bool "mount usb file system"
+            default y
+            select MOUNT_USB
+
+        if MOUNT_USB_FS
+            config MOUNT_USB_FS_TYPE
+                int "choose file system type : FATFS(0) LWEXT4(3)"
+                default 0 
+        endif
+    endif
@@ -27,6 +27,14 @@
 uint32 UdiskRead_new_api(void *dev, struct BusBlockReadParam *read_param);
 uint32 UdiskWirte_new_api(void *dev, struct BusBlockWriteParam *write_param);

+#ifdef MOUNT_USB
+int MountUsb(void)
+{
+    STM32USBHostRegister();
+    return 0;
+}
+#endif
+
 static uint32 UdiskOpenNewApi(void *dev)
 {
    return EOK;