more protection against interrupts that might spoil SPI sequences.

made coding style more like that of contiki.
This commit is contained in:
nvt-se 2009-05-26 12:15:46 +00:00
parent f39d2bd4c6
commit e9d279620f
6 changed files with 195 additions and 176 deletions

View file

@ -47,9 +47,9 @@ Berlin, 2007
* @brief MMC-/SD-Card library, Block erase
*
* @author Michael Baar <baar@inf.fu-berlin.de>
* @version $Revision: 1.4 $
* @version $Revision: 1.5 $
*
* $Id: sd_erase.c,v 1.4 2008/05/27 13:01:27 nvt-se Exp $
* $Id: sd_erase.c,v 1.5 2009/05/26 12:15:46 nvt-se Exp $
*/
/**
@ -65,17 +65,17 @@ sd_erase_blocks(uint32_t address, uint16_t numBlocks)
uint8_t ret, r1;
uint32_t endAdr;
if (sd_protected()) {
if(sd_protected()) {
return FALSE;
}
if (!uart_lock(UART_MODE_SPI)) {
if(!uart_lock(UART_MODE_SPI)) {
return FALSE;
}
ret = _sd_send_cmd(SD_CMD_ERASE_WR_BLK_START_ADDR, SD_RESPONSE_SIZE_R1,
&address, &r1);
if (!ret | r1) {
if(!ret | r1) {
uart_unlock(UART_MODE_SPI);
return FALSE;
}
@ -85,7 +85,7 @@ sd_erase_blocks(uint32_t address, uint16_t numBlocks)
ret = _sd_send_cmd(SD_CMD_ERASE_WR_BLK_END_ADDR, SD_RESPONSE_SIZE_R1,
&endAdr, &r1);
if (!ret | r1) {
if(!ret | r1) {
uart_unlock(UART_MODE_SPI);
return FALSE;
}