Skip to content

[HAL][SD] Fix SD card initialization with 4-bit bus width #45

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Avlaak wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Open

[HAL][SD] Fix SD card initialization with 4-bit bus width #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions Src/stm32f4xx_hal_sd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ static void SD_DMARxAbort(DMA_HandleTypeDef *hdma);
*/
HAL_StatusTypeDef HAL_SD_Init(SD_HandleTypeDef *hsd)
{
uint32_t tickstart;

/* Check the SD handle allocation */
if(hsd == NULL)
{
Expand Down Expand Up @@ -381,6 +383,24 @@ HAL_StatusTypeDef HAL_SD_Init(SD_HandleTypeDef *hsd)
return HAL_ERROR;
}

/* Configure the bus wide */
if (HAL_SD_ConfigWideBusOperation(hsd, hsd->Init.BusWide) != HAL_OK)
{
return HAL_ERROR;
}

/* Verify that SD card is ready to use after Initialization */
tickstart = HAL_GetTick();
while ((HAL_SD_GetCardState(hsd) != HAL_SD_CARD_TRANSFER))
{
if ((HAL_GetTick() - tickstart) >= SDMMC_SWDATATIMEOUT)
{
hsd->ErrorCode = HAL_SD_ERROR_TIMEOUT;
hsd->State = HAL_SD_STATE_READY;
return HAL_TIMEOUT;
}
}

/* Initialize the error code */
hsd->ErrorCode = HAL_SD_ERROR_NONE;

Expand Down Expand Up @@ -2675,6 +2695,7 @@ static uint32_t SD_InitCard(SD_HandleTypeDef *hsd)
HAL_SD_CardCSDTypeDef CSD;
uint32_t errorstate;
uint16_t sd_rca = 1U;
SD_InitTypeDef Init;

/* Check the power State */
if(SDIO_GetPowerState(hsd->Instance) == 0U)
Expand Down Expand Up @@ -2748,8 +2769,10 @@ static uint32_t SD_InitCard(SD_HandleTypeDef *hsd)
return errorstate;
}

/* Configure SDIO peripheral interface */
(void)SDIO_Init(hsd->Instance, hsd->Init);
/* Configure the SDIO peripheral */
Init = hsd->Init;
Init.BusWide = SDIO_BUS_WIDE_1B;
(void)SDIO_Init(hsd->Instance, Init);

/* All cards are initialized */
return HAL_SD_ERROR_NONE;
Expand Down