copy MSC CDC composite files

boards.txt

@@ -1254,6 +1254,10 @@ GenF4.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
 GenF4.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
 GenF4.menu.usb.CDC=CDC (no generic 'Serial')
 GenF4.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
+GenF4.menu.usb.CDC_MSC=CDC_COMPOSITE (no generic 'Serial', MSC)
+GenF4.menu.usb.CDC_MSC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB -DUSBD_USE_MSC -DUSE_USB_COMPOSITE
+GenF4.menu.usb.MSC=MSC (no generic 'Serial')
+GenF4.menu.usb.MSC.build.enable_usb={build.usb_flags}  -DUSBD_USE_MSC -DDISABLE_GENERIC_SERIALUSB
 GenF4.menu.usb.HID=HID (keyboard and mouse)
 GenF4.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
 GenF4.menu.xusb.FS=Low/Full Speed

cores/arduino/stm32/usb/cdc/usbd_cdc.c

@@ -52,6 +52,7 @@
 
 #ifdef USBCON
 #ifdef USBD_USE_CDC
+#ifndef USBD_USE_CDC_COMPOSITE
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_cdc.h"
@@ -894,6 +895,7 @@ uint8_t USBD_CDC_ClearBuffer(USBD_HandleTypeDef *pdev)
   }
 }
 
+#endif /* !USBD_USE_CDC_COMPOSITE */
 #endif /* USBD_USE_CDC */
 #endif /* USBCON */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

cores/arduino/stm32/usb/cdc/usbd_cdc_if.c

@@ -19,6 +19,7 @@
 
 #ifdef USBCON
 #ifdef USBD_USE_CDC
+#ifndef USBD_USE_CDC_COMPOSITE
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_desc.h"
@@ -335,6 +336,7 @@ bool CDC_resume_receive(void)
   return false;
 }
 
+#endif /* !USBD_USE_CDC_COMPOSITE */
 #endif /* USBD_USE_CDC */
 #endif /* USBCON */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

cores/arduino/stm32/usb/msc_cdc_composite/SdMscDriver.c

