zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2939 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2011-05-08 19:41:37 +00:00
parent c12c9fc11c
commit d7f3d8c7d9
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
os/hal/platforms/STM32/sdc_lld.c
View File

@ -61,10 +61,6 @@ CH_IRQ_HANDLER(SDIO_IRQHandler) {
chSysLockFromIsr(); chSysLockFromIsr();
if (SDCD1.thread != NULL) { 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); chSchReadyI(SDCD1.thread);
SDCD1.thread = NULL; SDCD1.thread = NULL;
} }
@ -368,16 +364,10 @@ bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
sdcp->thread = chThdSelf(); sdcp->thread = chThdSelf();
chSchGoSleepS(THD_STATE_SUSPENDED); chSchGoSleepS(THD_STATE_SUSPENDED);
chDbgAssert(sdcp->thread == NULL, "sdc_lld_read(), #2", "not NULL"); 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) {
if ((SDIO->STA & SDIO_STA_DATAEND) == 0) { chSysUnlock();
chSysUnlock(); goto error;
goto error;
}
} }
dmaDisableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4); dmaDisableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4);
SDIO->ICR = 0xFFFFFFFF; SDIO->ICR = 0xFFFFFFFF;