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

Proper response and error handling done

pull/7774/head
Deepika 2017-06-23 13:03:24 -05:00
parent 22d7e4063f
commit df8e085ee3
1 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,7 +406,7 @@ int SDBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
// Write the data: one block at a time // Write the data: one block at a time
do { do {
if(BD_ERROR_OK != (status = _write(buffer, token, _block_size))) { if(BD_ERROR_OK != (status = _write(buffer, token, _block_size))) {
// CMD13 to get the failure status // CMD13 to get the status
status = _cmd(CMD13_SEND_STATUS, 0); status = _cmd(CMD13_SEND_STATUS, 0);
break; break;
} }
@ -422,13 +422,12 @@ int SDBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
_spi.write(SPI_STOP_TRAN); _spi.write(SPI_STOP_TRAN);
_deselect(); _deselect();
} }
// SEND_NUM_WR_BLOCKS (ACMD22) in order to get the number of well written write blocks. // SEND_NUM_WR_BLOCKS (ACMD22) in order to get the number of well written write blocks.
_cmd(CMD55_APP_CMD, 0); _cmd(CMD55_APP_CMD, 0);
if(BD_ERROR_OK == _cmd(ACMD22_SEND_NUM_WR_BLOCKS, 0)) { if(BD_ERROR_OK == _cmd(ACMD22_SEND_NUM_WR_BLOCKS, 0)) {
uint8_t wr_blocks[4]; uint8_t wr_blocks[4];
if(BD_ERROR_OK == _read(wr_blocks, 4)) { if(BD_ERROR_OK == _read(wr_blocks, 4)) {
debug_if(SD_DBG, "Blocks Written successfully 0x%x\n", debug_if(SD_DBG, "Blocks Written without errors: 0x%x\n",
((wr_blocks[0] << 24) | (wr_blocks[1] << 16) | (wr_blocks[2] << 0) | wr_blocks[3])); ((wr_blocks[0] << 24) | (wr_blocks[1] << 16) | (wr_blocks[2] << 0) | wr_blocks[3]));
} }
} }
@ -547,10 +546,18 @@ uint8_t SDBlockDevice::_cmd_spi(SDBlockDevice::cmdSupported cmd, uint32_t arg) {
cmdPacket[5] = 0xFF; // Make sure bit 0-End bit is high cmdPacket[5] = 0xFF; // Make sure bit 0-End bit is high
break; break;
} }
// send a command // send a command
for (int i = 0; i < PACKET_SIZE; i++) { for (int i = 0; i < PACKET_SIZE; i++) {
_spi.write(cmdPacket[i]); _spi.write(cmdPacket[i]);
} }
// The received byte immediataly following CMD12 is a stuff byte,
// it should be discarded before receive the response of the CMD12.
if (CMD12_STOP_TRANSMISSION == cmd) {
_spi.write(0xFF);
}
// wait for the response (response[7] == 0) // wait for the response (response[7] == 0)
for (int i = 0; i < SD_COMMAND_TIMEOUT; i++) { for (int i = 0; i < SD_COMMAND_TIMEOUT; i++) {
response = _spi.write(0xFF); response = _spi.write(0xFF);
@ -564,25 +571,38 @@ uint8_t SDBlockDevice::_cmd_spi(SDBlockDevice::cmdSupported cmd, uint32_t arg) {
int SDBlockDevice::_cmd(SDBlockDevice::cmdSupported cmd, uint32_t arg, uint32_t *resp) { int SDBlockDevice::_cmd(SDBlockDevice::cmdSupported cmd, uint32_t arg, uint32_t *resp) {
int32_t status = BD_ERROR_OK; int32_t status = BD_ERROR_OK;
uint8_t response; uint32_t response;
// Select card // Select card
_select(); _select();
// Send command over SPI interface // Send command over SPI interface
response = _cmd_spi(cmd, arg); response = _cmd_spi(cmd, arg);
debug_if(SD_DBG, "CMD:%d \t arg:0x%x \t Response:0x%x \n", cmd, arg, response);
// Pass the response to the command call if required // Pass the response to the command call if required
if (NULL != resp) { if (NULL != resp) {
*resp = response; *resp = response;
} }
// Process the response R1 // Process the response R1 : Exit on CRC/Illegal command error/No response
if (R1_NO_RESPONSE == response) { if (R1_NO_RESPONSE == response) {
status = SD_BLOCK_DEVICE_ERROR_NO_DEVICE; // No device _deselect();
}else if (response & R1_COM_CRC_ERROR) { return SD_BLOCK_DEVICE_ERROR_NO_DEVICE; // No device
status = SD_BLOCK_DEVICE_ERROR_CRC; // CRC error }
}else if (response & R1_ILLEGAL_COMMAND) { if (response & R1_COM_CRC_ERROR) {
status = SD_BLOCK_DEVICE_ERROR_UNSUPPORTED; // Command not supported _deselect();
}else if ((response & R1_ERASE_RESET) || (response & R1_ERASE_SEQUENCE_ERROR)) { return SD_BLOCK_DEVICE_ERROR_CRC; // CRC error
}
if (response & R1_ILLEGAL_COMMAND) {
debug_if(SD_DBG, "Illegal command response\n");
if (CMD8_SEND_IF_COND == cmd) { // Illegal command is for Ver1 or not SD Card
_card_type = CARD_UNKNOWN;
}
_deselect();
return SD_BLOCK_DEVICE_ERROR_UNSUPPORTED; // Command not supported
}
// Set status for other errors
if ((response & R1_ERASE_RESET) || (response & R1_ERASE_SEQUENCE_ERROR)) {
status = SD_BLOCK_DEVICE_ERROR_ERASE; // Erase error status = SD_BLOCK_DEVICE_ERROR_ERASE; // Erase error
}else if ((response & R1_ADDRESS_ERROR) || (response & R1_PARAMETER_ERROR)) { }else if ((response & R1_ADDRESS_ERROR) || (response & R1_PARAMETER_ERROR)) {
// Misaligned address / invalid address block length // Misaligned address / invalid address block length
@ -592,59 +612,46 @@ int SDBlockDevice::_cmd(SDBlockDevice::cmdSupported cmd, uint32_t arg, uint32_t
// Get rest of the response part for other commands // Get rest of the response part for other commands
switch(cmd) { switch(cmd) {
case CMD8_SEND_IF_COND: // Response R7 case CMD8_SEND_IF_COND: // Response R7
// Illegal command is for Ver1 or not SD Card debug_if(SD_DBG, "V2-Version Card\n");
if(response & R1_ILLEGAL_COMMAND) { _card_type = SDCARD_V2;
debug_if(SD_DBG, "Illegal command response - CMD8\n");
_card_type = CARD_UNKNOWN;
}
else {
debug_if(SD_DBG, "V2-Version Card\n");
_card_type = SDCARD_V2;
}
// Note: No break here, need to read rest of the response // Note: No break here, need to read rest of the response
case CMD58_READ_OCR: // Response R3 case CMD58_READ_OCR: // Response R3
if(NULL == resp) { response = (_spi.write(0xFF) << 24);
status = SD_BLOCK_DEVICE_ERROR_PARAMETER; response |= (_spi.write(0xFF) << 16);
break; response |= (_spi.write(0xFF) << 8);
} response |= _spi.write(0xFF);
*resp = (_spi.write(0xFF) << 24); debug_if(SD_DBG, "R3/R7: 0x%x \n", response);
*resp |= (_spi.write(0xFF) << 16);
*resp |= (_spi.write(0xFF) << 8);
*resp |= (_spi.write(0xFF) << 0);
debug_if(SD_DBG, "CMD:%d \t arg:0x%x \t Response:0x%x 0x%x \n", cmd, arg, response, *resp);
break; break;
case CMD12_STOP_TRANSMISSION: // Response R1b case CMD12_STOP_TRANSMISSION: // Response R1b
case CMD38_ERASE: // TODO: case CMD38_ERASE: // TODO:
debug_if(SD_DBG, "CMD:%d \t arg:0x%x \t Response:0x%x \n", cmd, arg, response);
break; break;
case ACMD13_SD_STATUS: // Response R2 case ACMD13_SD_STATUS: // Response R2
if(NULL == resp) { response = _spi.write(0xFF);
status = SD_BLOCK_DEVICE_ERROR_PARAMETER; debug_if(SD_DBG, "R2: 0x%x \n", response);
break;
}
*resp = _spi.write(0xFF);
debug_if(SD_DBG, "CMD:%d \t arg:0x%x \t Response:0x%x 0x%x \n", cmd, arg, response, *resp);
break; break;
default: // Response R1 default: // Response R1
debug_if(SD_DBG, "CMD:%d \t arg:0x%x \t Response:0x%x \n", cmd, arg, response);
break; break;
} }
// Pass the updated response to the command
if (NULL != resp) {
*resp = response;
}
// Deselect card // Deselect card
_deselect(); _deselect();
return status; return status;
} }
int SDBlockDevice::_cmd8() { int SDBlockDevice::_cmd8() {
uint32_t arg = (CMD8_PATTERN << 0); uint32_t arg = (CMD8_PATTERN << 0); // [7:0]check pattern
uint32_t response = 0; uint32_t response = 0;
int32_t status = BD_ERROR_OK; int32_t status = BD_ERROR_OK;
arg |= (0x1 << 8); // 3.3V arg |= (0x1 << 8); // 2.7-3.6V // [11:8]supply voltage(VHS)
status = _cmd(CMD8_SEND_IF_COND, arg, &response); status = _cmd(CMD8_SEND_IF_COND, arg, &response);
// Verify voltage and pattern for V2 version of card // Verify voltage and pattern for V2 version of card