noisymime
/
STM32GENERIC
mirror of https://github.com/noisymime/STM32GENERIC.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdio: Do not use DMA on unaligned reads / writes

This commit is contained in:
Daniel Fekete 2017-06-15 05:05:51 +02:00
parent 4de51c1fb1
commit 973a883371
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
STM32/libraries/SDIO/src/SDIO.cpp
View File

@ -165,10 +165,9 @@ uint8_t SDIOClass::end() {
}
uint8_t SDIOClass::readBlocks(uint32_t block, uint8_t* dst, size_t nb) {
if (((uint32_t)dst & 0x3U) != 0){
while (1); //Hang here, dst was not aligned to word, this is a problem
}
if (!_useDMA){
bool aligned = ((uint32_t)dst & 0x3U) == 0;
if (!_useDMA || !aligned) {
state = HAL_SD_ReadBlocks(&hsd, dst, block, nb, (uint32_t)sd_timeout);
if (state != HAL_OK) {
@ -218,9 +217,8 @@ uint8_t SDIOClass::readBlocks(uint32_t block, uint8_t* dst, size_t nb) {
}
uint8_t SDIOClass::writeBlocks(uint32_t block, const uint8_t* src, size_t nb) {
if (((uint32_t)src & 0x3) !=0){
while (1); //Hang here, src was not aligned to word, this is a problem
}
bool aligned = ((uint32_t)src & 0x3U) == 0;
uint32_t tickstart = HAL_GetTick();
while (!(cardStatus() & SDCARD_STATUS_READY_BIT)) {
SDMMC_CmdStopTransfer(hsd.Instance);
@ -240,7 +238,7 @@ uint8_t SDIOClass::writeBlocks(uint32_t block, const uint8_t* src, size_t nb) {
}
*/
if (!_useDMA){
if (!_useDMA || !aligned) {
state = HAL_SD_WriteBlocks(&hsd,(uint8_t*) src, block, (uint32_t) nb, sd_timeout);
if (state != HAL_OK) {