ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced _cmd58 with common _cmd function

pull/7774/head
Deepika 2017-06-21 11:21:45 -05:00
parent e10c59d134
commit e68d54efd0
2 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
features/filesystem/sd/SDBlockDevice.cpp
View File

@ -291,13 +291,15 @@ int SDBlockDevice::_initialise_card_v1()
int SDBlockDevice::_initialise_card_v2()
{
uint32_t response;
uint32_t ocr;
for (int i = 0; i < SD_COMMAND_TIMEOUT; i++) {
wait_ms(50);
_cmd58();
_cmd(CMD58_READ_OCR, 0, &ocr);
_cmd(CMD55_APP_CMD, 0);
_cmd(ACMD41_SD_SEND_OP_COND, 0x40000000, &response);
if (response == 0) {
_cmd58();
_cmd(CMD58_READ_OCR, 0, &ocr);
debug_if(_dbg, "\n\rInit: SDCARD_V2\n\r");
_block_size = 1;
return BD_ERROR_OK;
@ -544,33 +546,6 @@ int SDBlockDevice::_cmd(SDBlockDevice::cmdSupported cmd, uint32_t arg, uint32_t
return status;
}
int SDBlockDevice::_cmd58() {
int arg = 0;
_select();
// send a command
_spi.write(0x40 | 58);
_spi.write(arg >> 24);
_spi.write(arg >> 16);
_spi.write(arg >> 8);
_spi.write(arg >> 0);
_spi.write(0x95);
// wait for the response (response[7] == 0)
for (int i = 0; i < SD_COMMAND_TIMEOUT; i++) {
int response = _spi.write(0xFF);
if (!(response & 0x80)) {
int ocr = _spi.write(0xFF) << 24;
ocr |= _spi.write(0xFF) << 16;
ocr |= _spi.write(0xFF) << 8;
ocr |= _spi.write(0xFF) << 0;
_deselect();
return response;
}
}
_deselect();
return -1; // timeout
}
int SDBlockDevice::_cmd8() {
_select();

1
features/filesystem/sd/SDBlockDevice.h
View File

@ -171,7 +171,6 @@ private:
uint8_t _card_type;
int _cmd(SDBlockDevice::cmdSupported cmd, uint32_t arg, uint32_t *resp=NULL);
int _cmd8();
int _cmd58();
/* Move the SDCard into the SPI Mode idle state
*