fixed bug in descriptor, small changes to USB class

Rudi Horn · Rudi Horn · commit 6717196bd09d · 2020-06-04T18:17:01.000Z
diff --git a/cores/arduino/USB.cpp b/cores/arduino/USB.cpp
@@ -31,16 +31,20 @@ void USB::begin() {
   if (!initialized) initialize();
 }
 
+void USB::register_msc(USBD_StorageTypeDef* fops) {
+  USBD_MSC_RegisterStorage(&hUSBD_Device, fops);
+}
+
 void USB::initialize() {
   hUSBD_Device_CDC = &hUSBD_Device;
 
   /* Init Device Library */
   if (USBD_Init(&hUSBD_Device, &USBD_Desc, 0) == USBD_OK) {
   #ifdef USBD_USE_CDC
     /* Add Supported Class */
-    if (USBD_RegisterClass(&hUSBD_Device_CDC, &USBD_CDC) == USBD_OK) {
+    if (USBD_RegisterClass(&hUSBD_Device, &USBD_CDC) == USBD_OK) {
       /* Add CDC Interface Class */
-      if (USBD_CDC_RegisterInterface(&hUSBD_Device_CDC, &USBD_CDC_fops) == USBD_OK) {
+      if (USBD_CDC_RegisterInterface(&hUSBD_Device, &USBD_CDC_fops) == USBD_OK) {
         /* Start Device Process */
         USBD_Start(&hUSBD_Device_CDC);
         initialized = true;
@@ -51,12 +55,9 @@ void USB::initialize() {
     if (USBD_RegisterClass(&hUSBD_Device, &USBD_CDC_MSC) == USBD_OK) {
       /* Add CDC Interface Class */
       if (USBD_CDC_RegisterInterface(&hUSBD_Device, &USBD_CDC_fops) == USBD_OK) {
-          /* Add MSC Interface Class */
-        if (USBD_MSC_RegisterStorage(&hUSBD_Device, &USBD_MSC_fops) == USBD_OK) {
-          /* Start Device Process */
-          USBD_Start(&hUSBD_Device);
-          initialized = true;
-        }
+        /* Start Device Process */
+        USBD_Start(&hUSBD_Device);
+        initialized = true;
       }
     }
   #endif
diff --git a/cores/arduino/USB.h b/cores/arduino/USB.h
@@ -22,9 +22,12 @@
 #if defined (USBCON)
 #include "Stream.h"
 #include "usbd_core.h"
+#include "usbd_msc.h"
 
 class USB {
   public:
+    void register_msc(USBD_StorageTypeDef* fops);
+
     void begin(void);
 
     void end(void);
diff --git a/cores/arduino/stm32/usb/cdc_msc/usbd_cdc_msc.cpp b/cores/arduino/stm32/usb/cdc_msc/usbd_cdc_msc.cpp
@@ -87,10 +87,10 @@ USBD_ClassTypeDef  USBD_CDC_MSC =
 #pragma data_alignment=4
 #endif
 /* USB COMPOSITE device Configuration Descriptor */
-static uint8_t USBD_COMPOSITE_CfgDesc[USB_CDC_MSC_CONFIG_DESC_SIZ] =
+static uint8_t USBD_COMPOSITE_CfgFSDesc[USB_CDC_MSC_CONFIG_DESC_SIZ] =
 {
   0x09, /* bLength: Configuation Descriptor size */
-  USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION, /* bDescriptorType: Configuration */
+  USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
   USB_CDC_MSC_CONFIG_DESC_SIZ,
   /* wTotalLength: Bytes returned */
   0x00,
@@ -198,16 +198,16 @@ static uint8_t USBD_COMPOSITE_CfgDesc[USB_CDC_MSC_CONFIG_DESC_SIZ] =
   0x05,                                            /* Endpoint descriptor type */
   MSC_EPIN_ADDR,                                   /* Endpoint address (IN, address 1) */
   0x02,                                            /* Bulk endpoint type */
-  LOBYTE(MSC_MAX_HS_PACKET),
-  HIBYTE(MSC_MAX_HS_PACKET),
+  LOBYTE(MSC_MAX_FS_PACKET),
+  HIBYTE(MSC_MAX_FS_PACKET),
   0x00,                                            /* Polling interval in milliseconds */
 
   0x07,                                            /* Endpoint descriptor length = 7 */
   0x05,                                            /* Endpoint descriptor type */
   MSC_EPOUT_ADDR,                                  /* Endpoint address (OUT, address 1) */
   0x02,                                            /* Bulk endpoint type */
-  LOBYTE(MSC_MAX_HS_PACKET),
-  HIBYTE(MSC_MAX_HS_PACKET),
+  LOBYTE(MSC_MAX_FS_PACKET),
+  HIBYTE(MSC_MAX_FS_PACKET),
   0x00                                             /* Polling interval in milliseconds */
 };
 
@@ -325,8 +325,8 @@ static uint8_t  USBD_COMPOSITE_Setup(USBD_HandleTypeDef *pdev,
   */
 static uint8_t  *USBD_COMPOSITE_GetCfgDesc(uint16_t *length)
 {
-  *length = sizeof(USBD_COMPOSITE_CfgDesc);
-  return USBD_COMPOSITE_CfgDesc;
+  *length = sizeof(USBD_COMPOSITE_CfgFSDesc);
+  return USBD_COMPOSITE_CfgFSDesc;
 }
 
 /**
diff --git a/cores/arduino/stm32/usb/msc/usbd_msc_storage_if.c b/cores/arduino/stm32/usb/msc/usbd_msc_storage_if.c
@@ -54,7 +54,6 @@ int8_t STORAGE_GetMaxLun(void);
 /* USB Mass storage Standard Inquiry Data */
 int8_t  STORAGE_Inquirydata[] =  /* 36 */
 {
-
   /* LUN 0 */
   0x00,
   0x80,
@@ -82,6 +81,7 @@ USBD_StorageTypeDef USBD_MSC_fops =
   STORAGE_Inquirydata,
 
 };
+
 /*******************************************************************************
 * Function Name  : Read_Memory
 * Description    : Handle the Read operation from the microSD card.
@@ -144,6 +144,7 @@ int8_t STORAGE_Read(uint8_t lun, uint8_t *buf,
 {
   return 0;
 }
+
 /*******************************************************************************
 * Function Name  : Write_Memory
 * Description    : Handle the Write operation to the STORAGE card.
@@ -156,6 +157,7 @@ int8_t STORAGE_Write(uint8_t lun, uint8_t *buf,
 {
   return (0);
 }
+
 /*******************************************************************************
 * Function Name  : Write_Memory
 * Description    : Handle the Write operation to the STORAGE card.

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ int8_t STORAGE_GetMaxLun(void);`
`54`	`54`	`/* USB Mass storage Standard Inquiry Data */`
`55`	`55`	`int8_t STORAGE_Inquirydata[] = /* 36 */`
`56`	`56`	`{`
`57`		`-`
`58`	`57`	`/* LUN 0 */`
`59`	`58`	`0x00,`
`60`	`59`	`0x80,`
`@@ -82,6 +81,7 @@ USBD_StorageTypeDef USBD_MSC_fops =`
`82`	`81`	`STORAGE_Inquirydata,`
`83`	`82`
`84`	`83`	`};`
	`84`	`+`
`85`	`85`	`/*******************************************************************************`
`86`	`86`	`* Function Name : Read_Memory`
`87`	`87`	`* Description : Handle the Read operation from the microSD card.`
`@@ -144,6 +144,7 @@ int8_t STORAGE_Read(uint8_t lun, uint8_t *buf,`
`144`	`144`	`{`
`145`	`145`	`return 0;`
`146`	`146`	`}`
	`147`	`+`
`147`	`148`	`/*******************************************************************************`
`148`	`149`	`* Function Name : Write_Memory`
`149`	`150`	`* Description : Handle the Write operation to the STORAGE card.`
`@@ -156,6 +157,7 @@ int8_t STORAGE_Write(uint8_t lun, uint8_t *buf,`
`156`	`157`	`{`
`157`	`158`	`return (0);`
`158`	`159`	`}`
	`160`	`+`
`159`	`161`	`/*******************************************************************************`
`160`	`162`	`* Function Name : Write_Memory`
`161`	`163`	`* Description : Handle the Write operation to the STORAGE card.`