增加usb U盘

Author: jinsc123654

applications/main.c

@@ -71,8 +71,8 @@ int main(void)
 //    extern void cdc_acm_init(uint8_t busid, uint32_t reg_base);
 //    cdc_acm_init(0, CM_USBFS_BASE);
 //    
-    extern void msc_ram_init(uint8_t busid, uint32_t reg_base);
-    msc_ram_init(0, CM_USBFS_BASE);
+    extern void msc_storage_init(uint8_t busid, uint32_t reg_base);
+    msc_storage_init(0, CM_USBFS_BASE);
 
     while (1)
     {

applications/usb_app.c

@@ -1,21 +1,13 @@
-#include "usbd_core.h"
-
-/*
- * Copyright (c) 2022, sakumisu
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "usbd_cdc.h"
-
-
 /*
  * Copyright (c) 2024, sakumisu
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include "usbd_core.h"
 #include "usbd_msc.h"
 
+#ifdef __RT_THREAD_H__
+
 #define MSC_IN_EP  0x81
 #define MSC_OUT_EP 0x02
 
@@ -32,8 +24,9 @@
 #define MSC_MAX_MPS 64
 #endif
 
-const uint8_t msc_ram_descriptor[] = {
-    USB_DEVICE_DESCRIPTOR_INIT(USB_2_0, 0x00, 0x00, 0x00, USBD_VID, USBD_PID, 0x0200, 0x01),
+
+const uint8_t msc_storage_descriptor[] = {
+    USB_DEVICE_DESCRIPTOR_INIT(USB_1_1, 0x00, 0x00, 0x00, USBD_VID, USBD_PID, 0x0200, 0x01),
     USB_CONFIG_DESCRIPTOR_INIT(USB_CONFIG_SIZE, 0x01, 0x01, USB_CONFIG_BUS_POWERED, USBD_MAX_POWER),
     MSC_DESCRIPTOR_INIT(0x00, MSC_OUT_EP, MSC_IN_EP, MSC_MAX_MPS, 0x02),
     ///////////////////////////////////////
@@ -110,6 +103,14 @@ const uint8_t msc_ram_descriptor[] = {
     0x00
 };
 
+struct usbd_interface intf0;
+
+/* assume the block device is 512M */
+#define BLOCK_DEV_NAME      "sd"
+#define BLOCK_SIZE          512U
+#define BLOCK_COUNT         0x1024U * 0x1024U
+static rt_device_t blk_dev = RT_NULL;
+
 static void usbd_event_handler(uint8_t busid, uint8_t event)
 {
     switch (event) {
@@ -135,42 +136,37 @@ static void usbd_event_handler(uint8_t busid, uint8_t event)
     }
 }
 
-#define BLOCK_SIZE  512
-#define BLOCK_COUNT 10
-
-typedef struct
-{
-    uint8_t BlockSpace[BLOCK_SIZE];
-} BLOCK_TYPE;
-
-BLOCK_TYPE mass_block[BLOCK_COUNT];
-
 void usbd_msc_get_cap(uint8_t busid, uint8_t lun, uint32_t *block_num, uint32_t *block_size)
 {
-    *block_num = 1000; //Pretend having so many buffer,not has actually.
+    *block_num = BLOCK_COUNT;
     *block_size = BLOCK_SIZE;
 }
+
 int usbd_msc_sector_read(uint8_t busid, uint8_t lun, uint32_t sector, uint8_t *buffer, uint32_t length)
 {
-    if (sector < BLOCK_COUNT)
-        memcpy(buffer, mass_block[sector].BlockSpace, length);
+    rt_device_read(blk_dev, sector, buffer, length / BLOCK_SIZE);
     return 0;
 }
 
 int usbd_msc_sector_write(uint8_t busid, uint8_t lun, uint32_t sector, uint8_t *buffer, uint32_t length)
 {
-    if (sector < BLOCK_COUNT)
-        memcpy(mass_block[sector].BlockSpace, buffer, length);
+    rt_device_write(blk_dev, sector, buffer, length / BLOCK_SIZE);
     return 0;
 }
 
-struct usbd_interface intf0;
-
-void msc_ram_init(uint8_t busid, uint32_t reg_base)
+void msc_storage_init(uint8_t busid, uint32_t reg_base)
 {
-    usbd_desc_register(busid, msc_ram_descriptor);
+    rt_err_t res;
+
+    blk_dev = rt_device_find(BLOCK_DEV_NAME);
+    RT_ASSERT(blk_dev);
+
+    res = rt_device_open(blk_dev, RT_DEVICE_OFLAG_RDWR);
+    RT_ASSERT(res == RT_EOK);
+
+    usbd_desc_register(busid, msc_storage_descriptor);
     usbd_add_interface(busid, usbd_msc_init_intf(busid, &intf0, MSC_OUT_EP, MSC_IN_EP));
 
     usbd_initialize(busid, reg_base, usbd_event_handler);
 }
-
+#endif

board/usb_config.h

@@ -73,7 +73,7 @@
 #define CONFIG_USBDEV_MSC_VERSION_STRING "0.01"
 #endif
 
-// #define CONFIG_USBDEV_MSC_THREAD
+#define CONFIG_USBDEV_MSC_THREAD
 
 #ifndef CONFIG_USBDEV_MSC_PRIO
 #define CONFIG_USBDEV_MSC_PRIO 4

packages/CherryUSB-1.3.0/port/dwc2/usb_glue_hc.c

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024, sakumisu
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "usb_config.h"
+#include "usb_dwc2_reg.h"
+
+/* When using [GPIO_SetFunc(USBF_VBUS_PORT, USBF_VBUS_PIN, USBF_VBUS_FUNC);], there is no need to configure GOTGCTL */
+
+#define USB_OTG_GLB ((DWC2_GlobalTypeDef *)(reg_base))
+
+uint32_t usbd_get_dwc2_gccfg_conf(uint32_t reg_base)
+{
+
+    USB_OTG_GLB->GOTGCTL |= USB_OTG_GOTGCTL_BVALOEN;
+    USB_OTG_GLB->GOTGCTL |= USB_OTG_GOTGCTL_BVALOVAL;
+    return 0;
+}
+
+uint32_t usbh_get_dwc2_gccfg_conf(uint32_t reg_base)
+{
+    USB_OTG_GLB->GOTGCTL &= ~USB_OTG_GOTGCTL_BVALOEN;
+    USB_OTG_GLB->GOTGCTL &= ~USB_OTG_GOTGCTL_BVALOVAL;
+    return 0;
+}

project.uvoptx

@@ -276,7 +276,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>packages\CherryUSB-1.3.0\class\cdc\usbd_cdc.c</PathWithFileName>
@@ -900,7 +900,7 @@
 
   <Group>
     <GroupName>Fal</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

project.uvprojx

@@ -10,7 +10,7 @@
       <TargetName>rt-thread</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
+      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -3099,6 +3099,11 @@
     <Layers>
       <Layer>
         <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
         <LayTarg>0</LayTarg>
         <LayPrjMark>1</LayPrjMark>
       </Layer>