git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2939 35acf78f-673a-0410-8e92-d51de3d6d3f4
parent
c12c9fc11c
commit
d7f3d8c7d9
|
@ -61,10 +61,6 @@ CH_IRQ_HANDLER(SDIO_IRQHandler) {
|
|||
|
||||
chSysLockFromIsr();
|
||||
if (SDCD1.thread != NULL) {
|
||||
if ((SDIO->STA & SDIO_STA_DATAEND) != 0)
|
||||
SDCD1.thread->p_u.rdymsg = RDY_OK;
|
||||
else
|
||||
SDCD1.thread->p_u.rdymsg = RDY_RESET;
|
||||
chSchReadyI(SDCD1.thread);
|
||||
SDCD1.thread = NULL;
|
||||
}
|
||||
|
@ -368,17 +364,11 @@ bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
|
|||
sdcp->thread = chThdSelf();
|
||||
chSchGoSleepS(THD_STATE_SUSPENDED);
|
||||
chDbgAssert(sdcp->thread == NULL, "sdc_lld_read(), #2", "not NULL");
|
||||
if (chThdSelf()->p_u.rdymsg != RDY_OK) {
|
||||
chSysUnlock();
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if ((SDIO->STA & SDIO_STA_DATAEND) == 0) {
|
||||
chSysUnlock();
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
dmaDisableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4);
|
||||
SDIO->ICR = 0xFFFFFFFF;
|
||||
SDIO->DCTRL = 0;
|
||||
|
|
Loading…
Reference in New Issue