@@ -0,0 +1,279 @@
+#ifdef USBD_USE_CDC_COMPOSITE
+
+
+#include <stdint.h>
+
+#include "usbd_msc_bot.h"
+#include "usbd_msc_scsi.h"
+#include "usbd_msc_composite.h"
+#include "usbd_msc_cdc_composite.h"
+
+#include "usbd_msc_data.h"
+
+#if defined(STM32F103xE) || defined(STM32F103xG)
+  #include "stm32f1xx_hal_rcc_ex.h"
+#elif defined(STM32F4xx)
+  #include "stm32f4xx_hal_rcc_ex.h"
+#else
+  #error "ERROR - Only STM32F103xE, STM32F103xG or STM32F4xx CPUs supported"    
+#endif
+
+#define TIMEOUT_SD_ACCESS   0xFF   // guess - don't know units
+
+SD_HandleTypeDef hsd;  // create SDIO structure
+
+HAL_SD_CardCSDTypeDef pCSD;  // create structure to hold decoded CSD data
+HAL_SD_CardCIDTypeDef pCID;  // create structure to hold decoded CID data
+HAL_SD_CardStatusTypeDef pStatus;  // create structure to hold card status data
+HAL_SD_CardInfoTypeDef pCardInfo;  // create structure to hold card info
+
+HAL_StatusTypeDef HAL_SD_GetCardCSD(SD_HandleTypeDef *hsd, HAL_SD_CardCSDTypeDef *pCSD);
+HAL_StatusTypeDef HAL_SD_GetCardCID(SD_HandleTypeDef *hsd, HAL_SD_CardCIDTypeDef *pCID);
+HAL_StatusTypeDef HAL_SD_GetCardStatus(SD_HandleTypeDef *hsd, HAL_SD_CardStatusTypeDef *pStatus);
+HAL_StatusTypeDef HAL_SD_ConfigWideBusOperation(SD_HandleTypeDef *hsd, uint32_t WideMode);
+
+HAL_StatusTypeDef HAL_SD_Init(SD_HandleTypeDef *hsd);
+HAL_StatusTypeDef HAL_SD_InitCard(SD_HandleTypeDef *hsd);
+HAL_StatusTypeDef HAL_SD_GetCardInfo(SD_HandleTypeDef *hsd, HAL_SD_CardInfoTypeDef *pCardInfo);
+HAL_StatusTypeDef HAL_SD_ReadBlocks(SD_HandleTypeDef *hsd, uint8_t *pData, uint32_t BlockAdd, uint32_t NumberOfBlocks, uint32_t Timeout);
+HAL_StatusTypeDef HAL_SD_WriteBlocks(SD_HandleTypeDef *hsd, uint8_t *pData, uint32_t BlockAdd, uint32_t NumberOfBlocks, uint32_t Timeout);
+HAL_StatusTypeDef SDIO_Init(SDIO_TypeDef *SDIOx, SDIO_InitTypeDef Init);
+
+#define TRANSFER_CLOCK_DIV ((uint8_t)SDIO_INIT_CLK_DIV/40)
+
+void go_to_transfer_speed() {
+  SD_InitTypeDef Init;
+
+  /* Default SDIO peripheral configuration for SD card initialization */
+  Init.ClockEdge           = hsd.Init.ClockEdge;          
+  Init.ClockBypass         = hsd.Init.ClockBypass;
+  Init.ClockPowerSave      = hsd.Init.ClockPowerSave;
+  Init.BusWide             = hsd.Init.BusWide;
+  Init.HardwareFlowControl = hsd.Init.HardwareFlowControl;
+  Init.ClockDiv            = TRANSFER_CLOCK_DIV;
+
+  /* Initialize SDIO peripheral interface with default configuration */
+  SDIO_Init(hsd.Instance, Init);
+}
+
+void SD_LowLevel_Init(void) {
+  uint32_t tempreg;
+
+  GPIO_InitTypeDef  GPIO_InitStruct;
+
+  __HAL_RCC_GPIOC_CLK_ENABLE(); //enable GPIO clocks
+  __HAL_RCC_GPIOD_CLK_ENABLE(); //enable GPIO clocks
+
+
+  GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11 | GPIO_PIN_12;  //D0-D3 & SCK
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull = 1;  //GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+
+  // Configure PD.02 CMD line 
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+  RCC->APB2RSTR &= ~RCC_APB2RSTR_SDIORST_Msk;  // take SDIO out of reset
+  RCC->APB2ENR |= RCC_APB2RSTR_SDIORST_Msk;   // enable SDIO clock
+
+  // Enable the DMA2 Clock
+
+  //Initialize the SDIO (with initial <400Khz Clock)
+  tempreg=0;  //Reset value
+  tempreg|=SDIO_CLKCR_CLKEN;  //Clock is enabled
+  tempreg|=(uint32_t)0x76;  //Clock Divider. Clock=48000/(118+2)=400Khz
+  //Keep the rest at 0 => HW_Flow Disabled, Rising Clock Edge, Disable CLK ByPass, Bus Width=0, Power save Disable
+  SDIO->CLKCR=tempreg;
+
+  //Power up the SDIO
+  SDIO->POWER = 0x03;
+
+}
+
+
+void HAL_SD_MspInit(SD_HandleTypeDef *hsd) { // application specific init
+  UNUSED(hsd);   /* Prevent unused argument(s) compilation warning */   
+  __HAL_RCC_SDIO_CLK_ENABLE();  // turn on SDIO clock
+}  
+
+
+HAL_StatusTypeDef SD_SDIO_Init() {      //init SDIO and get SD card info
+
+  hsd.Instance = SDIO;
+  hsd.State = 0;      // HAL_SD_STATE_RESET 
+  SD_LowLevel_Init();
+  HAL_SD_Init(&hsd);  // low level init, enable SDIO & populate some HSD fields, init SD card and get CID & CSD registers
+  go_to_transfer_speed();
+  HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B);
+  return USBD_OK;
+}
+
+
+void init_SDIO_pins(void)
+{
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+
+
+    /**SDIO GPIO Configuration    
+    PC8     ------> SDIO_D0
+    PC12    ------> SDIO_CK
+    PD2     ------> SDIO_CMD 
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_8;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_12;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = GPIO_PIN_2;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF12_SDIO;
+    HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+
+}
+
+
+#ifndef USBD_OK
+  #define USBD_OK 0
+#endif
+
+
+
+int8_t SD_MSC_Init (uint8_t lun);
+
+int8_t SD_MSC_GetCapacity (uint8_t lun,
+                           uint32_t *block_num,
+                           uint16_t *block_size);
+
+int8_t SD_MSC_IsReady (uint8_t lun);
+
+int8_t SD_MSC_IsWriteProtected (uint8_t lun);
+
+int8_t SD_MSC_Read (uint8_t lun,
+                        uint8_t *buf,
+                        uint32_t blk_addr,
+                        uint16_t blk_len);
+
+int8_t SD_MSC_Write (uint8_t lun,
+                        uint8_t *buf,
+                        uint32_t blk_addr,
+                        uint16_t blk_len);
+
+int8_t SD_MSC_GetMaxLun (void);
+
+
+
+
+#define STANDARD_INQUIRY_DATA_LEN 0x24U
+
+
+uint8_t SD_MSC_Inquirydata[] = {/* 36 */
+  /* LUN 0 */
+  0x00,
+  0x80,
+  0x02,
+  0x02,
+  (STANDARD_INQUIRY_DATA_LEN - 5),
+  0x00,
+  0x00,
+  0x00,
+  'S', 'T', 'M', ' ', ' ', ' ', ' ', ' ', /* Manufacturer : 8 bytes */
+  'P', 'r', 'o', 'd', 'u', 'c', 't', ' ', /* Product      : 16 Bytes */
+  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
+  '0', '.', '0' ,'1',                     /* Version      : 4 Bytes */
+};
+
+
+USBD_StorageTypeDef SdMscDriver =
+{
+	SD_MSC_Init,
+	SD_MSC_GetCapacity,
+	SD_MSC_IsReady,
+	SD_MSC_IsWriteProtected,
+	SD_MSC_Read,
+	SD_MSC_Write,
+	SD_MSC_GetMaxLun,
+	(int8_t *)SD_MSC_Inquirydata
+};
+
+
+
+int8_t SD_MSC_Init (uint8_t lun)
+{
+  (void)lun; // Not used
+
+  SD_SDIO_Init();
+  return USBD_OK;
+}
+
+
+int8_t SD_MSC_GetCapacity (uint8_t lun, uint32_t *block_num, uint16_t *block_size)
+{
+  (void)lun; // Not used
+
+  *block_num  = hsd.SdCard.BlockNbr;    // Card Capacity in blocks
+  *block_size = hsd.SdCard.BlockSize;   // number of bytes in a block
+
+  return USBD_OK;
+}
+
+
+int8_t  SD_MSC_IsReady (uint8_t lun)
+{
+  (void)lun; // Not used
+  if (hsd.State == HAL_SD_STATE_READY)
+    return USBD_OK;
+  return USBD_FAIL;
+}
+
+
+int8_t SD_MSC_Read (uint8_t lun, uint8_t *buf,  uint32_t blk_addr, uint16_t blk_len)
+{
+  (void)lun; // Not used
+
+  if(HAL_SD_ReadBlocks(&hsd, buf, blk_addr, blk_len, TIMEOUT_SD_ACCESS))
+    return USBD_FAIL;
+  return USBD_OK;        
+}
+
+
+int8_t SD_MSC_Write (uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len)
+{
+  (void)lun; // Not used
+
+  if (HAL_SD_WriteBlocks(&hsd, buf, blk_addr, blk_len, TIMEOUT_SD_ACCESS))
+    return USBD_FAIL;
+  return USBD_OK;
+}
+
+
+int8_t  SD_MSC_IsWriteProtected (uint8_t lun)
+{
+  (void)lun; // Not used
+
+  return USBD_OK; // Never write protected
+}
+
+
+int8_t SD_MSC_GetMaxLun (void)
+{
+  return 0; // We have just 1 Logic unit number (LUN) which is zero
+}
+
+#endif /* USBD_USE_CDC_COMPOSITE */
+
+

cores/arduino/stm32/usb/msc_cdc_composite/SdMscDriver.h

@@ -0,0 +1,12 @@
+#ifndef SDMSCDRIVER_H
+#define SDMSCDRIVER_H
+
+#include "usbd_msc.h"
+
+bool initSDIOThread();
+void xSDIOThread(void *pvParameters);
+void xSDTestThread(void *pvParameters);
+
+extern USBD_StorageTypeDef SdMscDriver;
+
+#endif // SDMSCDRIVER_H