andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gdisirio 2011-05-04 14:38:02 +00:00
parent 3e42a8fe76
commit f8c8c48fa9
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,9 +96,10 @@ void sdc_lld_start(SDCDriver *sdcp) {
RCC->AHBENR |= RCC_AHBENR_SDIOEN; RCC->AHBENR |= RCC_AHBENR_SDIOEN;
} }
/* Configuration, card clock is initially stopped.*/ /* Configuration, card clock is initially stopped.*/
SDIO->POWER = 0; SDIO->POWER = 0;
SDIO->CLKCR = 0; SDIO->CLKCR = 0;
SDIO->DCTRL = 0; SDIO->DCTRL = 0;
SDIO->DTIMER = STM32_SDC_DATATIMEOUT;
} }
/** /**
@ -111,9 +112,10 @@ void sdc_lld_start(SDCDriver *sdcp) {
void sdc_lld_stop(SDCDriver *sdcp) { void sdc_lld_stop(SDCDriver *sdcp) {
if ((sdcp->state == SDC_READY) || (sdcp->state == SDC_ACTIVE)) { if ((sdcp->state == SDC_READY) || (sdcp->state == SDC_ACTIVE)) {
SDIO->POWER = 0; SDIO->POWER = 0;
SDIO->CLKCR = 0; SDIO->CLKCR = 0;
SDIO->DCTRL = 0; SDIO->DCTRL = 0;
SDIO->DTIMER = 0;
/* Clock deactivation.*/ /* Clock deactivation.*/
NVICDisableVector(SDIO_IRQn); NVICDisableVector(SDIO_IRQn);
@ -319,11 +321,20 @@ bool_t sdc_lld_read_blocks(SDCDriver *sdcp, uint8_t *buf, uint32_t n) {
msg_t msg; msg_t msg;
chSysLock(); chSysLock();
/* Prepares the DMA channel.*/
dmaChannelSetup(&STM32_DMA2->channels[STM32_DMA_CHANNEL_4], dmaChannelSetup(&STM32_DMA2->channels[STM32_DMA_CHANNEL_4],
n * SDC_BLOCK_SIZE, buf, (n * SDC_BLOCK_SIZE) / sizeof (uint32_t), buf,
(STM32_SDC_SDIO_DMA_PRIORITY << 12) | (STM32_SDC_SDIO_DMA_PRIORITY << 12) |
DMA_CCR1_MINC | DMA_CCR1_EN); DMA_CCR1_PSIZE_1 | DMA_CCR1_MSIZE_1 |
DMA_CCR1_MINC);
SDIO->DLEN = n;
/* Options: Card to Controller, Block mode, DMA mode, 512 bytes blocks.*/
SDIO->DCTRL = SDIO_DCTRL_RWMOD |
SDIO_DCTRL_DBLOCKSIZE_3 | SDIO_DCTRL_DBLOCKSIZE_3 |
SDIO_DCTRL_DMAEN |
SDIO_DCTRL_DTEN;
/* DMA channel activation.*/
dmaEnableChannel(&STM32_DMA2, STM32_DMA_CHANNEL_4);
chDbgAssert(sdcp->thread == NULL, "sdc_lld_read_blocks(), #1", "not NULL"); chDbgAssert(sdcp->thread == NULL, "sdc_lld_read_blocks(), #1", "not NULL");
sdcp->thread = chThdSelf(); sdcp->thread = chThdSelf();
chSchGoSleepS(THD_STATE_SUSPENDED); chSchGoSleepS(THD_STATE_SUSPENDED);

8
os/hal/platforms/STM32/sdc_lld.h
View File

@ -35,10 +35,18 @@
/* Driver constants. */ /* Driver constants. */
/*===========================================================================*/ /*===========================================================================*/
/*===========================================================================*/ /*===========================================================================*/
/* Driver pre-compile time settings. */ /* Driver pre-compile time settings. */
/*===========================================================================*/ /*===========================================================================*/
/**
* @brief SDIO data timeout in SDIO clock cycles.
*/
#if !defined(STM32_SDC_DATATIMEOUT) || defined(__DOXYGEN__)
#define STM32_SDC_DATATIMEOUT 0x000FFFFF
#endif
/** /**
* @brief SDIO DMA priority (0..3|lowest..highest). * @brief SDIO DMA priority (0..3|lowest..highest).
*/ */