From 6dc70a8453a1a2b5953330dcd688f2121ad62732 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 7 May 2011 16:16:14 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2924
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/platforms/STM32/sdc_lld.c | 30 ++++++++++++++++++------------
 os/hal/src/sdc.c                 | 12 ------------
 testhal/STM32/SDIO/main.c        |  6 +++++-
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/os/hal/platforms/STM32/sdc_lld.c b/os/hal/platforms/STM32/sdc_lld.c
index 78a02028a..cb6eb2099 100644
--- a/os/hal/platforms/STM32/sdc_lld.c
+++ b/os/hal/platforms/STM32/sdc_lld.c
@@ -321,10 +321,7 @@ bool_t sdc_lld_send_cmd_long_crc(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,
 bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
                     uint8_t *buf, uint32_t n) {
   msg_t msg;
-  uint32_t resp[1];
-
-  /* Clearing status.*/
-  SDIO->ICR = 0xFFFFFFFF;
+  uint32_t sts, resp[1];
 
   /* Prepares the DMA channel for reading.*/
   dmaChannelSetup(&STM32_DMA2->channels[STM32_DMA_CHANNEL_4],
@@ -335,8 +332,10 @@ bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
 
   /* Setting up data transfer.
      Options: Card to Controller, Block mode, DMA mode, 512 bytes blocks.*/
-  SDIO->DTIMER = STM32_SDC_DATATIMEOUT;
-  SDIO->DLEN = n;
+  SDIO->ICR   = 0xFFFFFFFF;
+  SDIO->MASK  = SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE |
+                SDIO_MASK_DATAENDIE | SDIO_MASK_STBITERRIE;
+  SDIO->DLEN  = n;
   SDIO->DCTRL = SDIO_DCTRL_RWMOD |
                 SDIO_DCTRL_DBLOCKSIZE_3 | SDIO_DCTRL_DBLOCKSIZE_3 |
                 SDIO_DCTRL_DMAEN |
@@ -346,19 +345,26 @@ bool_t sdc_lld_read(SDCDriver *sdcp, uint32_t startblk,
   dmaEnableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4);
 
   if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_READ_MULTIPLE_BLOCK, n, resp) ||
-      (resp[0] & SDC_R1_ERROR_MASK)) {
-    dmaDisableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4);
-    SDIO->DCTRL = 0;
-    return TRUE;
-  }
+      (resp[0] & SDC_R1_ERROR_MASK))
+    goto error;
 
+  chSysLock();
   chDbgAssert(sdcp->thread == NULL, "sdc_lld_read_blocks(), #1", "not NULL");
   sdcp->thread = chThdSelf();
   chSchGoSleepS(THD_STATE_SUSPENDED);
   chDbgAssert(sdcp->thread == NULL, "sdc_lld_read_blocks(), #2", "not NULL");
   msg = chThdSelf()->p_u.rdymsg;
   chSysUnlock();
-  return msg != RDY_OK;
+
+  if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_STOP_TRANSMISSION, 0, resp))
+    goto error;
+  return FALSE;
+error:
+  dmaDisableChannel(STM32_DMA2, STM32_DMA_CHANNEL_4);
+  SDIO->ICR   = 0xFFFFFFFF;
+  SDIO->MASK  = 0;
+  SDIO->DCTRL = 0;
+  return TRUE;
 }
 
 /**
diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c
index 1874510a0..25fe6a259 100644
--- a/os/hal/src/sdc.c
+++ b/os/hal/src/sdc.c
@@ -281,19 +281,7 @@ bool_t sdcRead(SDCDriver *sdcp, uint32_t startblk,
   if ((sdcp->cardmode & SDC_MODE_HIGH_CAPACITY) == 0)
     startblk *= SDC_BLOCK_SIZE;
 
-/*  if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_APP_CMD, 0, resp) ||
-      (resp[0] & SDC_R1_ERROR_MASK))
-    return TRUE;
-  if (sdc_lld_send_cmd_long_crc(sdcp, 51, 0, resp))
-    return TRUE;
-
-  if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_SET_BLOCK_COUNT, n, resp) ||
-      (resp[0] & SDC_R1_ERROR_MASK))
-    return TRUE;*/
-
   sts = sdc_lld_read(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;
 }
diff --git a/testhal/STM32/SDIO/main.c b/testhal/STM32/SDIO/main.c
index 44a294655..09fe82a9c 100644
--- a/testhal/STM32/SDIO/main.c
+++ b/testhal/STM32/SDIO/main.c
@@ -28,6 +28,8 @@ static const SDCConfig sdccfg = {
   0
 };
 
+static uint8_t buf[SDC_BLOCK_SIZE];
+
 /*
  * Application entry point.
  */
@@ -47,7 +49,9 @@ int main(void) {
    * Initializes the SDIO drivers.
    */
   sdcStart(&SDCD1, &sdccfg);
-  sdcConnect(&SDCD1);
+  if (!sdcConnect(&SDCD1)) {
+    sdcRead(&SDCD1, 0, buf, 1);
+  }
 
   /*
    * Normal main() thread activity.
-- 
cgit v1.2.3