git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6630 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2014-01-18 09:16:20 +00:00
parent e44be744f2
commit 027e1f3845
2 changed files with 6 additions and 4 deletions

View File

@ -618,16 +618,16 @@ bool_t sdc_lld_read_aligned(SDCDriver *sdcp, uint32_t startblk,
SDIO_MASK_DATAENDIE; SDIO_MASK_DATAENDIE;
SDIO->DLEN = n * MMCSD_BLOCK_SIZE; SDIO->DLEN = n * MMCSD_BLOCK_SIZE;
/* Talk to card what we want from it.*/
if (sdc_lld_prepare_read(sdcp, startblk, n, resp) == TRUE)
goto error;
/* Transaction starts just after DTEN bit setting.*/ /* Transaction starts just after DTEN bit setting.*/
SDIO->DCTRL = SDIO_DCTRL_DTDIR | SDIO->DCTRL = SDIO_DCTRL_DTDIR |
SDIO_DCTRL_DBLOCKSIZE_3 | SDIO_DCTRL_DBLOCKSIZE_3 |
SDIO_DCTRL_DBLOCKSIZE_0 | SDIO_DCTRL_DBLOCKSIZE_0 |
SDIO_DCTRL_DMAEN | SDIO_DCTRL_DMAEN |
SDIO_DCTRL_DTEN; SDIO_DCTRL_DTEN;
/* Talk to card what we want from it.*/
if (sdc_lld_prepare_read(sdcp, startblk, n, resp) == TRUE)
goto error;
if (sdc_lld_wait_transaction_end(sdcp, n, resp) == TRUE) if (sdc_lld_wait_transaction_end(sdcp, n, resp) == TRUE)
goto error; goto error;

View File

@ -89,6 +89,8 @@
***************************************************************************** *****************************************************************************
*** 2.7.0 *** *** 2.7.0 ***
- FIX: Fixed race condition in STM32 SDC driver (bug #458)(backported
to 2.6.3).
- FIX: Fixed race condition in STM32 OTG driver (bug #457)(backported - FIX: Fixed race condition in STM32 OTG driver (bug #457)(backported
to 2.6.3). to 2.6.3).
- FIX: Fixed memstreams.c missing from simulator makefiles (bug #454) - FIX: Fixed memstreams.c missing from simulator makefiles (bug #454)