diff options
Diffstat (limited to 'os/hal/src/mmc_spi.c')
| -rw-r--r-- | os/hal/src/mmc_spi.c | 449 |
1 files changed, 172 insertions, 277 deletions
diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c index 0be587d14..1b9271944 100644 --- a/os/hal/src/mmc_spi.c +++ b/os/hal/src/mmc_spi.c @@ -49,10 +49,10 @@ /*===========================================================================*/
/* Forward declarations required by mmc_vmt.*/
-bool_t mmc_read(void *instance, uint32_t startblk,
- uint8_t *buffer, uint32_t n);
-bool_t mmc_write(void *instance, uint32_t startblk,
- const uint8_t *buffer, uint32_t n);
+static bool_t mmc_read(void *instance, uint32_t startblk,
+ uint8_t *buffer, uint32_t n);
+static bool_t mmc_write(void *instance, uint32_t startblk,
+ const uint8_t *buffer, uint32_t n);
/**
* @brief Virtual methods table.
@@ -100,36 +100,36 @@ static const uint8_t crc7_lookup_table[256] = { /* Driver local functions. */
/*===========================================================================*/
-bool_t mmc_read(void *instance, uint32_t startblk,
+static bool_t mmc_read(void *instance, uint32_t startblk,
uint8_t *buffer, uint32_t n) {
if (mmcStartSequentialRead((MMCDriver *)instance, startblk))
- return TRUE;
+ return CH_FAILED;
while (n > 0) {
if (mmcSequentialRead((MMCDriver *)instance, buffer))
- return TRUE;
+ return CH_FAILED;
buffer += MMCSD_BLOCK_SIZE;
n--;
}
if (mmcStopSequentialRead((MMCDriver *)instance))
- return TRUE;
- return FALSE;
+ return CH_FAILED;
+ return CH_SUCCESS;
}
-bool_t mmc_write(void *instance, uint32_t startblk,
+static bool_t mmc_write(void *instance, uint32_t startblk,
const uint8_t *buffer, uint32_t n) {
if (mmcStartSequentialWrite((MMCDriver *)instance, startblk))
- return TRUE;
+ return CH_FAILED;
while (n > 0) {
if (mmcSequentialWrite((MMCDriver *)instance, buffer))
- return TRUE;
+ return CH_FAILED;
buffer += MMCSD_BLOCK_SIZE;
n--;
}
if (mmcStopSequentialWrite((MMCDriver *)instance))
- return TRUE;
- return FALSE;
+ return CH_FAILED;
+ return CH_SUCCESS;
}
/**
@@ -148,38 +148,6 @@ static uint8_t crc7(uint8_t crc, const uint8_t *buffer, size_t len) { }
/**
- * @brief Insertion monitor timer callback function.
- *
- * @param[in] p pointer to the @p MMCDriver object
- *
- * @notapi
- */
-static void tmrfunc(void *p) {
- MMCDriver *mmcp = p;
-
- chSysLockFromIsr();
- if (mmcp->cnt > 0) {
- if (mmc_lld_is_card_inserted(mmcp)) {
- if (--mmcp->cnt == 0) {
- mmcp->state = MMC_INSERTED;
- chEvtBroadcastI(&mmcp->inserted_event);
- }
- }
- else
- mmcp->cnt = MMC_POLLING_INTERVAL;
- }
- else {
- if (!mmc_lld_is_card_inserted(mmcp)) {
- mmcp->state = MMC_WAIT;
- mmcp->cnt = MMC_POLLING_INTERVAL;
- chEvtBroadcastI(&mmcp->removed_event);
- }
- }
- chVTSetI(&mmcp->vt, MS2ST(MMC_POLLING_DELAY), tmrfunc, mmcp);
- chSysUnlockFromIsr();
-}
-
-/**
* @brief Waits an idle condition.
*
* @param[in] mmcp pointer to the @p MMCDriver object
@@ -325,8 +293,8 @@ static uint8_t send_command_R3(MMCDriver *mmcp, uint8_t cmd, uint32_t arg, * @param[out] csd pointer to the CSD buffer
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @notapi
*/
@@ -338,7 +306,7 @@ static bool_t read_CxD(MMCDriver *mmcp, uint8_t cmd, uint32_t cxd[4]) { send_hdr(mmcp, cmd, 0);
if (recvr1(mmcp) != 0x00) {
spiUnselect(mmcp->config->spip);
- return TRUE;
+ return CH_FAILED;
}
/* Wait for data availability.*/
@@ -359,10 +327,10 @@ static bool_t read_CxD(MMCDriver *mmcp, uint8_t cmd, uint32_t cxd[4]) { spiIgnore(mmcp->config->spip, 2);
spiUnselect(mmcp->config->spip);
- return FALSE;
+ return CH_SUCCESS;
}
}
- return TRUE;
+ return CH_FAILED;
}
/**
@@ -415,8 +383,6 @@ void mmcObjectInit(MMCDriver *mmcp) { mmcp->state = MMC_STOP;
mmcp->config = NULL;
mmcp->block_addresses = FALSE;
- chEvtInit(&mmcp->inserted_event);
- chEvtInit(&mmcp->removed_event);
}
/**
@@ -432,11 +398,10 @@ void mmcStart(MMCDriver *mmcp, const MMCConfig *config) { chDbgCheck((mmcp != NULL) && (config != NULL), "mmcStart");
chSysLock();
- chDbgAssert(mmcp->state == MMC_STOP, "mmcStart(), #1", "invalid state");
+ chDbgAssert((mmcp->state == MMC_STOP) || (mmcp->state == MMC_READY),
+ "mmcStart(), #1", "invalid state");
mmcp->config = config;
- mmcp->state = MMC_WAIT;
- mmcp->cnt = MMC_POLLING_INTERVAL;
- chVTSetI(&mmcp->vt, MS2ST(MMC_POLLING_DELAY), tmrfunc, mmcp);
+ mmcp->state = MMC_READY;
chSysUnlock();
}
@@ -452,14 +417,9 @@ void mmcStop(MMCDriver *mmcp) { chDbgCheck(mmcp != NULL, "mmcStop");
chSysLock();
- chDbgAssert((mmcp->state != MMC_UNINIT) &&
- (mmcp->state != MMC_READING) &&
- (mmcp->state != MMC_WRITING),
+ chDbgAssert((mmcp->state == MMC_STOP) || (mmcp->state == MMC_READY),
"mmcStop(), #1", "invalid state");
- if (mmcp->state != MMC_STOP) {
- mmcp->state = MMC_STOP;
- chVTResetI(&mmcp->vt);
- }
+ mmcp->state = MMC_STOP;
chSysUnlock();
spiStop(mmcp->config->spip);
}
@@ -475,111 +435,102 @@ void mmcStop(MMCDriver *mmcp) { * @param[in] mmcp pointer to the @p MMCDriver object
*
* @return The operation status.
- * @retval FALSE the operation succeeded and the driver is now
+ * @retval CH_FAILED the operation succeeded and the driver is now
* in the @p MMC_READY state.
- * @retval TRUE the operation failed.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
bool_t mmcConnect(MMCDriver *mmcp) {
unsigned i;
- bool_t result;
chDbgCheck(mmcp != NULL, "mmcConnect");
- chDbgAssert((mmcp->state != MMC_UNINIT) && (mmcp->state != MMC_STOP),
+ chSysLock();
+ chDbgAssert((mmcp->state == MMC_READY) || (mmcp->state == MMC_ACTIVE),
"mmcConnect(), #1", "invalid state");
+ mmcp->state = MMC_CONNECTING;
+ chSysUnlock();
+
+ /* Slow clock mode and 128 clock pulses.*/
+ spiStart(mmcp->config->spip, mmcp->config->lscfg);
+ spiIgnore(mmcp->config->spip, 16);
+
+ /* SPI mode selection.*/
+ i = 0;
+ while (TRUE) {
+ if (send_command_R1(mmcp, MMCSD_CMD_GO_IDLE_STATE, 0) == 0x01)
+ break;
+ if (++i >= MMC_CMD0_RETRY)
+ goto failed;
+ chThdSleepMilliseconds(10);
+ }
- if (mmcp->state == MMC_INSERTED) {
- /* Slow clock mode and 128 clock pulses.*/
- spiStart(mmcp->config->spip, mmcp->config->lscfg);
- spiIgnore(mmcp->config->spip, 16);
+ /* Try to detect if this is a high capacity card and switch to block
+ addresses if possible.
+ This method is based on "How to support SDC Ver2 and high capacity cards"
+ by ElmChan.*/
+ uint8_t r3[4];
+ if (send_command_R3(mmcp, MMCSD_CMD_SEND_IF_COND,
+ MMCSD_CMD8_PATTERN, r3) != 0x05) {
- /* SPI mode selection.*/
+ /* Switch to SDHC mode.*/
i = 0;
while (TRUE) {
- if (send_command_R1(mmcp, MMCSD_CMD_GO_IDLE_STATE, 0) == 0x01)
+ if ((send_command_R1(mmcp, MMCSD_CMD_APP_CMD, 0) == 0x01) &&
+ (send_command_R3(mmcp, MMCSD_CMD_APP_OP_COND,
+ 0x400001aa, r3) == 0x00))
break;
- if (++i >= MMC_CMD0_RETRY)
- return TRUE;
+
+ if (++i >= MMC_ACMD41_RETRY)
+ goto failed;
chThdSleepMilliseconds(10);
}
- /* Try to detect if this is a high capacity card and switch to block
- addresses if possible.
- This method is based on "How to support SDC Ver2 and high capacity cards"
- by ElmChan.*/
- uint8_t r3[4];
- if (send_command_R3(mmcp, MMCSD_CMD_SEND_IF_COND,
- MMCSD_CMD8_PATTERN, r3) != 0x05) {
-
- /* Switch to SDHC mode.*/
- i = 0;
- while (TRUE) {
- if ((send_command_R1(mmcp, MMCSD_CMD_APP_CMD, 0) == 0x01) &&
- (send_command_R3(mmcp, MMCSD_CMD_APP_OP_COND,
- 0x400001aa, r3) == 0x00))
- break;
-
- if (++i >= MMC_ACMD41_RETRY)
- return TRUE;
- chThdSleepMilliseconds(10);
- }
+ /* Execute dedicated read on OCR register */
+ send_command_R3(mmcp, MMCSD_CMD_READ_OCR, 0, r3);
- /* Execute dedicated read on OCR register */
- send_command_R3(mmcp, MMCSD_CMD_READ_OCR, 0, r3);
+ /* Check if CCS is set in response. Card operates in block mode if set.*/
+ if(r3[0] & 0x40)
+ mmcp->block_addresses = TRUE;
+ }
- /* Check if CCS is set in response. Card operates in block mode if set.*/
- if(r3[0] & 0x40)
- mmcp->block_addresses = TRUE;
- }
+ /* Initialization.*/
+ i = 0;
+ while (TRUE) {
+ uint8_t b = send_command_R1(mmcp, MMCSD_CMD_INIT, 0);
+ if (b == 0x00)
+ break;
+ if (b != 0x01)
+ goto failed;
+ if (++i >= MMC_CMD1_RETRY)
+ goto failed;
+ chThdSleepMilliseconds(10);
+ }
- /* Initialization.*/
- i = 0;
- while (TRUE) {
- uint8_t b = send_command_R1(mmcp, MMCSD_CMD_INIT, 0);
- if (b == 0x00)
- break;
- if (b != 0x01)
- return TRUE;
- if (++i >= MMC_CMD1_RETRY)
- return TRUE;
- chThdSleepMilliseconds(10);
- }
+ /* Initialization complete, full speed.*/
+ spiStart(mmcp->config->spip, mmcp->config->hscfg);
- /* Initialization complete, full speed.*/
- spiStart(mmcp->config->spip, mmcp->config->hscfg);
-
- /* Setting block size.*/
- if (send_command_R1(mmcp, MMCSD_CMD_SET_BLOCKLEN,
- MMCSD_BLOCK_SIZE) != 0x00)
- return TRUE;
-
- /* Determine capacity.*/
- if (read_CxD(mmcp, MMCSD_CMD_SEND_CSD, mmcp->csd))
- return TRUE;
- mmcp->capacity = mmcsdGetCapacity(mmcp->csd);
- if (mmcp->capacity == 0)
- return TRUE;
-
- if (read_CxD(mmcp, MMCSD_CMD_SEND_CID, mmcp->cid))
- return TRUE;
-
- /* Transition to MMC_READY state (if not extracted).*/
- chSysLock();
- if (mmcp->state == MMC_INSERTED) {
- mmcp->state = MMC_READY;
- result = FALSE;
- }
- else
- result = TRUE;
- chSysUnlock();
- return result;
- }
- if (mmcp->state == MMC_READY)
- return FALSE;
- /* Any other state is invalid.*/
- return TRUE;
+ /* Setting block size.*/
+ if (send_command_R1(mmcp, MMCSD_CMD_SET_BLOCKLEN,
+ MMCSD_BLOCK_SIZE) != 0x00)
+ goto failed;
+
+ /* Determine capacity.*/
+ if (read_CxD(mmcp, MMCSD_CMD_SEND_CSD, mmcp->csd))
+ goto failed;
+ mmcp->capacity = mmcsdGetCapacity(mmcp->csd);
+ if (mmcp->capacity == 0)
+ goto failed;
+
+ if (read_CxD(mmcp, MMCSD_CMD_SEND_CID, mmcp->cid))
+ goto failed;
+
+ mmcp->state = MMC_READY;
+ return CH_SUCCESS;
+failed:
+ mmcp->state = MMC_READY;
+ return CH_FAILED;
}
/**
@@ -588,34 +539,32 @@ bool_t mmcConnect(MMCDriver *mmcp) { * @param[in] mmcp pointer to the @p MMCDriver object
* @return The operation status.
*
- * @retval FALSE the operation succeeded and the driver is now
+ * @retval CH_FAILED the operation succeeded and the driver is now
* in the @p MMC_INSERTED state.
- * @retval TRUE the operation failed.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
bool_t mmcDisconnect(MMCDriver *mmcp) {
- bool_t status;
chDbgCheck(mmcp != NULL, "mmcDisconnect");
- chDbgAssert((mmcp->state != MMC_UNINIT) && (mmcp->state != MMC_STOP),
+ chSysLock();
+ chDbgAssert((mmcp->state == MMC_READY) || (mmcp->state == MMC_ACTIVE),
"mmcDisconnect(), #1", "invalid state");
- switch (mmcp->state) {
- case MMC_READY:
- /* Wait for the pending write operations to complete.*/
- sync(mmcp);
- chSysLock();
- if (mmcp->state == MMC_READY)
- mmcp->state = MMC_INSERTED;
+ if (mmcp->state == MMC_READY) {
chSysUnlock();
- case MMC_INSERTED:
- status = FALSE;
- default:
- status = TRUE;
+ return CH_SUCCESS;
}
+ mmcp->state = MMC_DISCONNECTING;
+ chSysUnlock();
+
+ /* Wait for the pending write operations to complete.*/
+ sync(mmcp);
spiStop(mmcp->config->spip);
- return status;
+
+ mmcp->state = MMC_READY;
+ return CH_SUCCESS;
}
/**
@@ -625,8 +574,8 @@ bool_t mmcDisconnect(MMCDriver *mmcp) { * @param[in] startblk first block to read
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -635,13 +584,13 @@ bool_t mmcStartSequentialRead(MMCDriver *mmcp, uint32_t startblk) { chDbgCheck(mmcp != NULL, "mmcStartSequentialRead");
chSysLock();
- if (mmcp->state != MMC_READY) {
- chSysUnlock();
- return TRUE;
- }
+ chDbgAssert(mmcp->state == MMC_ACTIVE,
+ "mmcStartSequentialRead(), #1", "invalid state");
mmcp->state = MMC_READING;
chSysUnlock();
+ /* (Re)starting the SPI in case it has been reprogrammed externally, it can
+ happen if the SPI bus is shared among multiple peripherals.*/
spiStart(mmcp->config->spip, mmcp->config->hscfg);
spiSelect(mmcp->config->spip);
@@ -651,14 +600,10 @@ bool_t mmcStartSequentialRead(MMCDriver *mmcp, uint32_t startblk) { send_hdr(mmcp, MMCSD_CMD_READ_MULTIPLE_BLOCK, startblk * MMCSD_BLOCK_SIZE);
if (recvr1(mmcp) != 0x00) {
- spiUnselect(mmcp->config->spip);
- chSysLock();
- if (mmcp->state == MMC_READING)
- mmcp->state = MMC_READY;
- chSysUnlock();
- return TRUE;
+ mmcp->state = MMC_READY;
+ return CH_FAILED;
}
- return FALSE;
+ return CH_SUCCESS;
}
/**
@@ -668,8 +613,8 @@ bool_t mmcStartSequentialRead(MMCDriver *mmcp, uint32_t startblk) { * @param[out] buffer pointer to the read buffer
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -678,12 +623,8 @@ bool_t mmcSequentialRead(MMCDriver *mmcp, uint8_t *buffer) { chDbgCheck((mmcp != NULL) && (buffer != NULL), "mmcSequentialRead");
- chSysLock();
- if (mmcp->state != MMC_READING) {
- chSysUnlock();
- return TRUE;
- }
- chSysUnlock();
+ if (mmcp->state != MMC_READING)
+ return CH_FAILED;
for (i = 0; i < MMC_WAIT_DATA; i++) {
spiReceive(mmcp->config->spip, 1, buffer);
@@ -691,16 +632,13 @@ bool_t mmcSequentialRead(MMCDriver *mmcp, uint8_t *buffer) { spiReceive(mmcp->config->spip, MMCSD_BLOCK_SIZE, buffer);
/* CRC ignored. */
spiIgnore(mmcp->config->spip, 2);
- return FALSE;
+ return CH_SUCCESS;
}
}
/* Timeout.*/
spiUnselect(mmcp->config->spip);
- chSysLock();
- if (mmcp->state == MMC_READING)
- mmcp->state = MMC_READY;
- chSysUnlock();
- return TRUE;
+ mmcp->state = MMC_READY;
+ return CH_FAILED;
}
/**
@@ -709,37 +647,28 @@ bool_t mmcSequentialRead(MMCDriver *mmcp, uint8_t *buffer) { * @param[in] mmcp pointer to the @p MMCDriver object
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
bool_t mmcStopSequentialRead(MMCDriver *mmcp) {
static const uint8_t stopcmd[] = {0x40 | MMCSD_CMD_STOP_TRANSMISSION,
0, 0, 0, 0, 1, 0xFF};
- bool_t result;
chDbgCheck(mmcp != NULL, "mmcStopSequentialRead");
- chSysLock();
- if (mmcp->state != MMC_READING) {
- chSysUnlock();
- return TRUE;
- }
- chSysUnlock();
+ if (mmcp->state != MMC_READING)
+ return CH_FAILED;
spiSend(mmcp->config->spip, sizeof(stopcmd), stopcmd);
/* result = recvr1(mmcp) != 0x00;*/
/* Note, ignored r1 response, it can be not zero, unknown issue.*/
- recvr1(mmcp);
- result = FALSE;
- spiUnselect(mmcp->config->spip);
+ (void) recvr1(mmcp);
- chSysLock();
- if (mmcp->state == MMC_READING)
- mmcp->state = MMC_READY;
- chSysUnlock();
- return result;
+ spiUnselect(mmcp->config->spip);
+ mmcp->state = MMC_READY;
+ return CH_SUCCESS;
}
/**
@@ -749,8 +678,8 @@ bool_t mmcStopSequentialRead(MMCDriver *mmcp) { * @param[in] startblk first block to write
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -759,10 +688,8 @@ bool_t mmcStartSequentialWrite(MMCDriver *mmcp, uint32_t startblk) { chDbgCheck(mmcp != NULL, "mmcStartSequentialWrite");
chSysLock();
- if (mmcp->state != MMC_READY) {
- chSysUnlock();
- return TRUE;
- }
+ chDbgAssert(mmcp->state == MMC_ACTIVE,
+ "mmcStartSequentialWrite(), #1", "invalid state");
mmcp->state = MMC_WRITING;
chSysUnlock();
@@ -774,16 +701,11 @@ bool_t mmcStartSequentialWrite(MMCDriver *mmcp, uint32_t startblk) { send_hdr(mmcp, MMCSD_CMD_WRITE_MULTIPLE_BLOCK,
startblk * MMCSD_BLOCK_SIZE);
-
if (recvr1(mmcp) != 0x00) {
- spiUnselect(mmcp->config->spip);
- chSysLock();
- if (mmcp->state == MMC_WRITING)
- mmcp->state = MMC_READY;
- chSysUnlock();
- return TRUE;
+ mmcp->state = MMC_READY;
+ return CH_FAILED;
}
- return FALSE;
+ return CH_SUCCESS;
}
/**
@@ -793,8 +715,8 @@ bool_t mmcStartSequentialWrite(MMCDriver *mmcp, uint32_t startblk) { * @param[out] buffer pointer to the write buffer
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -804,12 +726,8 @@ bool_t mmcSequentialWrite(MMCDriver *mmcp, const uint8_t *buffer) { chDbgCheck((mmcp != NULL) && (buffer != NULL), "mmcSequentialWrite");
- chSysLock();
- if (mmcp->state != MMC_WRITING) {
- chSysUnlock();
- return TRUE;
- }
- chSysUnlock();
+ if (mmcp->state != MMC_WRITING)
+ return CH_FAILED;
spiSend(mmcp->config->spip, sizeof(start), start); /* Data prologue. */
spiSend(mmcp->config->spip, MMCSD_BLOCK_SIZE, buffer);/* Data. */
@@ -817,16 +735,13 @@ bool_t mmcSequentialWrite(MMCDriver *mmcp, const uint8_t *buffer) { spiReceive(mmcp->config->spip, 1, b);
if ((b[0] & 0x1F) == 0x05) {
wait(mmcp);
- return FALSE;
+ return CH_SUCCESS;
}
/* Error.*/
spiUnselect(mmcp->config->spip);
- chSysLock();
- if (mmcp->state == MMC_WRITING)
- mmcp->state = MMC_READY;
- chSysUnlock();
- return TRUE;
+ mmcp->state = MMC_READY;
+ return CH_FAILED;
}
/**
@@ -835,8 +750,8 @@ bool_t mmcSequentialWrite(MMCDriver *mmcp, const uint8_t *buffer) { * @param[in] mmcp pointer to the @p MMCDriver object
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -845,24 +760,15 @@ bool_t mmcStopSequentialWrite(MMCDriver *mmcp) { chDbgCheck(mmcp != NULL, "mmcStopSequentialWrite");
- chSysLock();
- if (mmcp->state != MMC_WRITING) {
- chSysUnlock();
- return TRUE;
- }
- chSysUnlock();
+ if (mmcp->state != MMC_WRITING)
+ return CH_FAILED;
spiSend(mmcp->config->spip, sizeof(stop), stop);
spiUnselect(mmcp->config->spip);
chSysLock();
- if (mmcp->state == MMC_WRITING) {
- mmcp->state = MMC_READY;
- chSysUnlock();
- return FALSE;
- }
- chSysUnlock();
- return TRUE;
+ mmcp->state = MMC_READY;
+ return CH_SUCCESS;
}
/**
@@ -871,8 +777,8 @@ bool_t mmcStopSequentialWrite(MMCDriver *mmcp) { * @param[in] mmcp pointer to the @p MMCDriver object
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -880,16 +786,11 @@ bool_t mmcSync(MMCDriver *mmcp) { chDbgCheck(mmcp != NULL, "mmcSync");
- chSysLock();
- if (mmcp->state != MMC_READY) {
- chSysUnlock();
- return TRUE;
- }
- chSysUnlock();
+ if (mmcp->state != MMC_READY)
+ return CH_FAILED;
sync(mmcp);
-
- return FALSE;
+ return CH_SUCCESS;
}
/**
@@ -899,27 +800,21 @@ bool_t mmcSync(MMCDriver *mmcp) { * @param[out] bdip pointer to a @p BlockDeviceInfo structure
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
bool_t mmcGetInfo(MMCDriver *mmcp, BlockDeviceInfo *bdip) {
-
chDbgCheck((mmcp != NULL) && (bdip != NULL), "mmcGetInfo");
- chSysLock();
- if (mmcp->state != MMC_READY) {
- chSysUnlock();
- return TRUE;
- }
- chSysUnlock();
+ if (mmcp->state != MMC_READY)
+ return CH_FAILED;
bdip->blk_num = mmcp->capacity;
bdip->blk_size = MMCSD_BLOCK_SIZE;
-
- return FALSE;
+ return CH_SUCCESS;
}
/**
@@ -930,8 +825,8 @@ bool_t mmcGetInfo(MMCDriver *mmcp, BlockDeviceInfo *bdip) { * @param[in] endblk ending block number
*
* @return The operation status.
- * @retval FALSE the operation succeeded.
- * @retval TRUE the operation failed.
+ * @retval CH_FAILED the operation succeeded.
+ * @retval CH_SUCCESS the operation failed.
*
* @api
*/
@@ -940,15 +835,15 @@ bool_t mmcErase(MMCDriver *mmcp, uint32_t startblk, uint32_t endblk) { chDbgCheck((mmcp != NULL), "mmcErase");
if (send_command_R1(mmcp, MMCSD_CMD_ERASE_RW_BLK_START, startblk))
- return TRUE;
+ return CH_FAILED;
if (send_command_R1(mmcp, MMCSD_CMD_ERASE_RW_BLK_END, endblk))
- return TRUE;
+ return CH_FAILED;
if (send_command_R1(mmcp, MMCSD_CMD_ERASE, 0))
- return TRUE;
+ return CH_FAILED;
- return FALSE;
+ return CH_SUCCESS;
}
|