Merge pull request #103 from whj4674672/master

【修正】开发手册中错误的配图
【完善】usb 驱动

Author: Guozhanxin

documents/figures/debuger.png

@@ -259,7 +259,27 @@ menu "On-chip Peripheral"
     config BSP_USING_DCMI
         bool "Enable DCMI"
         default n
-
+        
+    config BSP_USING_USBD
+        bool "Enable USB Device"
+        select RT_USING_USB_DEVICE
+        default n
+        
+    menuconfig BSP_USING_USBH
+        bool "Enable USB Host"
+        select RT_USING_USB_HOST
+        default n
+        if BSP_USING_USBH
+            menuconfig RT_USBH_MSTORAGE
+                bool "Enable Udisk Drivers"
+                default n
+                if RT_USBH_MSTORAGE
+                    config UDISK_MOUNTPOINT
+                    string "Udisk mount dir"
+                    default "/"
+                endif
+        endif
+        
     menuconfig BSP_USING_TIM
         bool "Enable timer"
         default n

documents/figures/new_prj_2.png

@@ -39,6 +39,12 @@ if GetDepend(['RT_USING_I2C', 'RT_USING_I2C_BITOPS']):
 
 if GetDepend(['BSP_USING_ONCHIP_RTC']):
     src += Glob('drv_rtc.c')
+	
+if GetDepend(['BSP_USING_USBD']):
+    src += Glob('drv_usbd.c')
+    
+if GetDepend(['BSP_USING_USBH']):
+    src += ['drv_usbh.c']
 
 path = [cwd]
 path += [cwd + '/include']

libraries/Kconfig

@@ -12,7 +12,7 @@
 #include <rtthread.h>
 #include "board.h"
 
-#ifdef BSP_USING_USBDEVICE
+#ifdef BSP_USING_USBD
 
 #include <rtdevice.h>
 #include <string.h>

libraries/drivers/SConscript

@@ -13,7 +13,7 @@
 #include<rtthread.h>
 #include<rtdevice.h>
 
-#ifdef BSP_USING_USBHOST
+#ifdef BSP_USING_USBH
 
 static HCD_HandleTypeDef stm32_hhcd_fs;
 static struct rt_completion urb_completion;