liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FL-443 Move sd card to second spi (#271)

Browse Source 
* sd card spi 2 fix, add spi mgr
This commit is contained in:
DrZlo13
2020-12-19 17:52:17 +10:00
committed by GitHub
parent 73ecc7cde6
commit 8b6e7fd4ae
10 changed files with 127 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/targets/f4/Src/fatfs/stm32_adafruit_sd.c
View File

@@ -92,6 +92,7 @@
#include "string.h"
#include "stdio.h"
#include "spi.h"
#include "api-hal-spi.h"
/** @addtogroup BSP
* @{
@@ -290,6 +291,9 @@ static uint8_t SD_ReadData(void);
* - MSD_OK: Sequence succeed
*/
uint8_t BSP_SD_Init(void) {
// TODO: SPI manager
api_hal_spi_lock(&SPI_SD_HANDLE);
/* Init to maximum slow speed */
SD_SPI_Reconfigure_Slow();
@@ -303,6 +307,9 @@ uint8_t BSP_SD_Init(void) {
/* Init to maximum fastest speed */
SD_SPI_Reconfigure_Fast();
// TODO: SPI manager
api_hal_spi_unlock(&SPI_SD_HANDLE);
/* SD initialized and set to SPI mode properly */
return res;
}
@@ -323,8 +330,8 @@ uint8_t BSP_SD_GetCardInfo(SD_CardInfo* pCardInfo) {
if(flag_SDHC == 1) {
pCardInfo->LogBlockSize = 512;
pCardInfo->CardBlockSize = 512;
pCardInfo->CardCapacity =
((uint64_t)pCardInfo->Csd.version.v2.DeviceSize + 1UL) * 1024UL * (uint64_t)pCardInfo->LogBlockSize;
pCardInfo->CardCapacity = ((uint64_t)pCardInfo->Csd.version.v2.DeviceSize + 1UL) * 1024UL *
(uint64_t)pCardInfo->LogBlockSize;
pCardInfo->LogBlockNbr = (pCardInfo->CardCapacity) / (pCardInfo->LogBlockSize);
} else {
pCardInfo->CardCapacity = (pCardInfo->Csd.version.v1.DeviceSize + 1);