[FL-1111] SD card rework with SPI API (#496)
* api-hal-spi: make fast and slow sd card devices * api-hal-spi: add configuration for spi bus * fatfs: rework sd card driver with api-hal-spi * api-hal-spi: enable spi in bus reset
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
#include "main.h"
|
||||
#include "api-hal-spi.h"
|
||||
|
||||
#define SD_DUMMY_BYTE 0xFF
|
||||
#define SD_CS_LOW() HAL_GPIO_WritePin(SD_CS_GPIO_Port, SD_CS_Pin, GPIO_PIN_RESET)
|
||||
#define SD_CS_HIGH() HAL_GPIO_WritePin(SD_CS_GPIO_Port, SD_CS_Pin, GPIO_PIN_SET)
|
||||
|
||||
const uint32_t SpiTimeout = 1000;
|
||||
extern SPI_HandleTypeDef SPI_SD_HANDLE;
|
||||
uint8_t SD_IO_WriteByte(uint8_t Data);
|
||||
static const ApiHalSpiDevice* sd_spi_dev = &api_hal_spi_devices[ApiHalSpiDeviceIdSdCardFast];
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
BUS OPERATIONS
|
||||
@@ -17,11 +17,8 @@ uint8_t SD_IO_WriteByte(uint8_t Data);
|
||||
* @retval None
|
||||
*/
|
||||
static void SPIx_Error(void) {
|
||||
/* De-initialize the SPI communication BUS */
|
||||
HAL_SPI_DeInit(&SPI_SD_HANDLE);
|
||||
|
||||
/* Re-Initiaize the SPI communication BUS */
|
||||
HAL_SPI_Init(&SPI_SD_HANDLE);
|
||||
api_hal_spi_bus_reset(sd_spi_dev->bus);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -32,12 +29,10 @@ static void SPIx_Error(void) {
|
||||
* @retval None
|
||||
*/
|
||||
static void SPIx_WriteReadData(const uint8_t* DataIn, uint8_t* DataOut, uint16_t DataLength) {
|
||||
HAL_StatusTypeDef status = HAL_OK;
|
||||
status =
|
||||
HAL_SPI_TransmitReceive(&SPI_SD_HANDLE, (uint8_t*)DataIn, DataOut, DataLength, SpiTimeout);
|
||||
bool status = api_hal_spi_bus_trx(sd_spi_dev->bus, (uint8_t*)DataIn, DataOut, DataLength, SpiTimeout);
|
||||
|
||||
/* Check the communication status */
|
||||
if(status != HAL_OK) {
|
||||
if(!status) {
|
||||
/* Execute user timeout callback */
|
||||
SPIx_Error();
|
||||
}
|
||||
@@ -49,13 +44,12 @@ static void SPIx_WriteReadData(const uint8_t* DataIn, uint8_t* DataOut, uint16_t
|
||||
* @retval None
|
||||
*/
|
||||
__attribute__((unused)) static void SPIx_Write(uint8_t Value) {
|
||||
HAL_StatusTypeDef status = HAL_OK;
|
||||
uint8_t data;
|
||||
|
||||
status = HAL_SPI_TransmitReceive(&SPI_SD_HANDLE, (uint8_t*)&Value, &data, 1, SpiTimeout);
|
||||
bool status = api_hal_spi_bus_trx(sd_spi_dev->bus, (uint8_t*)&Value, &data, 1, SpiTimeout);
|
||||
|
||||
/* Check the communication status */
|
||||
if(status != HAL_OK) {
|
||||
if(!status) {
|
||||
/* Execute user timeout callback */
|
||||
SPIx_Error();
|
||||
}
|
||||
@@ -75,7 +69,7 @@ void SD_IO_Init(void) {
|
||||
uint8_t counter = 0;
|
||||
|
||||
/* SD chip select high */
|
||||
SD_CS_HIGH();
|
||||
hal_gpio_write(sd_spi_dev->chip_select, true);
|
||||
|
||||
/* Send dummy byte 0xFF, 10 times with CS high */
|
||||
/* Rise CS and MOSI for 80 clocks cycles */
|
||||
@@ -92,9 +86,9 @@ void SD_IO_Init(void) {
|
||||
*/
|
||||
void SD_IO_CSState(uint8_t val) {
|
||||
if(val == 1) {
|
||||
SD_CS_HIGH();
|
||||
hal_gpio_write(sd_spi_dev->chip_select, true);
|
||||
} else {
|
||||
SD_CS_LOW();
|
||||
hal_gpio_write(sd_spi_dev->chip_select, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -295,9 +295,9 @@ static uint8_t SD_ReadData(void);
|
||||
*/
|
||||
uint8_t BSP_SD_Init(bool reset_card) {
|
||||
/* Slow speed init */
|
||||
|
||||
/* TODO: SPI manager */
|
||||
api_hal_spi_lock_device(&sd_slow_spi);
|
||||
const ApiHalSpiDevice* sd_spi_slow_dev = &api_hal_spi_devices[ApiHalSpiDeviceIdSdCardSlow];
|
||||
api_hal_spi_bus_lock(sd_spi_slow_dev->bus);
|
||||
api_hal_spi_bus_configure(sd_spi_slow_dev->bus, sd_spi_slow_dev->config);
|
||||
|
||||
/* We must reset card in spi_lock context */
|
||||
if(reset_card) {
|
||||
@@ -326,8 +326,7 @@ uint8_t BSP_SD_Init(bool reset_card) {
|
||||
if(res == BSP_SD_OK) break;
|
||||
}
|
||||
|
||||
/* TODO: SPI manager */
|
||||
api_hal_spi_unlock_device(&sd_slow_spi);
|
||||
api_hal_spi_bus_unlock(sd_spi_slow_dev->bus);
|
||||
|
||||
/* SD initialized and set to SPI mode properly */
|
||||
return res;
|
||||
|
@@ -52,6 +52,8 @@ static DSTATUS User_CheckStatus(BYTE lun) {
|
||||
|
||||
return Stat;
|
||||
}
|
||||
|
||||
static const ApiHalSpiDevice* sd_spi_fast_dev = &api_hal_spi_devices[ApiHalSpiDeviceIdSdCardFast];
|
||||
/* USER CODE END DECL */
|
||||
|
||||
/* Private function prototypes -----------------------------------------------*/
|
||||
@@ -86,13 +88,13 @@ Diskio_drvTypeDef USER_Driver = {
|
||||
*/
|
||||
DSTATUS USER_initialize(BYTE pdrv) {
|
||||
/* USER CODE BEGIN INIT */
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_lock_device(&sd_fast_spi);
|
||||
|
||||
api_hal_spi_bus_lock(sd_spi_fast_dev->bus);
|
||||
api_hal_spi_bus_configure(sd_spi_fast_dev->bus, sd_spi_fast_dev->config);
|
||||
|
||||
DSTATUS status = User_CheckStatus(pdrv);
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_unlock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_unlock(sd_spi_fast_dev->bus);
|
||||
|
||||
return status;
|
||||
/* USER CODE END INIT */
|
||||
@@ -121,8 +123,8 @@ DRESULT USER_read(BYTE pdrv, BYTE* buff, DWORD sector, UINT count) {
|
||||
/* USER CODE BEGIN READ */
|
||||
DRESULT res = RES_ERROR;
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_lock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_lock(sd_spi_fast_dev->bus);
|
||||
api_hal_spi_bus_configure(sd_spi_fast_dev->bus, sd_spi_fast_dev->config);
|
||||
|
||||
if(BSP_SD_ReadBlocks((uint32_t*)buff, (uint32_t)(sector), count, SD_DATATIMEOUT) == MSD_OK) {
|
||||
/* wait until the read operation is finished */
|
||||
@@ -131,8 +133,7 @@ DRESULT USER_read(BYTE pdrv, BYTE* buff, DWORD sector, UINT count) {
|
||||
res = RES_OK;
|
||||
}
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_unlock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_unlock(sd_spi_fast_dev->bus);
|
||||
|
||||
return res;
|
||||
/* USER CODE END READ */
|
||||
@@ -152,8 +153,8 @@ DRESULT USER_write(BYTE pdrv, const BYTE* buff, DWORD sector, UINT count) {
|
||||
/* USER CODE HERE */
|
||||
DRESULT res = RES_ERROR;
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_lock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_lock(sd_spi_fast_dev->bus);
|
||||
api_hal_spi_bus_configure(sd_spi_fast_dev->bus, sd_spi_fast_dev->config);
|
||||
|
||||
if(BSP_SD_WriteBlocks((uint32_t*)buff, (uint32_t)(sector), count, SD_DATATIMEOUT) == MSD_OK) {
|
||||
/* wait until the Write operation is finished */
|
||||
@@ -162,8 +163,7 @@ DRESULT USER_write(BYTE pdrv, const BYTE* buff, DWORD sector, UINT count) {
|
||||
res = RES_OK;
|
||||
}
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_unlock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_unlock(sd_spi_fast_dev->bus);
|
||||
|
||||
return res;
|
||||
/* USER CODE END WRITE */
|
||||
@@ -185,8 +185,8 @@ DRESULT USER_ioctl(BYTE pdrv, BYTE cmd, void* buff) {
|
||||
|
||||
if(Stat & STA_NOINIT) return RES_NOTRDY;
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_lock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_lock(sd_spi_fast_dev->bus);
|
||||
api_hal_spi_bus_configure(sd_spi_fast_dev->bus, sd_spi_fast_dev->config);
|
||||
|
||||
switch(cmd) {
|
||||
/* Make sure that no pending write process */
|
||||
@@ -219,8 +219,7 @@ DRESULT USER_ioctl(BYTE pdrv, BYTE cmd, void* buff) {
|
||||
res = RES_PARERR;
|
||||
}
|
||||
|
||||
// TODO: SPI manager
|
||||
api_hal_spi_unlock_device(&sd_fast_spi);
|
||||
api_hal_spi_bus_unlock(sd_spi_fast_dev->bus);
|
||||
|
||||
return res;
|
||||
/* USER CODE END IOCTL */
|
||||
|
Reference in New Issue
Block a user