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

2 files changed, 14 insertions, 18 deletions

diff --git a/os/hal/platforms/STM32/sdc_lld.c b/os/hal/platforms/STM32/sdc_lld.c
index 74ffd4184..d6876d3be 100644
--- a/os/hal/platforms/STM32/sdc_lld.c
+++ b/os/hal/platforms/STM32/sdc_lld.c
@@ -334,13 +334,6 @@ bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
                     uint8_t *buf, uint32_t n) {

   uint32_t sta, resp[1];

 

-  /* Prepares the DMA channel for reading.*/

-  dmaChannelSetup(&STM32_DMA2->channels[STM32_DMA_CHANNEL_4],

-                  (n * SDC_BLOCK_SIZE) / sizeof (uint32_t), buf,

-                  (STM32_SDC_SDIO_DMA_PRIORITY << 12) |

-                  DMA_CCR1_PSIZE_1 | DMA_CCR1_MSIZE_1 |

-                  DMA_CCR1_MINC);

-

   /* Setting up data transfer.

      Options: Card to Controller, Block mode, DMA mode, 512 bytes blocks.*/

   SDIO->ICR   = 0xFFFFFFFF;

@@ -353,7 +346,12 @@ bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
                 SDIO_DCTRL_DTEN;

 

   /* DMA channel activation.*/

-  dmaEnableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4);

+  /* Prepares the DMA channel for reading.*/

+  dmaChannelSetup(&STM32_DMA2->channels[STM32_DMA_CHANNEL_4],

+                  (n * SDC_BLOCK_SIZE) / sizeof (uint32_t), buf,

+                  (STM32_SDC_SDIO_DMA_PRIORITY << 12) |

+                  DMA_CCR1_PSIZE_1 | DMA_CCR1_MSIZE_1 |

+                  DMA_CCR1_EN);

 

   if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_READ_MULTIPLE_BLOCK,

                                  startblk, resp) ||

diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c
index 3af421254..42b7cd903 100644
--- a/os/hal/src/sdc.c
+++ b/os/hal/src/sdc.c
@@ -272,8 +272,7 @@ bool_t sdcRead(SDCDriver *sdcp, uint32_t startblk,
   chDbgCheck((sdcp != NULL) && (buf != NULL) && (n > 0), "sdcRead");

 

   chSysLock();

-  chDbgAssert(sdcp->state == SDC_ACTIVE,

-              "sdcDisconnect(), #1", "invalid state");

+  chDbgAssert(sdcp->state == SDC_ACTIVE, "sdcRead(), #1", "invalid state");

   sdcp->state = SDC_READING;

   chSysUnlock();

 

@@ -304,20 +303,19 @@ bool_t sdcRead(SDCDriver *sdcp, uint32_t startblk,
 bool_t sdcWrite(SDCDriver *sdcp, uint32_t startblk,

                 const uint8_t *buf, uint32_t n) {

   bool_t sts;

-  uint32_t resp[1];

 

-  chDbgCheck((sdcp != NULL) && (buf != NULL) && (n > 0), "sdcWrite");

+  chDbgCheck((sdcp != NULL) && (buf != NULL) && (n > 0), "sdcRead");

+

+  chSysLock();

+  chDbgAssert(sdcp->state == SDC_ACTIVE, "sdcWrite(), #1", "invalid state");

+  sdcp->state = SDC_WRITING;

+  chSysUnlock();

 

   if ((sdcp->cardmode & SDC_MODE_HIGH_CAPACITY) == 0)

     startblk *= SDC_BLOCK_SIZE;

 

-  if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_READ_MULTIPLE_BLOCK,

-                                 startblk, resp))

-    return TRUE;

-

   sts = sdc_lld_write(sdcp, startblk, buf, n);

-  sts = sts || sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_STOP_TRANSMISSION,

-                                          0, resp);

+  sdcp->state = SDC_ACTIVE;

   return sts;

 }