Skip to content

Some SDIO lib cleanup. #696

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
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Some SDIO lib cleanup. #696

Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e009a06
Merge pull request #1 from rogerclarkmelbourne/master
saloid Sep 17, 2019
2ab223e
Merge pull request #2 from rogerclarkmelbourne/master
saloid Sep 22, 2019
f35abf3
Update board.cpp
saloid Sep 22, 2019
d04f9c8
Update board.cpp
saloid Sep 22, 2019
b42121a
Update board.cpp
saloid Sep 22, 2019
aa0f0f7
Update board.cpp
saloid Sep 22, 2019
2c6451d
Update board.cpp
saloid Sep 22, 2019
17604cc
Update board.cpp
saloid Sep 22, 2019
857315e
Update board.cpp
saloid Sep 22, 2019
f208149
Update board.cpp
saloid Sep 22, 2019
957238e
Update board.cpp
saloid Sep 22, 2019
fb13c19
Update board.cpp
saloid Sep 22, 2019
70c7fb7
Update board.cpp
saloid Sep 22, 2019
f6540ec
Update HardwareSerial.h
saloid Sep 22, 2019
c04aa72
Merge pull request #3 from rogerclarkmelbourne/master
saloid Oct 1, 2019
6fb15b3
Some compiler warning removed. Now it compiles
saloid Oct 1, 2019
134cc17
Revert "Update HardwareSerial.h"
saloid Oct 1, 2019
559c70b
Revert "Update board.cpp"
saloid Oct 1, 2019
5b184ed
Revert "Update board.cpp"
saloid Oct 1, 2019
d433f52
Revert "Update board.cpp"
saloid Oct 1, 2019
a0ae6d7
Revert "Update board.cpp"
saloid Oct 1, 2019
13e7314
Revert "Update board.cpp"
saloid Oct 1, 2019
4e9bf92
Revert "Update board.cpp"
saloid Oct 1, 2019
89acab0
Revert "Update board.cpp"
saloid Oct 1, 2019
44a0f55
Revert "Update board.cpp"
saloid Oct 1, 2019
558cdd6
Revert "Update board.cpp"
saloid Oct 1, 2019
9857883
Revert "Update board.cpp"
saloid Oct 1, 2019
4cef862
Revert "Update board.cpp"
saloid Oct 1, 2019
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
11 changes: 5 additions & 6 deletions STM32F1/libraries/SDIO/SdioF1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static uint8_t m_dir = TRX_RD;
static bool (*m_busyFcn)() = 0;
static bool m_initDone = false;
//static uint32_t m_lba; // for raw non-DMA read(write)Start, read(write)Data, read(write)Stop
static uint32_t m_cnt; // for raw non-DMA read(write)Start, read(write)Data, read(write)Stop
//static uint32_t m_cnt; // for raw non-DMA read(write)Start, read(write)Data, read(write)Stop
static bool m_version2;
static bool m_highCapacity;
static uint8_t m_errorCode = SD_CARD_ERROR_INIT_NOT_CALLED;
Expand Down Expand Up @@ -645,9 +645,9 @@ delay(100);
return true;
}
//-----------------------------------------------------------------------------
uint32_t SdioCard::cardSize(void) {
return sdCardCapacity(&m_csd);
}
//uint32_t SdioCard::cardSize(void) {
// return sdCardCapacity(&m_csd);
//}
/*---------------------------------------------------------------------------*/
bool SdioCard::erase(uint32_t firstBlock, uint32_t lastBlock) {
// check for single block erase
Expand Down Expand Up @@ -895,7 +895,6 @@ bool SdioCard::readData(uint8_t *dst)
}
} while ( !(STA & (SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) );
// <---- TIME CRITICAL SECTION END ---->

// read data still available in FIFO
while ( (SDIO->STA & SDIO_STA_RXDAVL) && (cnt--) ) {
*ptr++ = SDIO->FIFO;
Expand Down Expand Up @@ -1012,7 +1011,7 @@ bool SdioCard::readStop()
sdio_setup_transfer(0x00FFFFFF, 0, 0);
// Empty SDIO FIFO
while ( SDIO->STA & SDIO_STA_RXDAVL) {
volatile uint32 _unused = SDIO->FIFO;
volatile __attribute__((unused)) uint32 _unused = SDIO->FIFO;
}
//Serial.println("readStop.");
//m_lba = 0;
Expand Down