Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Add composite MSC CDC USB device (follow up to PR #586)#1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
Bob-the-Kuhn wants to merge2 commits intostm32duino:masterfromBob-the-Kuhn:composite-CDC-&-MSC
Closed
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletionscores/arduino/stm32/usb/cdc/usbd_cdc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@

#ifdef USBCON
#ifdef USBD_USE_CDC
#ifndef USBD_USE_CDC_COMPOSITE

/* Includes ------------------------------------------------------------------*/
#include "usbd_cdc.h"
Expand DownExpand Up@@ -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****/
18 changes: 5 additions & 13 deletionscores/arduino/stm32/usb/cdc/usbd_cdc.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@ extern "C" {
#endif

/* Includes ------------------------------------------------------------------*/
#include "usbd_ioreq.h"
#include "usbd_ioreq.h"
#include "usbd_ep_conf.h"

/** @addtogroup STM32_USB_DEVICE_LIBRARY
* @{
Expand All@@ -37,26 +38,18 @@ extern "C" {
* @{
*/


/** @defgroup usbd_cdc_Exported_Defines
* @{
*/
#define CDC_IN_EP 0x82U /* EP1 for data IN */
#define CDC_OUT_EP 0x01U /* EP1 for data OUT */
#define CDC_CMD_EP 0x83U /* EP2 for CDC commands */

#ifndef CDC_HS_BINTERVAL
#define CDC_HS_BINTERVAL 0x10U
#define CDC_HS_BINTERVAL0x10U
#endif /* CDC_HS_BINTERVAL */

#ifndef CDC_FS_BINTERVAL
#define CDC_FS_BINTERVAL 0x10U
#define CDC_FS_BINTERVAL0x10U
#endif /* CDC_FS_BINTERVAL */

/* CDC Endpoints parameters: you can fine tune these values depending on the needed baudrates and performance. */
#define CDC_DATA_HS_MAX_PACKET_SIZE 512U /* Endpoint IN & OUT Packet size */
#define CDC_DATA_FS_MAX_PACKET_SIZE 64U /* Endpoint IN & OUT Packet size */
#define CDC_CMD_PACKET_SIZE 8U /* Control Endpoint Packet size */
/* CDC Endpoints parameters */

#define USB_CDC_CONFIG_DESC_SIZ 67U
#define CDC_DATA_HS_IN_PACKET_SIZE CDC_DATA_HS_MAX_PACKET_SIZE
Expand DownExpand Up@@ -115,7 +108,6 @@ typedef struct {
uint8_t *TxBuffer;
uint32_t RxLength;
uint32_t TxLength;
uint32_t TxLastLength;

__IO uint32_t TxState;
__IO uint32_t RxState;
Expand Down
2 changes: 2 additions & 0 deletionscores/arduino/stm32/usb/cdc/usbd_cdc_if.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@

#ifdef USBCON
#ifdef USBD_USE_CDC
#ifndef USBD_USE_CDC_COMPOSITE

/* Includes ------------------------------------------------------------------*/
#include "usbd_desc.h"
Expand DownExpand Up@@ -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****/
Expand Down
305 changes: 305 additions & 0 deletionscores/arduino/stm32/usb/msc_cdc_composite/SdMscDriver.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,305 @@
#ifdef USBD_USE_CDC_COMPOSITE

#include <stdint.h>

#include "usbd_msc_scsi.h"
#include "usbd_msc_composite.h"
#include "usbd_msc_cdc_composite.h"

#include "usbd_msc_cdc_composite_bot.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
#define SD_RETRY_COUNT 3

MSC_lock_typedef MSC_lock_byte = MSC_UNLOCKED; // start out with MSC unlocked

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);

HAL_StatusTypeDef SD_SDIO_Init();

#define MSC_USB_ACQUIRE_DEF (extern "C" {HAL_StatusTypeDef SD_SDIO_Init(); MSC_lock_typedef MSC_lock_byte;}})
#define MSC_USB_ACQUIRE do {SD_SDIO_Init();}while(0)
#define MSC_USB_RELEASE_DEF (extern "C" {MSC_lock_typedef MSC_lock_byte;})
#define MSC_USB_RELEASE do {MSC_lock_byte = MSC_UNLOCKED;}while(0)

#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_12; // D0 & 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);

// #if defined(SDIO_D1_PIN) && defined(SDIO_D2_PIN) && defined(SDIO_D3_PIN) // define D1-D3 only if have a four bit wide SDIO bus
GPIO_InitStruct.Pin = GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11; // D1-D3
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);
//#endif

// 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
}

