Skip to content

fix: STM32L1xx support #11

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

Merged
merged 1 commit into from
Jun 14, 2023
Merged

fix: STM32L1xx support #11

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
44 changes: 0 additions & 44 deletions src/drivers/sd_diskio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,7 @@ static DSTATUS SD_CheckStatus(BYTE lun)
(void)lun;
Stat = STA_NOINIT;

#ifndef STM32L1xx
if(BSP_SD_GetCardState() == MSD_OK)
#else /* STM32L1xx */
if(BSP_SD_GetStatus() == MSD_OK)
#endif
{
Stat &= ~STA_NOINIT;
}
Expand All @@ -129,7 +125,6 @@ DSTATUS SD_initialize(BYTE lun)
{
Stat = STA_NOINIT;
#if !defined(DISABLE_SD_INIT)

if(BSP_SD_Init() == MSD_OK)
{
Stat = SD_CheckStatus(lun);
Expand Down Expand Up @@ -162,7 +157,6 @@ DSTATUS SD_status(BYTE lun)
DRESULT SD_read(BYTE lun, BYTE *buff, DWORD sector, UINT count)
{
(void)lun;
#ifndef STM32L1xx
DRESULT res = RES_ERROR;

if(BSP_SD_ReadBlocks((uint32_t*)buff,
Expand All @@ -175,17 +169,6 @@ DRESULT SD_read(BYTE lun, BYTE *buff, DWORD sector, UINT count)
}
res = RES_OK;
}
#else /* STM32L1xx */
DRESULT res = RES_OK;

if(BSP_SD_ReadBlocks((uint32_t*)buff,
(uint64_t) (sector * SD_DEFAULT_BLOCK_SIZE),
SD_DEFAULT_BLOCK_SIZE,
count) != MSD_OK)
{
res = RES_ERROR;
}
#endif
return res;
}

Expand All @@ -201,7 +184,6 @@ DRESULT SD_read(BYTE lun, BYTE *buff, DWORD sector, UINT count)
DRESULT SD_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
{
(void)lun;
#ifndef STM32L1xx
DRESULT res = RES_ERROR;

if(BSP_SD_WriteBlocks((uint32_t*)buff,
Expand All @@ -214,16 +196,6 @@ DRESULT SD_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
}
res = RES_OK;
}
#else /* STM32L1xx */
DRESULT res = RES_OK;

if(BSP_SD_WriteBlocks((uint32_t*)buff,
(uint64_t)(sector * SD_DEFAULT_BLOCK_SIZE),
SD_DEFAULT_BLOCK_SIZE, count) != MSD_OK)
{
res = RES_ERROR;
}
#endif
return res;
}
#endif /* _USE_WRITE == 1 */
Expand All @@ -240,11 +212,7 @@ DRESULT SD_ioctl(BYTE lun, BYTE cmd, void *buff)
{
(void)lun;
DRESULT res = RES_ERROR;
#ifndef STM32L1xx
BSP_SD_CardInfo CardInfo;
#else /* STM32L1xx */
SD_CardInfo CardInfo;
#endif
if (Stat & STA_NOINIT) return RES_NOTRDY;

switch (cmd)
Expand All @@ -257,33 +225,21 @@ DRESULT SD_ioctl(BYTE lun, BYTE cmd, void *buff)
/* Get number of sectors on the disk (DWORD) */
case GET_SECTOR_COUNT :
BSP_SD_GetCardInfo(&CardInfo);
#ifndef STM32L1xx
*(DWORD*)buff = CardInfo.LogBlockNbr;
#else /* STM32L1xx */
*(DWORD*)buff = CardInfo.CardCapacity / SD_DEFAULT_BLOCK_SIZE;
#endif
res = RES_OK;
break;

/* Get R/W sector size (WORD) */
case GET_SECTOR_SIZE :
#ifndef STM32L1xx
BSP_SD_GetCardInfo(&CardInfo);
*(WORD*)buff = CardInfo.LogBlockSize;
#else /* STM32L1xx */
*(WORD*)buff = SD_DEFAULT_BLOCK_SIZE;
#endif
res = RES_OK;
break;

/* Get erase block size in unit of sector (DWORD) */
case GET_BLOCK_SIZE :
#ifndef STM32L1xx
BSP_SD_GetCardInfo(&CardInfo);
*(DWORD*)buff = CardInfo.LogBlockSize / SD_DEFAULT_BLOCK_SIZE;
#else /* STM32L1xx */
*(DWORD*)buff = SD_DEFAULT_BLOCK_SIZE;
#endif
res = RES_OK;
break;

Expand Down