Skip to content

Bugfix: Put every SPI access between begin / end Transaction #509

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
Jul 31, 2017
Merged

Bugfix: Put every SPI access between begin / end Transaction #509

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
49 changes: 34 additions & 15 deletions libraries/SD/src/sd_diskio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,32 @@ unsigned long sdGetSectorsCount(uint8_t pdrv)
}


namespace
{

struct AcquireSPI
{
ardu_sdcard_t *card;
explicit AcquireSPI(ardu_sdcard_t* card)
: card(card)
{
card->spi->beginTransaction(SPISettings(card->frequency, MSBFIRST, SPI_MODE0));
}
AcquireSPI(ardu_sdcard_t* card, int frequency)
: card(card)
{
card->spi->beginTransaction(SPISettings(frequency, MSBFIRST, SPI_MODE0));
}
~AcquireSPI()
{
card->spi->endTransaction();
}
private:
AcquireSPI(AcquireSPI const&);
AcquireSPI& operator=(AcquireSPI const&);
};



}


/*
Expand All @@ -438,7 +460,7 @@ DSTATUS ff_sd_initialize(uint8_t pdrv)
return card->status;
}

card->spi->beginTransaction(SPISettings(400000, MSBFIRST, SPI_MODE0));
AcquireSPI card_locked(card, 400000);

digitalWrite(card->ssPin, HIGH);
for (uint8_t i = 0; i < 20; i++) {
Expand Down Expand Up @@ -538,13 +560,10 @@ DSTATUS ff_sd_initialize(uint8_t pdrv)
card->frequency = 25000000;
}

card->spi->endTransaction();

card->status &= ~STA_NOINIT;
return card->status;

unknown_card:
card->spi->endTransaction();
card->type = CARD_UNKNOWN;
return card->status;
}
Expand All @@ -562,15 +581,13 @@ DRESULT ff_sd_read(uint8_t pdrv, uint8_t* buffer, DWORD sector, UINT count)
}
DRESULT res = RES_OK;

card->spi->beginTransaction(SPISettings(card->frequency, MSBFIRST, SPI_MODE0));
AcquireSPI lock(card);

if (count > 1) {
res = sdReadSectors(pdrv, (char*)buffer, sector, count) ? RES_OK : RES_ERROR;
} else {
res = sdReadSector(pdrv, (char*)buffer, sector) ? RES_OK : RES_ERROR;
}

card->spi->endTransaction();
return res;
}

Expand All @@ -586,24 +603,25 @@ DRESULT ff_sd_write(uint8_t pdrv, const uint8_t* buffer, DWORD sector, UINT coun
}
DRESULT res = RES_OK;

card->spi->beginTransaction(SPISettings(card->frequency, MSBFIRST, SPI_MODE0));
AcquireSPI lock(card);

if (count > 1) {
res = sdWriteSectors(pdrv, (const char*)buffer, sector, count) ? RES_OK : RES_ERROR;
}
res = sdWriteSector(pdrv, (const char*)buffer, sector) ? RES_OK : RES_ERROR;

card->spi->endTransaction();
return res;
}

DRESULT ff_sd_ioctl(uint8_t pdrv, uint8_t cmd, void* buff)
{
switch(cmd) {
case CTRL_SYNC:
if (sdSelectCard(pdrv)) {
sdDeselectCard(pdrv);
return RES_OK;
{
AcquireSPI lock(s_cards[pdrv]);
if (sdSelectCard(pdrv)) {
sdDeselectCard(pdrv);
return RES_OK;
}
}
return RES_ERROR;
case GET_SECTOR_COUNT:
Expand Down Expand Up @@ -722,6 +740,7 @@ bool sdcard_mount(uint8_t pdrv, const char* path)
esp_vfs_fat_unregister_path(path);
return false;
}
AcquireSPI lock(card);
card->sectors = sdGetSectorsCount(pdrv);
return true;
}
Expand Down