#define SD_RETRY_COUNT 3

HAL_StatusTypeDef SD_SDIO_Init() {
//init SDIO and get SD card info

uint8_t retryCnt = SD_RETRY_COUNT;

uint8_t status;
hsd.Instance = SDIO;
hsd.State = (HAL_SD_StateTypeDef) 0; // HAL_SD_STATE_RESET
SD_LowLevel_Init();

uint8_t retry_Cnt = retryCnt;
for (;;) {
status = HAL_SD_Init(&hsd); // low level init, enable SDIO & populate some HSD fields, init SD card and get CID & CSD registers
if (!status) break;
if (!--retry_Cnt) return false; // return failing status if retries are exhausted
}

retry_Cnt = retryCnt;
for (;;) {
if (!HAL_SD_ConfigWideBusOperation(&hsd, SDIO_BUS_WIDE_4B)) break; // some cards are only 1 bit wide so a pass here is not required
if (!--retry_Cnt) break;
}
if (!retry_Cnt) { // wide bus failed, go back to one bit wide mode
hsd.State = (HAL_SD_StateTypeDef) 0; // HAL_SD_STATE_RESET
SD_LowLevel_Init();
retry_Cnt = retryCnt;
for (;;) {
status = HAL_SD_Init(&hsd);
if (!status) break;
if (!--retry_Cnt) return false; // return failing status if retries are exhausted
}
}

return true;
}


#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;
}

uint8_t temp_msc[512];

int8_t SD_MSC_Read(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len)
{
(void)lun; // Not used

int8_t status;
uint8_t retryCnt = SD_RETRY_COUNT;

for (;;) {
status = HAL_SD_ReadBlocks(&hsd, buf, blk_addr, blk_len, TIMEOUT_SD_ACCESS); // read 512 byte block(s) with 500mS timeout
status |= HAL_SD_GetCardState(&hsd); // make sure all is OK
if (!status) return USBD_OK; // return passing status
if (!--retryCnt) return USBD_FAIL; // return failing status if retries are exhausted
}
}


int8_t SD_MSC_Write(uint8_t lun, uint8_t *buf, uint32_t blk_addr, uint16_t blk_len)
{
(void)lun; // Not used


int8_t status;
uint8_t retryCnt = SD_RETRY_COUNT;

for (;;) {
status = HAL_SD_WriteBlocks(&hsd, buf, blk_addr, blk_len, TIMEOUT_SD_ACCESS); // write 512 byte block(s) with 500mS timeout
status |= HAL_SD_GetCardState(&hsd); // make sure all is OK
if (!status) return (bool) USBD_OK; // return passing status
if (!--retryCnt) return (bool) USBD_FAIL; // return failing status if retries are exhausted
}
}


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 */


13 changes: 13 additions & 0 deletionscores/arduino/stm32/usb/msc_cdc_composite/SdMscDriver.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
#ifndef SDMSCDRIVER_H
#define SDMSCDRIVER_H

//#include "usbd_msc.h"
#include "usbd_msc_cdc_composite.h"

bool initSDIOThread();
void xSDIOThread(void *pvParameters);
void xSDTestThread(void *pvParameters);

extern USBD_StorageTypeDef SdMscDriver;

#endif // SDMSCDRIVER_H
Loading
[8]ページ先頭
©2009-2025 Movatter.jp