update SD card driver for auto initial.

1 files changed, 2130 insertions, 2129 deletions

diff --git a/bsp/stm32f10x/drivers/sdcard.c b/bsp/stm32f10x/drivers/sdcard.c
index 630e0fe4dd..5d64bddfce 100644
--- a/bsp/stm32f10x/drivers/sdcard.c
+++ b/bsp/stm32f10x/drivers/sdcard.c
@@ -142,46 +142,46 @@ static void DMA_RxConfiguration(uint32_t *BufferDST, uint32_t BufferSize);
   */
 SD_Error SD_Init(void)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  /* Configure SDIO interface GPIO */
-  GPIO_Configuration();
+    /* Configure SDIO interface GPIO */
+    GPIO_Configuration();
 
-  /* Enable the SDIO AHB Clock */
-  RCC_AHBPeriphClockCmd(RCC_AHBPeriph_SDIO, ENABLE);
+    /* Enable the SDIO AHB Clock */
+    RCC_AHBPeriphClockCmd(RCC_AHBPeriph_SDIO, ENABLE);
 
-  /* Enable the DMA2 Clock */
-  RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA2, ENABLE);
+    /* Enable the DMA2 Clock */
+    RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA2, ENABLE);
 
-  SDIO_DeInit();
+    SDIO_DeInit();
 
-  errorstatus = SD_PowerON();
+    errorstatus = SD_PowerON();
 
-  if (errorstatus != SD_OK)
-  {
-    /* CMD Response TimeOut (wait for CMDSENT flag) */
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        /* CMD Response TimeOut (wait for CMDSENT flag) */
+        return(errorstatus);
+    }
 
-  errorstatus = SD_InitializeCards();
+    errorstatus = SD_InitializeCards();
 
-  if (errorstatus != SD_OK)
-  {
-    /* CMD Response TimeOut (wait for CMDSENT flag) */
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        /* CMD Response TimeOut (wait for CMDSENT flag) */
+        return(errorstatus);
+    }
 
-  /* Configure the SDIO peripheral */
-  /* HCLK = 72 MHz, SDIOCLK = 72 MHz, SDIO_CK = HCLK/(2 + 1) = 24 MHz */
-  SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
-  SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
-  SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
-  SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
-  SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
-  SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Enable;
-  SDIO_Init(&SDIO_InitStructure);
+    /* Configure the SDIO peripheral */
+    /* HCLK = 72 MHz, SDIOCLK = 72 MHz, SDIO_CK = HCLK/(2 + 1) = 24 MHz */
+    SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
+    SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
+    SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
+    SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
+    SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
+    SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Enable;
+    SDIO_Init(&SDIO_InitStructure);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -192,69 +192,78 @@ SD_Error SD_Init(void)
   */
 SD_Error SD_PowerON(void)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t response = 0, count = 0, i = 0;
-  bool validvoltage = false;
-  uint32_t SDType = SD_STD_CAPACITY;
+    SD_Error errorstatus = SD_OK;
+    uint32_t response = 0, count = 0, i = 0;
+    bool validvoltage = false;
+    uint32_t SDType = SD_STD_CAPACITY;
 
-  /* Power ON Sequence -------------------------------------------------------*/
-  /* Configure the SDIO peripheral */
-  SDIO_InitStructure.SDIO_ClockDiv = SDIO_INIT_CLK_DIV; /* HCLK = 72MHz, SDIOCLK = 72MHz, SDIO_CK = HCLK/(178 + 2) = 400 KHz */
-  SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
-  SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
-  SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
-  SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
-  SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
-  SDIO_Init(&SDIO_InitStructure);
+    /* Power ON Sequence -------------------------------------------------------*/
+    /* Configure the SDIO peripheral */
+    SDIO_InitStructure.SDIO_ClockDiv = SDIO_INIT_CLK_DIV; /* HCLK = 72MHz, SDIOCLK = 72MHz, SDIO_CK = HCLK/(178 + 2) = 400 KHz */
+    SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
+    SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
+    SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
+    SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
+    SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
+    SDIO_Init(&SDIO_InitStructure);
 
-  /* Set Power State to ON */
-  SDIO_SetPowerState(SDIO_PowerState_ON);
+    /* Set Power State to ON */
+    SDIO_SetPowerState(SDIO_PowerState_ON);
 
-  /* Enable SDIO Clock */
-  SDIO_ClockCmd(ENABLE);
+    /* Enable SDIO Clock */
+    SDIO_ClockCmd(ENABLE);
 
-  /* CMD0: GO_IDLE_STATE -------------------------------------------------------*/
-  /* No CMD response required */
-  SDIO_CmdInitStructure.SDIO_Argument = 0x0;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_GO_IDLE_STATE;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_No;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    /* CMD0: GO_IDLE_STATE -------------------------------------------------------*/
+    /* No CMD response required */
+    SDIO_CmdInitStructure.SDIO_Argument = 0x0;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_GO_IDLE_STATE;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_No;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
 
-  for(i = 0;i < 74; i++)
-  {
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
-    errorstatus = CmdError();
-  }
+    for(i = 0; i < 74; i++)
+    {
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+        errorstatus = CmdError();
+    }
 
-  if (errorstatus != SD_OK)
-  {
-    /* CMD Response TimeOut (wait for CMDSENT flag) */
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        /* CMD Response TimeOut (wait for CMDSENT flag) */
+        return(errorstatus);
+    }
 
-  /* CMD8: SEND_IF_COND --------------------------------------------------------*/
-  /* Send CMD8 to verify SD card interface operating condition */
-  /* Argument: - [31:12]: Reserved (shall be set to '0')
-               - [11:8]: Supply Voltage (VHS) 0x1 (Range: 2.7-3.6 V)
-               - [7:0]: Check Pattern (recommended 0xAA) */
-  /* CMD Response: R7 */
-  SDIO_CmdInitStructure.SDIO_Argument = SD_CHECK_PATTERN;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_IF_COND;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* CMD8: SEND_IF_COND --------------------------------------------------------*/
+    /* Send CMD8 to verify SD card interface operating condition */
+    /* Argument: - [31:12]: Reserved (shall be set to '0')
+                 - [11:8]: Supply Voltage (VHS) 0x1 (Range: 2.7-3.6 V)
+                 - [7:0]: Check Pattern (recommended 0xAA) */
+    /* CMD Response: R7 */
+    SDIO_CmdInitStructure.SDIO_Argument = SD_CHECK_PATTERN;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_IF_COND;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp7Error();
+    errorstatus = CmdResp7Error();
 
-  if (errorstatus == SD_OK)
-  {
-    CardType = SDIO_STD_CAPACITY_SD_CARD_V2_0; /* SD Card 2.0 */
-    SDType = SD_HIGH_CAPACITY;
-  }
-  else
-  {
+    if (errorstatus == SD_OK)
+    {
+        CardType = SDIO_STD_CAPACITY_SD_CARD_V2_0; /* SD Card 2.0 */
+        SDType = SD_HIGH_CAPACITY;
+    }
+    else
+    {
+        /* CMD55 */
+        SDIO_CmdInitStructure.SDIO_Argument = 0x00;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+        errorstatus = CmdResp1Error(SDIO_APP_CMD);
+    }
     /* CMD55 */
     SDIO_CmdInitStructure.SDIO_Argument = 0x00;
     SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
@@ -263,101 +272,92 @@ SD_Error SD_PowerON(void)
     SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
     SDIO_SendCommand(&SDIO_CmdInitStructure);
     errorstatus = CmdResp1Error(SDIO_APP_CMD);
-  }
-  /* CMD55 */
-  SDIO_CmdInitStructure.SDIO_Argument = 0x00;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
-  errorstatus = CmdResp1Error(SDIO_APP_CMD);
 
-  /* If errorstatus is Command TimeOut, it is a MMC card */
-  /* If errorstatus is SD_OK it is a SD card: SD card 2.0 (voltage range mismatch)
-     or SD card 1.x */
-  if (errorstatus == SD_OK)
-  {
-    /* SD CARD */
-    /* Send ACMD41 SD_APP_OP_COND with Argument 0x80100000 */
-    while ((!validvoltage) && (count < SD_MAX_VOLT_TRIAL))
+    /* If errorstatus is Command TimeOut, it is a MMC card */
+    /* If errorstatus is SD_OK it is a SD card: SD card 2.0 (voltage range mismatch)
+       or SD card 1.x */
+    if (errorstatus == SD_OK)
     {
+        /* SD CARD */
+        /* Send ACMD41 SD_APP_OP_COND with Argument 0x80100000 */
+        while ((!validvoltage) && (count < SD_MAX_VOLT_TRIAL))
+        {
 
-      /* SEND CMD55 APP_CMD with RCA as 0 */
-      SDIO_CmdInitStructure.SDIO_Argument = 0x00;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+            /* SEND CMD55 APP_CMD with RCA as 0 */
+            SDIO_CmdInitStructure.SDIO_Argument = 0x00;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp1Error(SDIO_APP_CMD);
+            errorstatus = CmdResp1Error(SDIO_APP_CMD);
 
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
-      SDIO_CmdInitStructure.SDIO_Argument = SD_VOLTAGE_WINDOW_SD | SDType;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_APP_OP_COND;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
+            SDIO_CmdInitStructure.SDIO_Argument = SD_VOLTAGE_WINDOW_SD | SDType;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_APP_OP_COND;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp3Error();
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
+            errorstatus = CmdResp3Error();
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
 
-      response = SDIO_GetResponse(SDIO_RESP1);
-      validvoltage = (bool) (((response >> 31) == 1) ? 1 : 0);
-      count++;
-    }
-    if (count >= SD_MAX_VOLT_TRIAL)
-    {
-      errorstatus = SD_INVALID_VOLTRANGE;
-      return(errorstatus);
-    }
+            response = SDIO_GetResponse(SDIO_RESP1);
+            validvoltage = (bool) (((response >> 31) == 1) ? 1 : 0);
+            count++;
+        }
+        if (count >= SD_MAX_VOLT_TRIAL)
+        {
+            errorstatus = SD_INVALID_VOLTRANGE;
+            return(errorstatus);
+        }
 
-    if (response &= SD_HIGH_CAPACITY)
+        if (response &= SD_HIGH_CAPACITY)
+        {
+            CardType = SDIO_HIGH_CAPACITY_SD_CARD;
+        }
+    }/* else MMC Card */
+    else
     {
-      CardType = SDIO_HIGH_CAPACITY_SD_CARD;
-    }
-  }/* else MMC Card */
-  else
-  {
-    CardType = SDIO_MULTIMEDIA_CARD;
+        CardType = SDIO_MULTIMEDIA_CARD;
 
-    /* Send CMD1 SEND_OP_COND with Argument 0x80FF8000 */
-    while ((!validvoltage) && (count < SD_MAX_VOLT_TRIAL))
-    {
-      /* SEND CMD55 APP_CMD with RCA as 0 */
-      SDIO_CmdInitStructure.SDIO_Argument = SD_VOLTAGE_WINDOW_MMC;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_OP_COND;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+        /* Send CMD1 SEND_OP_COND with Argument 0x80FF8000 */
+        while ((!validvoltage) && (count < SD_MAX_VOLT_TRIAL))
+        {
+            /* SEND CMD55 APP_CMD with RCA as 0 */
+            SDIO_CmdInitStructure.SDIO_Argument = SD_VOLTAGE_WINDOW_MMC;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_OP_COND;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp3Error();
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
+            errorstatus = CmdResp3Error();
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
 
-      response = SDIO_GetResponse(SDIO_RESP1);
-      validvoltage = (bool) (((response >> 31) == 1) ? 1 : 0);
-      count++;
-    }
-    if (count >= SD_MAX_VOLT_TRIAL)
-    {
-      errorstatus = SD_INVALID_VOLTRANGE;
-      return(errorstatus);
+            response = SDIO_GetResponse(SDIO_RESP1);
+            validvoltage = (bool) (((response >> 31) == 1) ? 1 : 0);
+            count++;
+        }
+        if (count >= SD_MAX_VOLT_TRIAL)
+        {
+            errorstatus = SD_INVALID_VOLTRANGE;
+            return(errorstatus);
+        }
     }
-  }
 
-  return(SD_OK);
+    return(SD_OK);
 }
 
 /**
@@ -367,12 +367,12 @@ SD_Error SD_PowerON(void)
   */
 SD_Error SD_PowerOFF(void)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  /* Set Power State to OFF */
-  SDIO_SetPowerState(SDIO_PowerState_OFF);
+    /* Set Power State to OFF */
+    SDIO_SetPowerState(SDIO_PowerState_OFF);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -383,56 +383,56 @@ SD_Error SD_PowerOFF(void)
   */
 SD_Error SD_InitializeCards(void)
 {
-  SD_Error errorstatus = SD_OK;
-  uint16_t rca = 0x01;
-
-  if (SDIO_GetPowerState() == SDIO_PowerState_OFF)
-  {
-    errorstatus = SD_REQUEST_NOT_APPLICABLE;
-    return(errorstatus);
-  }
-
-  if (SDIO_SECURE_DIGITAL_IO_CARD != CardType)
-  {
-    /* Send CMD2 ALL_SEND_CID */
-    SDIO_CmdInitStructure.SDIO_Argument = 0x0;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_ALL_SEND_CID;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Long;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
-
-    errorstatus = CmdResp2Error();
+    SD_Error errorstatus = SD_OK;
+    uint16_t rca = 0x01;
 
-    if (SD_OK != errorstatus)
+    if (SDIO_GetPowerState() == SDIO_PowerState_OFF)
     {
-      return(errorstatus);
+        errorstatus = SD_REQUEST_NOT_APPLICABLE;
+        return(errorstatus);
     }
 
-    CID_Tab[0] = SDIO_GetResponse(SDIO_RESP1);
-    CID_Tab[1] = SDIO_GetResponse(SDIO_RESP2);
-    CID_Tab[2] = SDIO_GetResponse(SDIO_RESP3);
-    CID_Tab[3] = SDIO_GetResponse(SDIO_RESP4);
-  }
-  if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) ||  (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) ||  (SDIO_SECURE_DIGITAL_IO_COMBO_CARD == CardType)
-      ||  (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
-  {
-    /* Send CMD3 SET_REL_ADDR with argument 0 */
-    /* SD Card publishes its RCA. */
-    SDIO_CmdInitStructure.SDIO_Argument = 0x00;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_REL_ADDR;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
+    if (SDIO_SECURE_DIGITAL_IO_CARD != CardType)
+    {
+        /* Send CMD2 ALL_SEND_CID */
+        SDIO_CmdInitStructure.SDIO_Argument = 0x0;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_ALL_SEND_CID;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Long;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp6Error(SDIO_SET_REL_ADDR, &rca);
+        errorstatus = CmdResp2Error();
+
+        if (SD_OK != errorstatus)
+        {
+            return(errorstatus);
+        }
 
-    if (SD_OK != errorstatus)
+        CID_Tab[0] = SDIO_GetResponse(SDIO_RESP1);
+        CID_Tab[1] = SDIO_GetResponse(SDIO_RESP2);
+        CID_Tab[2] = SDIO_GetResponse(SDIO_RESP3);
+        CID_Tab[3] = SDIO_GetResponse(SDIO_RESP4);
+    }
+    if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) ||  (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) ||  (SDIO_SECURE_DIGITAL_IO_COMBO_CARD == CardType)
+            ||  (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
     {
-      return(errorstatus);
+        /* Send CMD3 SET_REL_ADDR with argument 0 */
+        /* SD Card publishes its RCA. */
+        SDIO_CmdInitStructure.SDIO_Argument = 0x00;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_REL_ADDR;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+        errorstatus = CmdResp6Error(SDIO_SET_REL_ADDR, &rca);
+
+        if (SD_OK != errorstatus)
+        {
+            return(errorstatus);
+        }
     }
-  }
     if (SDIO_MULTIMEDIA_CARD == CardType)
     {
         /* Send CMD3 SET_REL_ADDR with argument 0 */
@@ -452,34 +452,34 @@ SD_Error SD_InitializeCards(void)
         }
     }
 
-  if (SDIO_SECURE_DIGITAL_IO_CARD != CardType)
-  {
-    RCA = rca;
+    if (SDIO_SECURE_DIGITAL_IO_CARD != CardType)
+    {
+        RCA = rca;
 
-    /* Send CMD9 SEND_CSD with argument as card's RCA */
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)(rca << 16);
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_CSD;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Long;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
+        /* Send CMD9 SEND_CSD with argument as card's RCA */
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)(rca << 16);
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_CSD;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Long;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp2Error();
+        errorstatus = CmdResp2Error();
 
-    if (SD_OK != errorstatus)
-    {
-      return(errorstatus);
-    }
+        if (SD_OK != errorstatus)
+        {
+            return(errorstatus);
+        }
 
-    CSD_Tab[0] = SDIO_GetResponse(SDIO_RESP1);
-    CSD_Tab[1] = SDIO_GetResponse(SDIO_RESP2);
-    CSD_Tab[2] = SDIO_GetResponse(SDIO_RESP3);
-    CSD_Tab[3] = SDIO_GetResponse(SDIO_RESP4);
-  }
+        CSD_Tab[0] = SDIO_GetResponse(SDIO_RESP1);
+        CSD_Tab[1] = SDIO_GetResponse(SDIO_RESP2);
+        CSD_Tab[2] = SDIO_GetResponse(SDIO_RESP3);
+        CSD_Tab[3] = SDIO_GetResponse(SDIO_RESP4);
+    }
 
-  errorstatus = SD_OK; /* All cards get intialized */
+    errorstatus = SD_OK; /* All cards get intialized */
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -490,204 +490,204 @@ SD_Error SD_InitializeCards(void)
   */
 SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
 {
-  SD_Error errorstatus = SD_OK;
-  uint8_t tmp = 0;
+    SD_Error errorstatus = SD_OK;
+    uint8_t tmp = 0;
 
-  cardinfo->CardType = (uint8_t)CardType;
-  cardinfo->RCA = (uint16_t)RCA;
+    cardinfo->CardType = (uint8_t)CardType;
+    cardinfo->RCA = (uint16_t)RCA;
 
-  /* Byte 0 */
-  tmp = (uint8_t)((CSD_Tab[0] & 0xFF000000) >> 24);
-  cardinfo->SD_csd.CSDStruct = (tmp & 0xC0) >> 6;
-  cardinfo->SD_csd.SysSpecVersion = (tmp & 0x3C) >> 2;
-  cardinfo->SD_csd.Reserved1 = tmp & 0x03;
+    /* Byte 0 */
+    tmp = (uint8_t)((CSD_Tab[0] & 0xFF000000) >> 24);
+    cardinfo->SD_csd.CSDStruct = (tmp & 0xC0) >> 6;
+    cardinfo->SD_csd.SysSpecVersion = (tmp & 0x3C) >> 2;
+    cardinfo->SD_csd.Reserved1 = tmp & 0x03;
 
-  /* Byte 1 */
-  tmp = (uint8_t)((CSD_Tab[0] & 0x00FF0000) >> 16);
-  cardinfo->SD_csd.TAAC = tmp;
+    /* Byte 1 */
+    tmp = (uint8_t)((CSD_Tab[0] & 0x00FF0000) >> 16);
+    cardinfo->SD_csd.TAAC = tmp;
 
-  /* Byte 2 */
-  tmp = (uint8_t)((CSD_Tab[0] & 0x0000FF00) >> 8);
-  cardinfo->SD_csd.NSAC = tmp;
+    /* Byte 2 */
+    tmp = (uint8_t)((CSD_Tab[0] & 0x0000FF00) >> 8);
+    cardinfo->SD_csd.NSAC = tmp;
 
-  /* Byte 3 */
-  tmp = (uint8_t)(CSD_Tab[0] & 0x000000FF);
-  cardinfo->SD_csd.MaxBusClkFrec = tmp;
+    /* Byte 3 */
+    tmp = (uint8_t)(CSD_Tab[0] & 0x000000FF);
+    cardinfo->SD_csd.MaxBusClkFrec = tmp;
 
-  /* Byte 4 */
-  tmp = (uint8_t)((CSD_Tab[1] & 0xFF000000) >> 24);
-  cardinfo->SD_csd.CardComdClasses = tmp << 4;
+    /* Byte 4 */
+    tmp = (uint8_t)((CSD_Tab[1] & 0xFF000000) >> 24);
+    cardinfo->SD_csd.CardComdClasses = tmp << 4;
 
-  /* Byte 5 */
-  tmp = (uint8_t)((CSD_Tab[1] & 0x00FF0000) >> 16);
-  cardinfo->SD_csd.CardComdClasses |= (tmp & 0xF0) >> 4;
-  cardinfo->SD_csd.RdBlockLen = tmp & 0x0F;
+    /* Byte 5 */
+    tmp = (uint8_t)((CSD_Tab[1] & 0x00FF0000) >> 16);
+    cardinfo->SD_csd.CardComdClasses |= (tmp & 0xF0) >> 4;
+    cardinfo->SD_csd.RdBlockLen = tmp & 0x0F;
 
-  /* Byte 6 */
-  tmp = (uint8_t)((CSD_Tab[1] & 0x0000FF00) >> 8);
-  cardinfo->SD_csd.PartBlockRead = (tmp & 0x80) >> 7;
-  cardinfo->SD_csd.WrBlockMisalign = (tmp & 0x40) >> 6;
-  cardinfo->SD_csd.RdBlockMisalign = (tmp & 0x20) >> 5;
-  cardinfo->SD_csd.DSRImpl = (tmp & 0x10) >> 4;
-  cardinfo->SD_csd.Reserved2 = 0; /* Reserved */
+    /* Byte 6 */
+    tmp = (uint8_t)((CSD_Tab[1] & 0x0000FF00) >> 8);
+    cardinfo->SD_csd.PartBlockRead = (tmp & 0x80) >> 7;
+    cardinfo->SD_csd.WrBlockMisalign = (tmp & 0x40) >> 6;
+    cardinfo->SD_csd.RdBlockMisalign = (tmp & 0x20) >> 5;
+    cardinfo->SD_csd.DSRImpl = (tmp & 0x10) >> 4;
+    cardinfo->SD_csd.Reserved2 = 0; /* Reserved */
 
-  if ((CardType == SDIO_STD_CAPACITY_SD_CARD_V1_1) || (CardType == SDIO_STD_CAPACITY_SD_CARD_V2_0))
-  {
-    cardinfo->SD_csd.DeviceSize = (tmp & 0x03) << 10;
+    if ((CardType == SDIO_STD_CAPACITY_SD_CARD_V1_1) || (CardType == SDIO_STD_CAPACITY_SD_CARD_V2_0))
+    {
+        cardinfo->SD_csd.DeviceSize = (tmp & 0x03) << 10;
 
-    /* Byte 7 */
-    tmp = (uint8_t)(CSD_Tab[1] & 0x000000FF);
-    cardinfo->SD_csd.DeviceSize |= (tmp) << 2;
+        /* Byte 7 */
+        tmp = (uint8_t)(CSD_Tab[1] & 0x000000FF);
+        cardinfo->SD_csd.DeviceSize |= (tmp) << 2;
 
-    /* Byte 8 */
-    tmp = (uint8_t)((CSD_Tab[2] & 0xFF000000) >> 24);
-    cardinfo->SD_csd.DeviceSize |= (tmp & 0xC0) >> 6;
+        /* Byte 8 */
+        tmp = (uint8_t)((CSD_Tab[2] & 0xFF000000) >> 24);
+        cardinfo->SD_csd.DeviceSize |= (tmp & 0xC0) >> 6;
 
-    cardinfo->SD_csd.MaxRdCurrentVDDMin = (tmp & 0x38) >> 3;
-    cardinfo->SD_csd.MaxRdCurrentVDDMax = (tmp & 0x07);
+        cardinfo->SD_csd.MaxRdCurrentVDDMin = (tmp & 0x38) >> 3;
+        cardinfo->SD_csd.MaxRdCurrentVDDMax = (tmp & 0x07);
 
-    /* Byte 9 */
-    tmp = (uint8_t)((CSD_Tab[2] & 0x00FF0000) >> 16);
-    cardinfo->SD_csd.MaxWrCurrentVDDMin = (tmp & 0xE0) >> 5;
-    cardinfo->SD_csd.MaxWrCurrentVDDMax = (tmp & 0x1C) >> 2;
-    cardinfo->SD_csd.DeviceSizeMul = (tmp & 0x03) << 1;
-    /* Byte 10 */
-    tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8);
-    cardinfo->SD_csd.DeviceSizeMul |= (tmp & 0x80) >> 7;
+        /* Byte 9 */
+        tmp = (uint8_t)((CSD_Tab[2] & 0x00FF0000) >> 16);
+        cardinfo->SD_csd.MaxWrCurrentVDDMin = (tmp & 0xE0) >> 5;
+        cardinfo->SD_csd.MaxWrCurrentVDDMax = (tmp & 0x1C) >> 2;
+        cardinfo->SD_csd.DeviceSizeMul = (tmp & 0x03) << 1;
+        /* Byte 10 */
+        tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8);
+        cardinfo->SD_csd.DeviceSizeMul |= (tmp & 0x80) >> 7;
 
-    cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) ;
-    cardinfo->CardCapacity *= (1 << (cardinfo->SD_csd.DeviceSizeMul + 2));
-    cardinfo->CardBlockSize = 1 << (cardinfo->SD_csd.RdBlockLen);
-    cardinfo->CardCapacity *= cardinfo->CardBlockSize;
-  }
-  else if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-  {
-    /* Byte 7 */
-    tmp = (uint8_t)(CSD_Tab[1] & 0x000000FF);
-    cardinfo->SD_csd.DeviceSize = (tmp & 0x3F) << 16;
+        cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) ;
+        cardinfo->CardCapacity *= (1 << (cardinfo->SD_csd.DeviceSizeMul + 2));
+        cardinfo->CardBlockSize = 1 << (cardinfo->SD_csd.RdBlockLen);
+        cardinfo->CardCapacity *= cardinfo->CardBlockSize;
+    }
+    else if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
+    {
+        /* Byte 7 */
+        tmp = (uint8_t)(CSD_Tab[1] & 0x000000FF);
+        cardinfo->SD_csd.DeviceSize = (tmp & 0x3F) << 16;
 
-    /* Byte 8 */
-    tmp = (uint8_t)((CSD_Tab[2] & 0xFF000000) >> 24);
+        /* Byte 8 */
+        tmp = (uint8_t)((CSD_Tab[2] & 0xFF000000) >> 24);
 
-    cardinfo->SD_csd.DeviceSize |= (tmp << 8);
+        cardinfo->SD_csd.DeviceSize |= (tmp << 8);
 
-    /* Byte 9 */
-    tmp = (uint8_t)((CSD_Tab[2] & 0x00FF0000) >> 16);
+        /* Byte 9 */
+        tmp = (uint8_t)((CSD_Tab[2] & 0x00FF0000) >> 16);
 
-    cardinfo->SD_csd.DeviceSize |= (tmp);
+        cardinfo->SD_csd.DeviceSize |= (tmp);
 
-    /* Byte 10 */
-    tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8);
+        /* Byte 10 */
+        tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8);
 
-    cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) * 512 * 1024;
-    cardinfo->CardBlockSize = 512;
-  }
+        cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) * 512 * 1024;
+        cardinfo->CardBlockSize = 512;
+    }
 
 
-  cardinfo->SD_csd.EraseGrSize = (tmp & 0x40) >> 6;
-  cardinfo->SD_csd.EraseGrMul = (tmp & 0x3F) << 1;
+    cardinfo->SD_csd.EraseGrSize = (tmp & 0x40) >> 6;
+    cardinfo->SD_csd.EraseGrMul = (tmp & 0x3F) << 1;
 
-  /* Byte 11 */
-  tmp = (uint8_t)(CSD_Tab[2] & 0x000000FF);
-  cardinfo->SD_csd.EraseGrMul |= (tmp & 0x80) >> 7;
-  cardinfo->SD_csd.WrProtectGrSize = (tmp & 0x7F);
+    /* Byte 11 */
+    tmp = (uint8_t)(CSD_Tab[2] & 0x000000FF);
+    cardinfo->SD_csd.EraseGrMul |= (tmp & 0x80) >> 7;
+    cardinfo->SD_csd.WrProtectGrSize = (tmp & 0x7F);
 
-  /* Byte 12 */
-  tmp = (uint8_t)((CSD_Tab[3] & 0xFF000000) >> 24);
-  cardinfo->SD_csd.WrProtectGrEnable = (tmp & 0x80) >> 7;
-  cardinfo->SD_csd.ManDeflECC = (tmp & 0x60) >> 5;
-  cardinfo->SD_csd.WrSpeedFact = (tmp & 0x1C) >> 2;
-  cardinfo->SD_csd.MaxWrBlockLen = (tmp & 0x03) << 2;
+    /* Byte 12 */
+    tmp = (uint8_t)((CSD_Tab[3] & 0xFF000000) >> 24);
+    cardinfo->SD_csd.WrProtectGrEnable = (tmp & 0x80) >> 7;
+    cardinfo->SD_csd.ManDeflECC = (tmp & 0x60) >> 5;
+    cardinfo->SD_csd.WrSpeedFact = (tmp & 0x1C) >> 2;
+    cardinfo->SD_csd.MaxWrBlockLen = (tmp & 0x03) << 2;
 
-  /* Byte 13 */
-  tmp = (uint8_t)((CSD_Tab[3] & 0x00FF0000) >> 16);
-  cardinfo->SD_csd.MaxWrBlockLen |= (tmp & 0xC0) >> 6;
-  cardinfo->SD_csd.WriteBlockPaPartial = (tmp & 0x20) >> 5;
-  cardinfo->SD_csd.Reserved3 = 0;
-  cardinfo->SD_csd.ContentProtectAppli = (tmp & 0x01);
+    /* Byte 13 */
+    tmp = (uint8_t)((CSD_Tab[3] & 0x00FF0000) >> 16);
+    cardinfo->SD_csd.MaxWrBlockLen |= (tmp & 0xC0) >> 6;
+    cardinfo->SD_csd.WriteBlockPaPartial = (tmp & 0x20) >> 5;
+    cardinfo->SD_csd.Reserved3 = 0;
+    cardinfo->SD_csd.ContentProtectAppli = (tmp & 0x01);
 
-  /* Byte 14 */
-  tmp = (uint8_t)((CSD_Tab[3] & 0x0000FF00) >> 8);
-  cardinfo->SD_csd.FileFormatGrouop = (tmp & 0x80) >> 7;
-  cardinfo->SD_csd.CopyFlag = (tmp & 0x40) >> 6;
-  cardinfo->SD_csd.PermWrProtect = (tmp & 0x20) >> 5;
-  cardinfo->SD_csd.TempWrProtect = (tmp & 0x10) >> 4;
-  cardinfo->SD_csd.FileFormat = (tmp & 0x0C) >> 2;
-  cardinfo->SD_csd.ECC = (tmp & 0x03);
+    /* Byte 14 */
+    tmp = (uint8_t)((CSD_Tab[3] & 0x0000FF00) >> 8);
+    cardinfo->SD_csd.FileFormatGrouop = (tmp & 0x80) >> 7;
+    cardinfo->SD_csd.CopyFlag = (tmp & 0x40) >> 6;
+    cardinfo->SD_csd.PermWrProtect = (tmp & 0x20) >> 5;
+    cardinfo->SD_csd.TempWrProtect = (tmp & 0x10) >> 4;
+    cardinfo->SD_csd.FileFormat = (tmp & 0x0C) >> 2;
+    cardinfo->SD_csd.ECC = (tmp & 0x03);
 
-  /* Byte 15 */
-  tmp = (uint8_t)(CSD_Tab[3] & 0x000000FF);
-  cardinfo->SD_csd.CSD_CRC = (tmp & 0xFE) >> 1;
-  cardinfo->SD_csd.Reserved4 = 1;
+    /* Byte 15 */
+    tmp = (uint8_t)(CSD_Tab[3] & 0x000000FF);
+    cardinfo->SD_csd.CSD_CRC = (tmp & 0xFE) >> 1;
+    cardinfo->SD_csd.Reserved4 = 1;
 
 
-  /* Byte 0 */
-  tmp = (uint8_t)((CID_Tab[0] & 0xFF000000) >> 24);
-  cardinfo->SD_cid.ManufacturerID = tmp;
+    /* Byte 0 */
+    tmp = (uint8_t)((CID_Tab[0] & 0xFF000000) >> 24);
+    cardinfo->SD_cid.ManufacturerID = tmp;
 
-  /* Byte 1 */
-  tmp = (uint8_t)((CID_Tab[0] & 0x00FF0000) >> 16);
-  cardinfo->SD_cid.OEM_AppliID = tmp << 8;
+    /* Byte 1 */
+    tmp = (uint8_t)((CID_Tab[0] & 0x00FF0000) >> 16);
+    cardinfo->SD_cid.OEM_AppliID = tmp << 8;
 
-  /* Byte 2 */
-  tmp = (uint8_t)((CID_Tab[0] & 0x000000FF00) >> 8);
-  cardinfo->SD_cid.OEM_AppliID |= tmp;
+    /* Byte 2 */
+    tmp = (uint8_t)((CID_Tab[0] & 0x000000FF00) >> 8);
+    cardinfo->SD_cid.OEM_AppliID |= tmp;
 
-  /* Byte 3 */
-  tmp = (uint8_t)(CID_Tab[0] & 0x000000FF);
-  cardinfo->SD_cid.ProdName1 = tmp << 24;
+    /* Byte 3 */
+    tmp = (uint8_t)(CID_Tab[0] & 0x000000FF);
+    cardinfo->SD_cid.ProdName1 = tmp << 24;
 
-  /* Byte 4 */
-  tmp = (uint8_t)((CID_Tab[1] & 0xFF000000) >> 24);
-  cardinfo->SD_cid.ProdName1 |= tmp << 16;
+    /* Byte 4 */
+    tmp = (uint8_t)((CID_Tab[1] & 0xFF000000) >> 24);
+    cardinfo->SD_cid.ProdName1 |= tmp << 16;
 
-  /* Byte 5 */
-  tmp = (uint8_t)((CID_Tab[1] & 0x00FF0000) >> 16);
-  cardinfo->SD_cid.ProdName1 |= tmp << 8;
+    /* Byte 5 */
+    tmp = (uint8_t)((CID_Tab[1] & 0x00FF0000) >> 16);
+    cardinfo->SD_cid.ProdName1 |= tmp << 8;
 
-  /* Byte 6 */
-  tmp = (uint8_t)((CID_Tab[1] & 0x0000FF00) >> 8);
-  cardinfo->SD_cid.ProdName1 |= tmp;
+    /* Byte 6 */
+    tmp = (uint8_t)((CID_Tab[1] & 0x0000FF00) >> 8);
+    cardinfo->SD_cid.ProdName1 |= tmp;
 
-  /* Byte 7 */
-  tmp = (uint8_t)(CID_Tab[1] & 0x000000FF);
-  cardinfo->SD_cid.ProdName2 = tmp;
+    /* Byte 7 */
+    tmp = (uint8_t)(CID_Tab[1] & 0x000000FF);
+    cardinfo->SD_cid.ProdName2 = tmp;
 
-  /* Byte 8 */
-  tmp = (uint8_t)((CID_Tab[2] & 0xFF000000) >> 24);
-  cardinfo->SD_cid.ProdRev = tmp;
+    /* Byte 8 */
+    tmp = (uint8_t)((CID_Tab[2] & 0xFF000000) >> 24);
+    cardinfo->SD_cid.ProdRev = tmp;
 
-  /* Byte 9 */
-  tmp = (uint8_t)((CID_Tab[2] & 0x00FF0000) >> 16);
-  cardinfo->SD_cid.ProdSN = tmp << 24;
+    /* Byte 9 */
+    tmp = (uint8_t)((CID_Tab[2] & 0x00FF0000) >> 16);
+    cardinfo->SD_cid.ProdSN = tmp << 24;
 
-  /* Byte 10 */
-  tmp = (uint8_t)((CID_Tab[2] & 0x0000FF00) >> 8);
-  cardinfo->SD_cid.ProdSN |= tmp << 16;
+    /* Byte 10 */
+    tmp = (uint8_t)((CID_Tab[2] & 0x0000FF00) >> 8);
+    cardinfo->SD_cid.ProdSN |= tmp << 16;
 
-  /* Byte 11 */
-  tmp = (uint8_t)(CID_Tab[2] & 0x000000FF);
-  cardinfo->SD_cid.ProdSN |= tmp << 8;
+    /* Byte 11 */
+    tmp = (uint8_t)(CID_Tab[2] & 0x000000FF);
+    cardinfo->SD_cid.ProdSN |= tmp << 8;
 
-  /* Byte 12 */
-  tmp = (uint8_t)((CID_Tab[3] & 0xFF000000) >> 24);
-  cardinfo->SD_cid.ProdSN |= tmp;
+    /* Byte 12 */
+    tmp = (uint8_t)((CID_Tab[3] & 0xFF000000) >> 24);
+    cardinfo->SD_cid.ProdSN |= tmp;
 
-  /* Byte 13 */
-  tmp = (uint8_t)((CID_Tab[3] & 0x00FF0000) >> 16);
-  cardinfo->SD_cid.Reserved1 |= (tmp & 0xF0) >> 4;
-  cardinfo->SD_cid.ManufactDate = (tmp & 0x0F) << 8;
+    /* Byte 13 */
+    tmp = (uint8_t)((CID_Tab[3] & 0x00FF0000) >> 16);
+    cardinfo->SD_cid.Reserved1 |= (tmp & 0xF0) >> 4;
+    cardinfo->SD_cid.ManufactDate = (tmp & 0x0F) << 8;
 
-  /* Byte 14 */
-  tmp = (uint8_t)((CID_Tab[3] & 0x0000FF00) >> 8);
-  cardinfo->SD_cid.ManufactDate |= tmp;
+    /* Byte 14 */
+    tmp = (uint8_t)((CID_Tab[3] & 0x0000FF00) >> 8);
+    cardinfo->SD_cid.ManufactDate |= tmp;
 
-  /* Byte 15 */
-  tmp = (uint8_t)(CID_Tab[3] & 0x000000FF);
-  cardinfo->SD_cid.CID_CRC = (tmp & 0xFE) >> 1;
-  cardinfo->SD_cid.Reserved2 = 1;
+    /* Byte 15 */
+    tmp = (uint8_t)(CID_Tab[3] & 0x000000FF);
+    cardinfo->SD_cid.CID_CRC = (tmp & 0xFE) >> 1;
+    cardinfo->SD_cid.Reserved2 = 1;
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -702,56 +702,56 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo)
   */
 SD_Error SD_EnableWideBusOperation(uint32_t WideMode)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  /* MMC Card doesn't support this feature */
-  if (SDIO_MULTIMEDIA_CARD == CardType)
-  {
-    errorstatus = SD_UNSUPPORTED_FEATURE;
-    return(errorstatus);
-  }
-  else if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
-  {
-    if (SDIO_BusWide_8b == WideMode)
+    /* MMC Card doesn't support this feature */
+    if (SDIO_MULTIMEDIA_CARD == CardType)
     {
-      errorstatus = SD_UNSUPPORTED_FEATURE;
-      return(errorstatus);
+        errorstatus = SD_UNSUPPORTED_FEATURE;
+        return(errorstatus);
     }
-    else if (SDIO_BusWide_4b == WideMode)
+    else if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
     {
-      errorstatus = SDEnWideBus(ENABLE);
+        if (SDIO_BusWide_8b == WideMode)
+        {
+            errorstatus = SD_UNSUPPORTED_FEATURE;
+            return(errorstatus);
+        }
+        else if (SDIO_BusWide_4b == WideMode)
+        {
+            errorstatus = SDEnWideBus(ENABLE);
 
-      if (SD_OK == errorstatus)
-      {
-        /* Configure the SDIO peripheral */
-        SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
-        SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
-        SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
-        SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
-        SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_4b;
-        SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
-        SDIO_Init(&SDIO_InitStructure);
-      }
-    }
-    else
-    {
-      errorstatus = SDEnWideBus(DISABLE);
+            if (SD_OK == errorstatus)
+            {
+                /* Configure the SDIO peripheral */
+                SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
+                SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
+                SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
+                SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
+                SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_4b;
+                SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
+                SDIO_Init(&SDIO_InitStructure);
+            }
+        }
+        else
+        {
+            errorstatus = SDEnWideBus(DISABLE);
 
-      if (SD_OK == errorstatus)
-      {
-        /* Configure the SDIO peripheral */
-        SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
-        SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
-        SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
-        SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
-        SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
-        SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
-        SDIO_Init(&SDIO_InitStructure);
-      }
+            if (SD_OK == errorstatus)
+            {
+                /* Configure the SDIO peripheral */
+                SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV;
+                SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising;
+                SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable;
+                SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
+                SDIO_InitStructure.SDIO_BusWide = SDIO_BusWide_1b;
+                SDIO_InitStructure.SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
+                SDIO_Init(&SDIO_InitStructure);
+            }
+        }
     }
-  }
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -766,17 +766,17 @@ SD_Error SD_EnableWideBusOperation(uint32_t WideMode)
   */
 SD_Error SD_SetDeviceMode(uint32_t Mode)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  if ((Mode == SD_DMA_MODE) || (Mode == SD_INTERRUPT_MODE) || (Mode == SD_POLLING_MODE))
-  {
-    DeviceMode = Mode;
-  }
-  else
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-  }
-  return(errorstatus);
+    if ((Mode == SD_DMA_MODE) || (Mode == SD_INTERRUPT_MODE) || (Mode == SD_POLLING_MODE))
+    {
+        DeviceMode = Mode;
+    }
+    else
+    {
+        errorstatus = SD_INVALID_PARAMETER;
+    }
+    return(errorstatus);
 
 }
 
@@ -787,19 +787,19 @@ SD_Error SD_SetDeviceMode(uint32_t Mode)
   */
 SD_Error SD_SelectDeselect(uint32_t addr)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  /* Send CMD7 SDIO_SEL_DESEL_CARD */
-  SDIO_CmdInitStructure.SDIO_Argument =  addr;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEL_DESEL_CARD;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Send CMD7 SDIO_SEL_DESEL_CARD */
+    SDIO_CmdInitStructure.SDIO_Argument =  addr;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEL_DESEL_CARD;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_SEL_DESEL_CARD);
+    errorstatus = CmdResp1Error(SDIO_SEL_DESEL_CARD);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -812,170 +812,170 @@ SD_Error SD_SelectDeselect(uint32_t addr)
   */
 SD_Error SD_ReadBlock(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t count = 0, *tempbuff = readbuff;
-  uint8_t power = 0;
+    SD_Error errorstatus = SD_OK;
+    uint32_t count = 0, *tempbuff = readbuff;
+    uint8_t power = 0;
 
-  if (NULL == readbuff)
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
+    if (NULL == readbuff)
+    {
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
+    }
 
-  TransferError = SD_OK;
-  TransferEnd = 0;
-  TotalNumberOfBytes = 0;
+    TransferError = SD_OK;
+    TransferEnd = 0;
+    TotalNumberOfBytes = 0;
 
-  /* Clear all DPSM configuration */
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = 0;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
-  SDIO_DMACmd(DISABLE);
+    /* Clear all DPSM configuration */
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = 0;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DMACmd(DISABLE);
 
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
+    {
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
+    }
 
-  if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-  {
-    BlockSize = 512;
-    // addr /= 512;
-  }
-  if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
-  {
-    power = convert_from_bytes_to_power_of_two(BlockSize);
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
+    {
+        BlockSize = 512;
+        // addr /= 512;
+    }
+    if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
+    {
+        power = convert_from_bytes_to_power_of_two(BlockSize);
 
-    /* Set Block Size for Card */
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
+        /* Set Block Size for Card */
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
+        errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
 
-    if (SD_OK != errorstatus)
+        if (SD_OK != errorstatus)
+        {
+            return(errorstatus);
+        }
+    }
+    else
     {
-      return(errorstatus);
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
     }
-  }
-  else
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
 
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = BlockSize;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = BlockSize;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
 
-  TotalNumberOfBytes = BlockSize;
-  StopCondition = 0;
-  DestBuffer = readbuff;
+    TotalNumberOfBytes = BlockSize;
+    StopCondition = 0;
+    DestBuffer = readbuff;
 
-  /* Send CMD17 READ_SINGLE_BLOCK */
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)addr;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_READ_SINGLE_BLOCK;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Send CMD17 READ_SINGLE_BLOCK */
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)addr;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_READ_SINGLE_BLOCK;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_READ_SINGLE_BLOCK);
+    errorstatus = CmdResp1Error(SDIO_READ_SINGLE_BLOCK);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
-  /* In case of single block transfer, no need of stop transfer at all.*/
-  if (DeviceMode == SD_POLLING_MODE)
-  {
-    /* Polling mode */
-    while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR)))
+    if (errorstatus != SD_OK)
     {
-      if (SDIO_GetFlagStatus(SDIO_FLAG_RXFIFOHF) != RESET)
-      {
-        for (count = 0; count < 8; count++)
+        return(errorstatus);
+    }
+    /* In case of single block transfer, no need of stop transfer at all.*/
+    if (DeviceMode == SD_POLLING_MODE)
+    {
+        /* Polling mode */
+        while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR)))
         {
-          *(tempbuff + count) = SDIO_ReadData();
+            if (SDIO_GetFlagStatus(SDIO_FLAG_RXFIFOHF) != RESET)
+            {
+                for (count = 0; count < 8; count++)
+                {
+                    *(tempbuff + count) = SDIO_ReadData();
+                }
+                tempbuff += 8;
+            }
         }
-        tempbuff += 8;
-      }
-    }
 
-    if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
-      errorstatus = SD_DATA_TIMEOUT;
-      return(errorstatus);
-    }
-    else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
-      errorstatus = SD_DATA_CRC_FAIL;
-      return(errorstatus);
-    }
-    else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
-      errorstatus = SD_RX_OVERRUN;
-      return(errorstatus);
+        if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
+            errorstatus = SD_DATA_TIMEOUT;
+            return(errorstatus);
+        }
+        else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
+            errorstatus = SD_DATA_CRC_FAIL;
+            return(errorstatus);
+        }
+        else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
+            errorstatus = SD_RX_OVERRUN;
+            return(errorstatus);
+        }
+        else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_STBITERR);
+            errorstatus = SD_START_BIT_ERR;
+            return(errorstatus);
+        }
+        while (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
+        {
+            *tempbuff = SDIO_ReadData();
+            tempbuff++;
+        }
+
+        /* Clear all the static flags */
+        SDIO_ClearFlag(SDIO_STATIC_FLAGS);
     }
-    else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+    else if (DeviceMode == SD_INTERRUPT_MODE)
     {
-      SDIO_ClearFlag(SDIO_FLAG_STBITERR);
-      errorstatus = SD_START_BIT_ERR;
-      return(errorstatus);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_RXFIFOHF | SDIO_IT_STBITERR, ENABLE);
+        while ((TransferEnd == 0) && (TransferError == SD_OK))
+        {}
+        if (TransferError != SD_OK)
+        {
+            return(TransferError);
+        }
     }
-    while (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
+    else if (DeviceMode == SD_DMA_MODE)
     {
-      *tempbuff = SDIO_ReadData();
-      tempbuff++;
-    }
+        rt_tick_t tick;
 
-    /* Clear all the static flags */
-    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
-  }
-  else if (DeviceMode == SD_INTERRUPT_MODE)
-  {
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_RXFIFOHF | SDIO_IT_STBITERR, ENABLE);
-    while ((TransferEnd == 0) && (TransferError == SD_OK))
-    {}
-    if (TransferError != SD_OK)
-    {
-      return(TransferError);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
+        SDIO_DMACmd(ENABLE);
+        tick = rt_tick_get();
+        DMA_RxConfiguration(readbuff, BlockSize);
+        while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
+        {
+            if ((TransferError != SD_OK) || (rt_tick_get() - tick > 10))
+            {
+                errorstatus = SD_ERROR;
+                // rt_kprintf("sd error\n");
+                break;
+            }
+        }
     }
-  }
-  else if (DeviceMode == SD_DMA_MODE)
-  {
-    rt_tick_t tick;
-
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
-    SDIO_DMACmd(ENABLE);
-	tick = rt_tick_get();
-    DMA_RxConfiguration(readbuff, BlockSize);
-    while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
-    {
-      if ((TransferError != SD_OK) || (rt_tick_get() - tick > 10))
-	  {
-	    errorstatus = SD_ERROR;
-		// rt_kprintf("sd error\n");
-		break;
-	  }
-	}
-  }
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -989,208 +989,208 @@ SD_Error SD_ReadBlock(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize)
   */
 SD_Error SD_ReadMultiBlocks(uint32_t addr, uint32_t *readbuff, uint16_t BlockSize, uint32_t NumberOfBlocks)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t count = 0, *tempbuff = readbuff;
-  uint8_t power = 0;
-
-  if (NULL == readbuff)
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
+    SD_Error errorstatus = SD_OK;
+    uint32_t count = 0, *tempbuff = readbuff;
+    uint8_t power = 0;
 
-  TransferError = SD_OK;
-  TransferEnd = 0;
-  TotalNumberOfBytes = 0;
-
-  /* Clear all DPSM configuration */
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = 0;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
-  SDIO_DMACmd(DISABLE);
-
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
-
-  if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-  {
-    BlockSize = 512;
-    // addr /= 512;
-  }
+    if (NULL == readbuff)
+    {
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
+    }
 
-  if ((BlockSize > 0) && (BlockSize <= 2048) && (0 == (BlockSize & (BlockSize - 1))))
-  {
-    power = convert_from_bytes_to_power_of_two(BlockSize);
+    TransferError = SD_OK;
+    TransferEnd = 0;
+    TotalNumberOfBytes = 0;
 
-    /* Set Block Size for Card */
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
-
-    errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
+    /* Clear all DPSM configuration */
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = 0;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DMACmd(DISABLE);
 
-    if (SD_OK != errorstatus)
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
     {
-      return(errorstatus);
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
     }
-  }
-  else
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
 
-  if (NumberOfBlocks > 1)
-  {
-    /* Common to all modes */
-    if (NumberOfBlocks * BlockSize > SD_MAX_DATA_LENGTH)
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
     {
-      errorstatus = SD_INVALID_PARAMETER;
-      return(errorstatus);
+        BlockSize = 512;
+        // addr /= 512;
     }
 
-    TotalNumberOfBytes = NumberOfBlocks * BlockSize;
-    StopCondition = 1;
-    DestBuffer = readbuff;
-
-    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-    SDIO_DataInitStructure.SDIO_DataLength = NumberOfBlocks * BlockSize;
-    SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
-    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
-    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
-    SDIO_DataConfig(&SDIO_DataInitStructure);
+    if ((BlockSize > 0) && (BlockSize <= 2048) && (0 == (BlockSize & (BlockSize - 1))))
+    {
+        power = convert_from_bytes_to_power_of_two(BlockSize);
 
-    /* Send CMD18 READ_MULT_BLOCK with argument data address */
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)addr;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_READ_MULT_BLOCK;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
+        /* Set Block Size for Card */
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp1Error(SDIO_READ_MULT_BLOCK);
+        errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
 
-    if (errorstatus != SD_OK)
+        if (SD_OK != errorstatus)
+        {
+            return(errorstatus);
+        }
+    }
+    else
     {
-      return(errorstatus);
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
     }
 
-    if (DeviceMode == SD_POLLING_MODE)
+    if (NumberOfBlocks > 1)
     {
-      /* Polling mode */
-      while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DATAEND | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR)))
-      {
-        if (SDIO_GetFlagStatus(SDIO_FLAG_RXFIFOHF) != RESET)
+        /* Common to all modes */
+        if (NumberOfBlocks * BlockSize > SD_MAX_DATA_LENGTH)
         {
-          for (count = 0; count < SD_HALFFIFO; count++)
-          {
-            *(tempbuff + count) = SDIO_ReadData();
-          }
-          tempbuff += SD_HALFFIFO;
+            errorstatus = SD_INVALID_PARAMETER;
+            return(errorstatus);
         }
-      }
 
-      if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
-        errorstatus = SD_DATA_TIMEOUT;
-        return(errorstatus);
-      }
-      else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
-        errorstatus = SD_DATA_CRC_FAIL;
-        return(errorstatus);
-      }
-      else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
-        errorstatus = SD_RX_OVERRUN;
-        return(errorstatus);
-      }
-      else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_STBITERR);
-        errorstatus = SD_START_BIT_ERR;
-        return(errorstatus);
-      }
-      while (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
-      {
-        *tempbuff = SDIO_ReadData();
-        tempbuff++;
-      }
+        TotalNumberOfBytes = NumberOfBlocks * BlockSize;
+        StopCondition = 1;
+        DestBuffer = readbuff;
 
-      if (SDIO_GetFlagStatus(SDIO_FLAG_DATAEND) != RESET)
-      {
-        /* In Case Of SD-CARD Send Command STOP_TRANSMISSION */
-        if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType))
-        {
-          /* Send CMD12 STOP_TRANSMISSION */
-          SDIO_CmdInitStructure.SDIO_Argument = 0x0;
-          SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_STOP_TRANSMISSION;
-          SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-          SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-          SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-          SDIO_SendCommand(&SDIO_CmdInitStructure);
+        SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+        SDIO_DataInitStructure.SDIO_DataLength = NumberOfBlocks * BlockSize;
+        SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
+        SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
+        SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+        SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
+        SDIO_DataConfig(&SDIO_DataInitStructure);
 
-          errorstatus = CmdResp1Error(SDIO_STOP_TRANSMISSION);
+        /* Send CMD18 READ_MULT_BLOCK with argument data address */
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)addr;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_READ_MULT_BLOCK;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+        errorstatus = CmdResp1Error(SDIO_READ_MULT_BLOCK);
 
-          if (errorstatus != SD_OK)
-          {
+        if (errorstatus != SD_OK)
+        {
             return(errorstatus);
-          }
         }
-      }
-      /* Clear all the static flags */
-      SDIO_ClearFlag(SDIO_STATIC_FLAGS);
-    }
-    else if (DeviceMode == SD_INTERRUPT_MODE)
-    {
-      SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_RXFIFOHF | SDIO_IT_STBITERR, ENABLE);
-      while ((TransferEnd == 0) && (TransferError == SD_OK))
-      {}
-      if (TransferError != SD_OK)
-      {
-        return(TransferError);
-      }
-    }
-    else if (DeviceMode == SD_DMA_MODE)
-    {
-      rt_tick_t tick;
 
-      SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
-      SDIO_DMACmd(ENABLE);
-	  tick = rt_tick_get();
-      DMA_RxConfiguration(readbuff, (NumberOfBlocks * BlockSize));
-      while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
-	  {
-		if ((TransferError != SD_OK) || (rt_tick_get() - tick > 10))
-		{
-		  errorstatus = SD_ERROR;
-		  // rt_kprintf("sd error\n");
-		  return errorstatus;
-		}
-	  }
-      while ((TransferEnd == 0) && (TransferError == SD_OK))
-      {}
-      if (TransferError != SD_OK)
-      {
-        return(TransferError);
-      }
+        if (DeviceMode == SD_POLLING_MODE)
+        {
+            /* Polling mode */
+            while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DATAEND | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR)))
+            {
+                if (SDIO_GetFlagStatus(SDIO_FLAG_RXFIFOHF) != RESET)
+                {
+                    for (count = 0; count < SD_HALFFIFO; count++)
+                    {
+                        *(tempbuff + count) = SDIO_ReadData();
+                    }
+                    tempbuff += SD_HALFFIFO;
+                }
+            }
+
+            if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
+                errorstatus = SD_DATA_TIMEOUT;
+                return(errorstatus);
+            }
+            else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
+                errorstatus = SD_DATA_CRC_FAIL;
+                return(errorstatus);
+            }
+            else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
+                errorstatus = SD_RX_OVERRUN;
+                return(errorstatus);
+            }
+            else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_STBITERR);
+                errorstatus = SD_START_BIT_ERR;
+                return(errorstatus);
+            }
+            while (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
+            {
+                *tempbuff = SDIO_ReadData();
+                tempbuff++;
+            }
+
+            if (SDIO_GetFlagStatus(SDIO_FLAG_DATAEND) != RESET)
+            {
+                /* In Case Of SD-CARD Send Command STOP_TRANSMISSION */
+                if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType))
+                {
+                    /* Send CMD12 STOP_TRANSMISSION */
+                    SDIO_CmdInitStructure.SDIO_Argument = 0x0;
+                    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_STOP_TRANSMISSION;
+                    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+                    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+                    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+                    SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+                    errorstatus = CmdResp1Error(SDIO_STOP_TRANSMISSION);
+
+                    if (errorstatus != SD_OK)
+                    {
+                        return(errorstatus);
+                    }
+                }
+            }
+            /* Clear all the static flags */
+            SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+        }
+        else if (DeviceMode == SD_INTERRUPT_MODE)
+        {
+            SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_RXFIFOHF | SDIO_IT_STBITERR, ENABLE);
+            while ((TransferEnd == 0) && (TransferError == SD_OK))
+            {}
+            if (TransferError != SD_OK)
+            {
+                return(TransferError);
+            }
+        }
+        else if (DeviceMode == SD_DMA_MODE)
+        {
+            rt_tick_t tick;
+
+            SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE);
+            SDIO_DMACmd(ENABLE);
+            tick = rt_tick_get();
+            DMA_RxConfiguration(readbuff, (NumberOfBlocks * BlockSize));
+            while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
+            {
+                if ((TransferError != SD_OK) || (rt_tick_get() - tick > 10))
+                {
+                    errorstatus = SD_ERROR;
+                    // rt_kprintf("sd error\n");
+                    return errorstatus;
+                }
+            }
+            while ((TransferEnd == 0) && (TransferError == SD_OK))
+            {}
+            if (TransferError != SD_OK)
+            {
+                return(TransferError);
+            }
+        }
     }
-  }
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -1204,227 +1204,227 @@ SD_Error SD_ReadMultiBlocks(uint32_t addr, uint32_t *readbuff, uint16_t BlockSiz
   */
 SD_Error SD_WriteBlock(uint32_t addr, uint32_t *writebuff, uint16_t BlockSize)
 {
-  SD_Error errorstatus = SD_OK;
-  uint8_t  power = 0, cardstate = 0;
-  uint32_t timeout = 0, bytestransferred = 0;
-  uint32_t cardstatus = 0, count = 0, restwords = 0;
-  uint32_t *tempbuff = writebuff;
+    SD_Error errorstatus = SD_OK;
+    uint8_t  power = 0, cardstate = 0;
+    uint32_t timeout = 0, bytestransferred = 0;
+    uint32_t cardstatus = 0, count = 0, restwords = 0;
+    uint32_t *tempbuff = writebuff;
 
-  if (writebuff == NULL)
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
+    if (writebuff == NULL)
+    {
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
+    }
 
-  TransferError = SD_OK;
-  TransferEnd = 0;
-  TotalNumberOfBytes = 0;
+    TransferError = SD_OK;
+    TransferEnd = 0;
+    TotalNumberOfBytes = 0;
 
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = 0;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
-  SDIO_DMACmd(DISABLE);
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = 0;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DMACmd(DISABLE);
 
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
+    {
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
+    }
+
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
+    {
+        BlockSize = 512;
+        // addr /= 512;
+    }
 
-  if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-  {
-    BlockSize = 512;
-    // addr /= 512;
-  }
+    /* Set the block size, both on controller and card */
+    if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
+    {
+        power = convert_from_bytes_to_power_of_two(BlockSize);
 
-  /* Set the block size, both on controller and card */
-  if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
-  {
-    power = convert_from_bytes_to_power_of_two(BlockSize);
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+        errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
+
+        if (errorstatus != SD_OK)
+        {
+            return(errorstatus);
+        }
+    }
+    else
+    {
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
+    }
+
+    /* Wait till card is ready for data Added */
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
     SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
     SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
     SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
     SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
+    errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
 
     if (errorstatus != SD_OK)
     {
-      return(errorstatus);
+        return(errorstatus);
     }
-  }
-  else
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
 
-  /* Wait till card is ready for data Added */
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    cardstatus = SDIO_GetResponse(SDIO_RESP1);
 
-  errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
+    timeout = SD_DATATIMEOUT;
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    while (((cardstatus & 0x00000100) == 0) && (timeout > 0))
+    {
+        timeout--;
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  cardstatus = SDIO_GetResponse(SDIO_RESP1);
+        errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
 
-  timeout = SD_DATATIMEOUT;
+        if (errorstatus != SD_OK)
+        {
+            return(errorstatus);
+        }
+        cardstatus = SDIO_GetResponse(SDIO_RESP1);
+    }
 
-  while (((cardstatus & 0x00000100) == 0) && (timeout > 0))
-  {
-    timeout--;
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
+    if (timeout == 0)
+    {
+        return(SD_ERROR);
+    }
+
+    /* Send CMD24 WRITE_SINGLE_BLOCK */
+    SDIO_CmdInitStructure.SDIO_Argument = addr;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_WRITE_SINGLE_BLOCK;
     SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
     SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
     SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
     SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
+    errorstatus = CmdResp1Error(SDIO_WRITE_SINGLE_BLOCK);
 
     if (errorstatus != SD_OK)
     {
-      return(errorstatus);
+        return(errorstatus);
     }
-    cardstatus = SDIO_GetResponse(SDIO_RESP1);
-  }
-
-  if (timeout == 0)
-  {
-    return(SD_ERROR);
-  }
-
-  /* Send CMD24 WRITE_SINGLE_BLOCK */
-  SDIO_CmdInitStructure.SDIO_Argument = addr;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_WRITE_SINGLE_BLOCK;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
-
-  errorstatus = CmdResp1Error(SDIO_WRITE_SINGLE_BLOCK);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
-
-  TotalNumberOfBytes = BlockSize;
-  StopCondition = 0;
-  SrcBuffer = writebuff;
+    TotalNumberOfBytes = BlockSize;
+    StopCondition = 0;
+    SrcBuffer = writebuff;
 
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = BlockSize;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = BlockSize;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
 
-  /* In case of single data block transfer no need of stop command at all */
-  if (DeviceMode == SD_POLLING_MODE)
-  {
-    while (!(SDIO->STA & (SDIO_FLAG_DBCKEND | SDIO_FLAG_TXUNDERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR)))
+    /* In case of single data block transfer no need of stop command at all */
+    if (DeviceMode == SD_POLLING_MODE)
     {
-      if (SDIO_GetFlagStatus(SDIO_FLAG_TXFIFOHE) != RESET)
-      {
-        if ((TotalNumberOfBytes - bytestransferred) < 32)
+        while (!(SDIO->STA & (SDIO_FLAG_DBCKEND | SDIO_FLAG_TXUNDERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR)))
         {
-          restwords = ((TotalNumberOfBytes - bytestransferred) % 4 == 0) ? ((TotalNumberOfBytes - bytestransferred) / 4) : (( TotalNumberOfBytes -  bytestransferred) / 4 + 1);
+            if (SDIO_GetFlagStatus(SDIO_FLAG_TXFIFOHE) != RESET)
+            {
+                if ((TotalNumberOfBytes - bytestransferred) < 32)
+                {
+                    restwords = ((TotalNumberOfBytes - bytestransferred) % 4 == 0) ? ((TotalNumberOfBytes - bytestransferred) / 4) : (( TotalNumberOfBytes -  bytestransferred) / 4 + 1);
 
-          for (count = 0; count < restwords; count++, tempbuff++, bytestransferred += 4)
-          {
-            SDIO_WriteData(*tempbuff);
-          }
+                    for (count = 0; count < restwords; count++, tempbuff++, bytestransferred += 4)
+                    {
+                        SDIO_WriteData(*tempbuff);
+                    }
+                }
+                else
+                {
+                    for (count = 0; count < 8; count++)
+                    {
+                        SDIO_WriteData(*(tempbuff + count));
+                    }
+                    tempbuff += 8;
+                    bytestransferred += 32;
+                }
+            }
         }
-        else
+        if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
         {
-          for (count = 0; count < 8; count++)
-          {
-            SDIO_WriteData(*(tempbuff + count));
-          }
-          tempbuff += 8;
-          bytestransferred += 32;
+            SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
+            errorstatus = SD_DATA_TIMEOUT;
+            return(errorstatus);
+        }
+        else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
+            errorstatus = SD_DATA_CRC_FAIL;
+            return(errorstatus);
+        }
+        else if (SDIO_GetFlagStatus(SDIO_FLAG_TXUNDERR) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_TXUNDERR);
+            errorstatus = SD_TX_UNDERRUN;
+            return(errorstatus);
+        }
+        else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+        {
+            SDIO_ClearFlag(SDIO_FLAG_STBITERR);
+            errorstatus = SD_START_BIT_ERR;
+            return(errorstatus);
         }
-      }
-    }
-    if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
-      errorstatus = SD_DATA_TIMEOUT;
-      return(errorstatus);
-    }
-    else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
-      errorstatus = SD_DATA_CRC_FAIL;
-      return(errorstatus);
-    }
-    else if (SDIO_GetFlagStatus(SDIO_FLAG_TXUNDERR) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_TXUNDERR);
-      errorstatus = SD_TX_UNDERRUN;
-      return(errorstatus);
-    }
-    else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
-    {
-      SDIO_ClearFlag(SDIO_FLAG_STBITERR);
-      errorstatus = SD_START_BIT_ERR;
-      return(errorstatus);
     }
-  }
-  else if (DeviceMode == SD_INTERRUPT_MODE)
-  {
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_FLAG_TXFIFOHE | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
-    while ((TransferEnd == 0) && (TransferError == SD_OK))
-    {}
-    if (TransferError != SD_OK)
+    else if (DeviceMode == SD_INTERRUPT_MODE)
     {
-      return(TransferError);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_FLAG_TXFIFOHE | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
+        while ((TransferEnd == 0) && (TransferError == SD_OK))
+        {}
+        if (TransferError != SD_OK)
+        {
+            return(TransferError);
+        }
     }
-  }
-  else if (DeviceMode == SD_DMA_MODE)
-  {
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
-    DMA_TxConfiguration(writebuff, BlockSize);
-    SDIO_DMACmd(ENABLE);
-    while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
-    {}
-    while ((TransferEnd == 0) && (TransferError == SD_OK))
-    {}
-    if (TransferError != SD_OK)
+    else if (DeviceMode == SD_DMA_MODE)
     {
-      return(TransferError);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
+        DMA_TxConfiguration(writebuff, BlockSize);
+        SDIO_DMACmd(ENABLE);
+        while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
+        {}
+        while ((TransferEnd == 0) && (TransferError == SD_OK))
+        {}
+        if (TransferError != SD_OK)
+        {
+            return(TransferError);
+        }
     }
-  }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
-
-  /* Wait till the card is in programming state */
-  errorstatus = IsCardProgramming(&cardstate);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  while ((errorstatus == SD_OK) && ((cardstate == SD_CARD_PROGRAMMING) || (cardstate == SD_CARD_RECEIVING)))
-  {
+    /* Wait till the card is in programming state */
     errorstatus = IsCardProgramming(&cardstate);
-  }
 
-  return(errorstatus);
+    while ((errorstatus == SD_OK) && ((cardstate == SD_CARD_PROGRAMMING) || (cardstate == SD_CARD_RECEIVING)))
+    {
+        errorstatus = IsCardProgramming(&cardstate);
+    }
+
+    return(errorstatus);
 }
 
 /**
@@ -1439,264 +1439,264 @@ SD_Error SD_WriteBlock(uint32_t addr, uint32_t *writebuff, uint16_t BlockSize)
   */
 SD_Error SD_WriteMultiBlocks(uint32_t addr, uint32_t *writebuff, uint16_t BlockSize, uint32_t NumberOfBlocks)
 {
-  SD_Error errorstatus = SD_OK;
-  uint8_t  power = 0, cardstate = 0;
-  uint32_t bytestransferred = 0;
-  uint32_t count = 0, restwords = 0;
-  uint32_t *tempbuff = writebuff;
-
-  if (writebuff == NULL)
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
-
-  TransferError = SD_OK;
-  TransferEnd = 0;
-  TotalNumberOfBytes = 0;
-
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = 0;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
-  SDIO_DMACmd(DISABLE);
+    SD_Error errorstatus = SD_OK;
+    uint8_t  power = 0, cardstate = 0;
+    uint32_t bytestransferred = 0;
+    uint32_t count = 0, restwords = 0;
+    uint32_t *tempbuff = writebuff;
 
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
-
-  if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-  {
-    BlockSize = 512;
-    // addr /= 512;
-  }
-
-  /* Set the block size, both on controller and card */
-  if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
-  {
-    power = convert_from_bytes_to_power_of_two(BlockSize);
-
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
-
-    errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
-
-    if (errorstatus != SD_OK)
+    if (writebuff == NULL)
     {
-      return(errorstatus);
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
     }
-  }
-  else
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
 
-  /* Wait till card is ready for data Added */
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    TransferError = SD_OK;
+    TransferEnd = 0;
+    TotalNumberOfBytes = 0;
 
-  errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
-
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = 0;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Disable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DMACmd(DISABLE);
 
-  if (NumberOfBlocks > 1)
-  {
-    /* Common to all modes */
-    if (NumberOfBlocks * BlockSize > SD_MAX_DATA_LENGTH)
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
     {
-      errorstatus = SD_INVALID_PARAMETER;
-      return(errorstatus);
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
     }
 
-    if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
     {
-      /* To improve performance */
-      SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
-
+        BlockSize = 512;
+        // addr /= 512;
+    }
 
-      errorstatus = CmdResp1Error(SDIO_APP_CMD);
+    /* Set the block size, both on controller and card */
+    if ((BlockSize > 0) && (BlockSize <= 2048) && ((BlockSize & (BlockSize - 1)) == 0))
+    {
+        power = convert_from_bytes_to_power_of_two(BlockSize);
 
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
-      /* To improve performance */
-      SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)NumberOfBlocks;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCK_COUNT;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp1Error(SDIO_SET_BLOCK_COUNT);
+        errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
 
-      if (errorstatus != SD_OK)
-      {
+        if (errorstatus != SD_OK)
+        {
+            return(errorstatus);
+        }
+    }
+    else
+    {
+        errorstatus = SD_INVALID_PARAMETER;
         return(errorstatus);
-      }
     }
 
-    /* Send CMD25 WRITE_MULT_BLOCK with argument data address */
-    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)addr;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_WRITE_MULT_BLOCK;
+    /* Wait till card is ready for data Added */
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
     SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
     SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
     SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
     SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp1Error(SDIO_WRITE_MULT_BLOCK);
+    errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
 
-    if (SD_OK != errorstatus)
+    if (errorstatus != SD_OK)
     {
-      return(errorstatus);
+        return(errorstatus);
     }
 
-    TotalNumberOfBytes = NumberOfBlocks * BlockSize;
-    StopCondition = 1;
-    SrcBuffer = writebuff;
-
-    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-    SDIO_DataInitStructure.SDIO_DataLength = NumberOfBlocks * BlockSize;
-    SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
-    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
-    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
-    SDIO_DataConfig(&SDIO_DataInitStructure);
-
-    if (DeviceMode == SD_POLLING_MODE)
+    if (NumberOfBlocks > 1)
     {
-      while (!(SDIO->STA & (SDIO_FLAG_TXUNDERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DATAEND | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR)))
-      {
-        if (SDIO_GetFlagStatus(SDIO_FLAG_TXFIFOHE) != RESET)
+        /* Common to all modes */
+        if (NumberOfBlocks * BlockSize > SD_MAX_DATA_LENGTH)
         {
-          if (!((TotalNumberOfBytes - bytestransferred) < SD_HALFFIFOBYTES))
-          {
-            for (count = 0; count < SD_HALFFIFO; count++)
+            errorstatus = SD_INVALID_PARAMETER;
+            return(errorstatus);
+        }
+
+        if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
+        {
+            /* To improve performance */
+            SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16);
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+
+            errorstatus = CmdResp1Error(SDIO_APP_CMD);
+
+            if (errorstatus != SD_OK)
             {
-              SDIO_WriteData(*(tempbuff + count));
+                return(errorstatus);
             }
-            tempbuff += SD_HALFFIFO;
-            bytestransferred += SD_HALFFIFOBYTES;
-          }
-          else
-          {
-            restwords = ((TotalNumberOfBytes - bytestransferred) % 4 == 0) ? ((TotalNumberOfBytes - bytestransferred) / 4) :
-                        ((TotalNumberOfBytes - bytestransferred) / 4 + 1);
+            /* To improve performance */
+            SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)NumberOfBlocks;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCK_COUNT;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-            for (count = 0; count < restwords; count++, tempbuff++, bytestransferred += 4)
+            errorstatus = CmdResp1Error(SDIO_SET_BLOCK_COUNT);
+
+            if (errorstatus != SD_OK)
             {
-              SDIO_WriteData(*tempbuff);
+                return(errorstatus);
             }
-          }
         }
-      }
 
-      if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
-        errorstatus = SD_DATA_TIMEOUT;
-        return(errorstatus);
-      }
-      else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
-        errorstatus = SD_DATA_CRC_FAIL;
-        return(errorstatus);
-      }
-      else if (SDIO_GetFlagStatus(SDIO_FLAG_TXUNDERR) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_TXUNDERR);
-        errorstatus = SD_TX_UNDERRUN;
-        return(errorstatus);
-      }
-      else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
-      {
-        SDIO_ClearFlag(SDIO_FLAG_STBITERR);
-        errorstatus = SD_START_BIT_ERR;
-        return(errorstatus);
-      }
+        /* Send CMD25 WRITE_MULT_BLOCK with argument data address */
+        SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)addr;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_WRITE_MULT_BLOCK;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+        errorstatus = CmdResp1Error(SDIO_WRITE_MULT_BLOCK);
+
+        if (SD_OK != errorstatus)
+        {
+            return(errorstatus);
+        }
+
+        TotalNumberOfBytes = NumberOfBlocks * BlockSize;
+        StopCondition = 1;
+        SrcBuffer = writebuff;
 
-      if (SDIO_GetFlagStatus(SDIO_FLAG_DATAEND) != RESET)
-      {
-       if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
+        SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+        SDIO_DataInitStructure.SDIO_DataLength = NumberOfBlocks * BlockSize;
+        SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) power << 4;
+        SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToCard;
+        SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+        SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
+        SDIO_DataConfig(&SDIO_DataInitStructure);
+
+        if (DeviceMode == SD_POLLING_MODE)
         {
-          /* Send CMD12 STOP_TRANSMISSION */
-          SDIO_CmdInitStructure.SDIO_Argument = 0x0;
-          SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_STOP_TRANSMISSION;
-          SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-          SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-          SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-          SDIO_SendCommand(&SDIO_CmdInitStructure);
+            while (!(SDIO->STA & (SDIO_FLAG_TXUNDERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DATAEND | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR)))
+            {
+                if (SDIO_GetFlagStatus(SDIO_FLAG_TXFIFOHE) != RESET)
+                {
+                    if (!((TotalNumberOfBytes - bytestransferred) < SD_HALFFIFOBYTES))
+                    {
+                        for (count = 0; count < SD_HALFFIFO; count++)
+                        {
+                            SDIO_WriteData(*(tempbuff + count));
+                        }
+                        tempbuff += SD_HALFFIFO;
+                        bytestransferred += SD_HALFFIFOBYTES;
+                    }
+                    else
+                    {
+                        restwords = ((TotalNumberOfBytes - bytestransferred) % 4 == 0) ? ((TotalNumberOfBytes - bytestransferred) / 4) :
+                                    ((TotalNumberOfBytes - bytestransferred) / 4 + 1);
 
+                        for (count = 0; count < restwords; count++, tempbuff++, bytestransferred += 4)
+                        {
+                            SDIO_WriteData(*tempbuff);
+                        }
+                    }
+                }
+            }
 
-          errorstatus = CmdResp1Error(SDIO_STOP_TRANSMISSION);
+            if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
+                errorstatus = SD_DATA_TIMEOUT;
+                return(errorstatus);
+            }
+            else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
+                errorstatus = SD_DATA_CRC_FAIL;
+                return(errorstatus);
+            }
+            else if (SDIO_GetFlagStatus(SDIO_FLAG_TXUNDERR) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_TXUNDERR);
+                errorstatus = SD_TX_UNDERRUN;
+                return(errorstatus);
+            }
+            else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+            {
+                SDIO_ClearFlag(SDIO_FLAG_STBITERR);
+                errorstatus = SD_START_BIT_ERR;
+                return(errorstatus);
+            }
 
-          if (errorstatus != SD_OK)
-          {
-            return(errorstatus);
-          }
+            if (SDIO_GetFlagStatus(SDIO_FLAG_DATAEND) != RESET)
+            {
+                if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
+                {
+                    /* Send CMD12 STOP_TRANSMISSION */
+                    SDIO_CmdInitStructure.SDIO_Argument = 0x0;
+                    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_STOP_TRANSMISSION;
+                    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+                    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+                    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+                    SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+
+                    errorstatus = CmdResp1Error(SDIO_STOP_TRANSMISSION);
+
+                    if (errorstatus != SD_OK)
+                    {
+                        return(errorstatus);
+                    }
+                }
+            }
+        }
+        else if (DeviceMode == SD_INTERRUPT_MODE)
+        {
+            SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXFIFOHE | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
+            while ((TransferEnd == 0) && (TransferError == SD_OK))
+            {}
+            if (TransferError != SD_OK)
+            {
+                return(TransferError);
+            }
+        }
+        else if (DeviceMode == SD_DMA_MODE)
+        {
+            SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
+            SDIO_DMACmd(ENABLE);
+            DMA_TxConfiguration(writebuff, (NumberOfBlocks * BlockSize));
+            while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
+            {}
+            while ((TransferEnd == 0) && (TransferError == SD_OK))
+            {}
+            if (TransferError != SD_OK)
+            {
+                return(TransferError);
+            }
         }
-      }
-    }
-    else if (DeviceMode == SD_INTERRUPT_MODE)
-    {
-      SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXFIFOHE | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
-      while ((TransferEnd == 0) && (TransferError == SD_OK))
-      {}
-      if (TransferError != SD_OK)
-      {
-        return(TransferError);
-      }
-    }
-    else if (DeviceMode == SD_DMA_MODE)
-    {
-      SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE);
-      SDIO_DMACmd(ENABLE);
-      DMA_TxConfiguration(writebuff, (NumberOfBlocks * BlockSize));
-      while (DMA_GetFlagStatus(DMA2_FLAG_TC4) == RESET)
-      {}
-      while ((TransferEnd == 0) && (TransferError == SD_OK))
-      {}
-      if (TransferError != SD_OK)
-      {
-        return(TransferError);
-      }
     }
-  }
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
-
-  /* Wait till the card is in programming state */
-  errorstatus = IsCardProgramming(&cardstate);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  while ((errorstatus == SD_OK) && ((cardstate == SD_CARD_PROGRAMMING) || (cardstate == SD_CARD_RECEIVING)))
-  {
+    /* Wait till the card is in programming state */
     errorstatus = IsCardProgramming(&cardstate);
-  }
 
-  return(errorstatus);
+    while ((errorstatus == SD_OK) && ((cardstate == SD_CARD_PROGRAMMING) || (cardstate == SD_CARD_RECEIVING)))
+    {
+        errorstatus = IsCardProgramming(&cardstate);
+    }
+
+    return(errorstatus);
 }
 
 /**
@@ -1709,14 +1709,14 @@ SD_Error SD_WriteMultiBlocks(uint32_t addr, uint32_t *writebuff, uint16_t BlockS
   */
 SDTransferState SD_GetTransferState(void)
 {
-  if (SDIO->STA & (SDIO_FLAG_TXACT | SDIO_FLAG_RXACT))
-  {
-    return(SD_TRANSFER_IN_PROGRESS);
-  }
-  else
-  {
-    return(SD_NO_TRANSFER);
-  }
+    if (SDIO->STA & (SDIO_FLAG_TXACT | SDIO_FLAG_RXACT))
+    {
+        return(SD_TRANSFER_IN_PROGRESS);
+    }
+    else
+    {
+        return(SD_NO_TRANSFER);
+    }
 }
 
 /**
@@ -1726,19 +1726,19 @@ SDTransferState SD_GetTransferState(void)
   */
 SD_Error SD_StopTransfer(void)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  /* Send CMD12 STOP_TRANSMISSION  */
-  SDIO_CmdInitStructure.SDIO_Argument = 0x0;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_STOP_TRANSMISSION;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Send CMD12 STOP_TRANSMISSION  */
+    SDIO_CmdInitStructure.SDIO_Argument = 0x0;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_STOP_TRANSMISSION;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_STOP_TRANSMISSION);
+    errorstatus = CmdResp1Error(SDIO_STOP_TRANSMISSION);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -1749,91 +1749,91 @@ SD_Error SD_StopTransfer(void)
   */
 SD_Error SD_Erase(uint32_t startaddr, uint32_t endaddr)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t delay = 0;
-  __IO uint32_t maxdelay = 0;
-  uint8_t cardstate = 0;
+    SD_Error errorstatus = SD_OK;
+    uint32_t delay = 0;
+    __IO uint32_t maxdelay = 0;
+    uint8_t cardstate = 0;
 
-  /* Check if the card coomnd class supports erase command */
-  if (((CSD_Tab[1] >> 20) & SD_CCCC_ERASE) == 0)
-  {
-    errorstatus = SD_REQUEST_NOT_APPLICABLE;
-    return(errorstatus);
-  }
-
-  maxdelay = 72000 / ((SDIO->CLKCR & 0xFF) + 2);
+    /* Check if the card coomnd class supports erase command */
+    if (((CSD_Tab[1] >> 20) & SD_CCCC_ERASE) == 0)
+    {
+        errorstatus = SD_REQUEST_NOT_APPLICABLE;
+        return(errorstatus);
+    }
 
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
+    maxdelay = 72000 / ((SDIO->CLKCR & 0xFF) + 2);
 
-  if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-  {
-    startaddr /= 512;
-    endaddr /= 512;
-  }
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
+    {
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
+    }
 
-  /* According to sd-card spec 1.0 ERASE_GROUP_START (CMD32) and erase_group_end(CMD33) */
-  if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
-  {
-    /* Send CMD32 SD_ERASE_GRP_START with argument as addr  */
-    SDIO_CmdInitStructure.SDIO_Argument = startaddr;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_ERASE_GRP_START;
-    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-    SDIO_SendCommand(&SDIO_CmdInitStructure);
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
+    {
+        startaddr /= 512;
+        endaddr /= 512;
+    }
 
-    errorstatus = CmdResp1Error(SDIO_SD_ERASE_GRP_START);
-    if (errorstatus != SD_OK)
+    /* According to sd-card spec 1.0 ERASE_GROUP_START (CMD32) and erase_group_end(CMD33) */
+    if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType))
     {
-      return(errorstatus);
+        /* Send CMD32 SD_ERASE_GRP_START with argument as addr  */
+        SDIO_CmdInitStructure.SDIO_Argument = startaddr;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_ERASE_GRP_START;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+        errorstatus = CmdResp1Error(SDIO_SD_ERASE_GRP_START);
+        if (errorstatus != SD_OK)
+        {
+            return(errorstatus);
+        }
+
+        /* Send CMD33 SD_ERASE_GRP_END with argument as addr  */
+        SDIO_CmdInitStructure.SDIO_Argument = endaddr;
+        SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_ERASE_GRP_END;
+        SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+        SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+        SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+        SDIO_SendCommand(&SDIO_CmdInitStructure);
+
+        errorstatus = CmdResp1Error(SDIO_SD_ERASE_GRP_END);
+        if (errorstatus != SD_OK)
+        {
+            return(errorstatus);
+        }
     }
 
-    /* Send CMD33 SD_ERASE_GRP_END with argument as addr  */
-    SDIO_CmdInitStructure.SDIO_Argument = endaddr;
-    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_ERASE_GRP_END;
+    /* Send CMD38 ERASE */
+    SDIO_CmdInitStructure.SDIO_Argument = 0;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_ERASE;
     SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
     SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
     SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
     SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-    errorstatus = CmdResp1Error(SDIO_SD_ERASE_GRP_END);
+    errorstatus = CmdResp1Error(SDIO_ERASE);
+
     if (errorstatus != SD_OK)
     {
-      return(errorstatus);
+        return(errorstatus);
     }
-  }
-
-  /* Send CMD38 ERASE */
-  SDIO_CmdInitStructure.SDIO_Argument = 0;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_ERASE;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
-
-  errorstatus = CmdResp1Error(SDIO_ERASE);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
-
-  for (delay = 0; delay < maxdelay; delay++)
-  {}
-
-  /* Wait till the card is in programming state */
-  errorstatus = IsCardProgramming(&cardstate);
+    for (delay = 0; delay < maxdelay; delay++)
+    {}
 
-  while ((errorstatus == SD_OK) && ((SD_CARD_PROGRAMMING == cardstate) || (SD_CARD_RECEIVING == cardstate)))
-  {
+    /* Wait till the card is in programming state */
     errorstatus = IsCardProgramming(&cardstate);
-  }
 
-  return(errorstatus);
+    while ((errorstatus == SD_OK) && ((SD_CARD_PROGRAMMING == cardstate) || (SD_CARD_RECEIVING == cardstate)))
+    {
+        errorstatus = IsCardProgramming(&cardstate);
+    }
+
+    return(errorstatus);
 }
 
 /**
@@ -1844,32 +1844,32 @@ SD_Error SD_Erase(uint32_t startaddr, uint32_t endaddr)
   */
 SD_Error SD_SendStatus(uint32_t *pcardstatus)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  if (pcardstatus == NULL)
-  {
-    errorstatus = SD_INVALID_PARAMETER;
-    return(errorstatus);
-  }
+    if (pcardstatus == NULL)
+    {
+        errorstatus = SD_INVALID_PARAMETER;
+        return(errorstatus);
+    }
 
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
 
-  errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
+    errorstatus = CmdResp1Error(SDIO_SEND_STATUS);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  *pcardstatus = SDIO_GetResponse(SDIO_RESP1);
+    *pcardstatus = SDIO_GetResponse(SDIO_RESP1);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -1880,118 +1880,118 @@ SD_Error SD_SendStatus(uint32_t *pcardstatus)
   */
 SD_Error SD_SendSDStatus(uint32_t *psdstatus)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t count = 0;
+    SD_Error errorstatus = SD_OK;
+    uint32_t count = 0;
 
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
+    {
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
+    }
 
-  /* Set block size for card if it is not equal to current block size for card. */
-  SDIO_CmdInitStructure.SDIO_Argument = 64;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Set block size for card if it is not equal to current block size for card. */
+    SDIO_CmdInitStructure.SDIO_Argument = 64;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
+    errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  /* CMD55 */
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
-  errorstatus = CmdResp1Error(SDIO_APP_CMD);
+    /* CMD55 */
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
+    errorstatus = CmdResp1Error(SDIO_APP_CMD);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = 64;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_64b;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = 64;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_64b;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
 
-  /* Send ACMD13 SD_APP_STAUS  with argument as card's RCA.*/
-  SDIO_CmdInitStructure.SDIO_Argument = 0;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_APP_STAUS;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
-  errorstatus = CmdResp1Error(SDIO_SD_APP_STAUS);
+    /* Send ACMD13 SD_APP_STAUS  with argument as card's RCA.*/
+    SDIO_CmdInitStructure.SDIO_Argument = 0;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_APP_STAUS;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
+    errorstatus = CmdResp1Error(SDIO_SD_APP_STAUS);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR)))
-  {
-    if (SDIO_GetFlagStatus(SDIO_FLAG_RXFIFOHF) != RESET)
+    while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR)))
     {
-      for (count = 0; count < 8; count++)
-      {
-        *(psdstatus + count) = SDIO_ReadData();
-      }
-      psdstatus += 8;
+        if (SDIO_GetFlagStatus(SDIO_FLAG_RXFIFOHF) != RESET)
+        {
+            for (count = 0; count < 8; count++)
+            {
+                *(psdstatus + count) = SDIO_ReadData();
+            }
+            psdstatus += 8;
+        }
     }
-  }
 
-  if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
-    errorstatus = SD_DATA_TIMEOUT;
-    return(errorstatus);
-  }
-  else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
-    errorstatus = SD_DATA_CRC_FAIL;
-    return(errorstatus);
-  }
-  else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
-    errorstatus = SD_RX_OVERRUN;
-    return(errorstatus);
-  }
-  else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_STBITERR);
-    errorstatus = SD_START_BIT_ERR;
-    return(errorstatus);
-  }
+    if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
+        errorstatus = SD_DATA_TIMEOUT;
+        return(errorstatus);
+    }
+    else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
+        errorstatus = SD_DATA_CRC_FAIL;
+        return(errorstatus);
+    }
+    else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
+        errorstatus = SD_RX_OVERRUN;
+        return(errorstatus);
+    }
+    else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_STBITERR);
+        errorstatus = SD_START_BIT_ERR;
+        return(errorstatus);
+    }
 
-  while (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
-  {
-    *psdstatus = SDIO_ReadData();
-    psdstatus++;
-  }
+    while (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
+    {
+        *psdstatus = SDIO_ReadData();
+        psdstatus++;
+    }
 
-  /* Clear all the static status flags*/
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
-  psdstatus -= 16;
-  for (count = 0; count < 16; count++)
-  {
-    psdstatus[count] = ((psdstatus[count] & SD_0TO7BITS) << 24) |((psdstatus[count] & SD_8TO15BITS) << 8) |
-                       ((psdstatus[count] & SD_16TO23BITS) >> 8) |((psdstatus[count] & SD_24TO31BITS) >> 24);
-  }
-  return(errorstatus);
+    /* Clear all the static status flags*/
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    psdstatus -= 16;
+    for (count = 0; count < 16; count++)
+    {
+        psdstatus[count] = ((psdstatus[count] & SD_0TO7BITS) << 24) |((psdstatus[count] & SD_8TO15BITS) << 8) |
+                           ((psdstatus[count] & SD_16TO23BITS) >> 8) |((psdstatus[count] & SD_24TO31BITS) >> 24);
+    }
+    return(errorstatus);
 }
 
 /**
@@ -2001,130 +2001,130 @@ SD_Error SD_SendSDStatus(uint32_t *psdstatus)
   */
 SD_Error SD_ProcessIRQSrc(void)
 {
-  uint32_t count = 0, restwords = 0;
+    uint32_t count = 0, restwords = 0;
 
-  if (DeviceMode == SD_INTERRUPT_MODE)
-  {
-    if (SDIO_GetITStatus(SDIO_IT_RXFIFOHF) != RESET)
+    if (DeviceMode == SD_INTERRUPT_MODE)
     {
-      for (count = 0; count < SD_HALFFIFO; count++)
-      {
-        *(DestBuffer + count) = SDIO_ReadData();
-      }
-      DestBuffer += SD_HALFFIFO;
-      NumberOfBytes += SD_HALFFIFOBYTES;
+        if (SDIO_GetITStatus(SDIO_IT_RXFIFOHF) != RESET)
+        {
+            for (count = 0; count < SD_HALFFIFO; count++)
+            {
+                *(DestBuffer + count) = SDIO_ReadData();
+            }
+            DestBuffer += SD_HALFFIFO;
+            NumberOfBytes += SD_HALFFIFOBYTES;
+        }
+        else if (SDIO_GetITStatus(SDIO_IT_TXFIFOHE) != RESET)
+        {
+            if ((TotalNumberOfBytes - NumberOfBytes) < SD_HALFFIFOBYTES)
+            {
+                restwords = ((TotalNumberOfBytes - NumberOfBytes) %  4 == 0) ?
+                            ((TotalNumberOfBytes - NumberOfBytes) / 4) :
+                            ((TotalNumberOfBytes - NumberOfBytes) / 4 + 1);
+
+                for (count = 0; count < restwords;  count++, SrcBuffer++, NumberOfBytes += 4)
+                {
+                    SDIO_WriteData(*SrcBuffer);
+                }
+            }
+            else
+            {
+                for (count = 0; count < SD_HALFFIFO; count++)
+                {
+                    SDIO_WriteData(*(SrcBuffer + count));
+                }
+
+                SrcBuffer += SD_HALFFIFO;
+                NumberOfBytes += SD_HALFFIFOBYTES;
+            }
+        }
     }
-    else if (SDIO_GetITStatus(SDIO_IT_TXFIFOHE) != RESET)
+
+    if (SDIO_GetITStatus(SDIO_IT_DATAEND) != RESET)
     {
-      if ((TotalNumberOfBytes - NumberOfBytes) < SD_HALFFIFOBYTES)
-      {
-        restwords = ((TotalNumberOfBytes - NumberOfBytes) %  4 == 0) ?
-                    ((TotalNumberOfBytes - NumberOfBytes) / 4) :
-                    ((TotalNumberOfBytes - NumberOfBytes) / 4 + 1);
+        if (DeviceMode != SD_DMA_MODE)
+        {
+            while ((SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)  &&  (NumberOfBytes < TotalNumberOfBytes))
+            {
+                *DestBuffer = SDIO_ReadData();
+                DestBuffer++;
+                NumberOfBytes += 4;
+            }
+        }
 
-        for (count = 0; count < restwords;  count++, SrcBuffer++, NumberOfBytes += 4)
+        if (StopCondition == 1)
         {
-          SDIO_WriteData(*SrcBuffer);
+            TransferError = SD_StopTransfer();
         }
-      }
-      else
-      {
-        for (count = 0; count < SD_HALFFIFO; count++)
+        else
         {
-          SDIO_WriteData(*(SrcBuffer + count));
+            TransferError = SD_OK;
         }
-
-        SrcBuffer += SD_HALFFIFO;
-        NumberOfBytes += SD_HALFFIFOBYTES;
-      }
+        SDIO_ClearITPendingBit(SDIO_IT_DATAEND);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
+                      SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
+                      SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
+        TransferEnd = 1;
+        NumberOfBytes = 0;
+        return(TransferError);
     }
-  }
 
-  if (SDIO_GetITStatus(SDIO_IT_DATAEND) != RESET)
-  {
-    if (DeviceMode != SD_DMA_MODE)
+    if (SDIO_GetITStatus(SDIO_IT_DCRCFAIL) != RESET)
     {
-      while ((SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)  &&  (NumberOfBytes < TotalNumberOfBytes))
-      {
-        *DestBuffer = SDIO_ReadData();
-        DestBuffer++;
-        NumberOfBytes += 4;
-      }
+        SDIO_ClearITPendingBit(SDIO_IT_DCRCFAIL);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
+                      SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
+                      SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
+        NumberOfBytes = 0;
+        TransferError = SD_DATA_CRC_FAIL;
+        return(SD_DATA_CRC_FAIL);
     }
 
-    if (StopCondition == 1)
+    if (SDIO_GetITStatus(SDIO_IT_DTIMEOUT) != RESET)
     {
-      TransferError = SD_StopTransfer();
+        SDIO_ClearITPendingBit(SDIO_IT_DTIMEOUT);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
+                      SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
+                      SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
+        NumberOfBytes = 0;
+        TransferError = SD_DATA_TIMEOUT;
+        return(SD_DATA_TIMEOUT);
     }
-    else
+
+    if (SDIO_GetITStatus(SDIO_IT_RXOVERR) != RESET)
     {
-      TransferError = SD_OK;
+        SDIO_ClearITPendingBit(SDIO_IT_RXOVERR);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
+                      SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
+                      SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
+        NumberOfBytes = 0;
+        TransferError = SD_RX_OVERRUN;
+        return(SD_RX_OVERRUN);
     }
-    SDIO_ClearITPendingBit(SDIO_IT_DATAEND);
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
-                  SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
-                  SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
-    TransferEnd = 1;
-    NumberOfBytes = 0;
-    return(TransferError);
-  }
-
-  if (SDIO_GetITStatus(SDIO_IT_DCRCFAIL) != RESET)
-  {
-    SDIO_ClearITPendingBit(SDIO_IT_DCRCFAIL);
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
-                  SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
-                  SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
-    NumberOfBytes = 0;
-    TransferError = SD_DATA_CRC_FAIL;
-    return(SD_DATA_CRC_FAIL);
-  }
-
-  if (SDIO_GetITStatus(SDIO_IT_DTIMEOUT) != RESET)
-  {
-    SDIO_ClearITPendingBit(SDIO_IT_DTIMEOUT);
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
-                  SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
-                  SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
-    NumberOfBytes = 0;
-    TransferError = SD_DATA_TIMEOUT;
-    return(SD_DATA_TIMEOUT);
-  }
-
-  if (SDIO_GetITStatus(SDIO_IT_RXOVERR) != RESET)
-  {
-    SDIO_ClearITPendingBit(SDIO_IT_RXOVERR);
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
-                  SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
-                  SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
-    NumberOfBytes = 0;
-    TransferError = SD_RX_OVERRUN;
-    return(SD_RX_OVERRUN);
-  }
 
-  if (SDIO_GetITStatus(SDIO_IT_TXUNDERR) != RESET)
-  {
-    SDIO_ClearITPendingBit(SDIO_IT_TXUNDERR);
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
-                  SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
-                  SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
-    NumberOfBytes = 0;
-    TransferError = SD_TX_UNDERRUN;
-    return(SD_TX_UNDERRUN);
-  }
+    if (SDIO_GetITStatus(SDIO_IT_TXUNDERR) != RESET)
+    {
+        SDIO_ClearITPendingBit(SDIO_IT_TXUNDERR);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
+                      SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
+                      SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
+        NumberOfBytes = 0;
+        TransferError = SD_TX_UNDERRUN;
+        return(SD_TX_UNDERRUN);
+    }
 
-  if (SDIO_GetITStatus(SDIO_IT_STBITERR) != RESET)
-  {
-    SDIO_ClearITPendingBit(SDIO_IT_STBITERR);
-    SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
-                  SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
-                  SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
-    NumberOfBytes = 0;
-    TransferError = SD_START_BIT_ERR;
-    return(SD_START_BIT_ERR);
-  }
+    if (SDIO_GetITStatus(SDIO_IT_STBITERR) != RESET)
+    {
+        SDIO_ClearITPendingBit(SDIO_IT_STBITERR);
+        SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND |
+                      SDIO_IT_TXFIFOHE | SDIO_IT_RXFIFOHF | SDIO_IT_TXUNDERR |
+                      SDIO_IT_RXOVERR | SDIO_IT_STBITERR, DISABLE);
+        NumberOfBytes = 0;
+        TransferError = SD_START_BIT_ERR;
+        return(SD_START_BIT_ERR);
+    }
 
-  return(SD_OK);
+    return(SD_OK);
 }
 
 /**
@@ -2134,26 +2134,26 @@ SD_Error SD_ProcessIRQSrc(void)
   */
 static SD_Error CmdError(void)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t timeout;
+    SD_Error errorstatus = SD_OK;
+    uint32_t timeout;
 
-  timeout = SDIO_CMD0TIMEOUT; /* 10000 */
+    timeout = SDIO_CMD0TIMEOUT; /* 10000 */
 
-  while ((timeout > 0) && (SDIO_GetFlagStatus(SDIO_FLAG_CMDSENT) == RESET))
-  {
-    timeout--;
-  }
+    while ((timeout > 0) && (SDIO_GetFlagStatus(SDIO_FLAG_CMDSENT) == RESET))
+    {
+        timeout--;
+    }
 
-  if (timeout == 0)
-  {
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    return(errorstatus);
-  }
+    if (timeout == 0)
+    {
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        return(errorstatus);
+    }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -2164,34 +2164,34 @@ static SD_Error CmdError(void)
   */
 static SD_Error CmdResp7Error(void)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t status;
-  uint32_t timeout = SDIO_CMD0TIMEOUT;
+    SD_Error errorstatus = SD_OK;
+    uint32_t status;
+    uint32_t timeout = SDIO_CMD0TIMEOUT;
 
-  status = SDIO->STA;
-
-  while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)) && (timeout > 0))
-  {
-    timeout--;
     status = SDIO->STA;
-  }
 
-  if ((timeout == 0) || (status & SDIO_FLAG_CTIMEOUT))
-  {
-    /* Card is not V2.0 complient or card does not support the set voltage range */
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
-    return(errorstatus);
-  }
+    while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)) && (timeout > 0))
+    {
+        timeout--;
+        status = SDIO->STA;
+    }
+
+    if ((timeout == 0) || (status & SDIO_FLAG_CTIMEOUT))
+    {
+        /* Card is not V2.0 complient or card does not support the set voltage range */
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+        return(errorstatus);
+    }
 
-  if (status & SDIO_FLAG_CMDREND)
-  {
-    /* Card is SD V2.0 compliant */
-    errorstatus = SD_OK;
-    SDIO_ClearFlag(SDIO_FLAG_CMDREND);
+    if (status & SDIO_FLAG_CMDREND)
+    {
+        /* Card is SD V2.0 compliant */
+        errorstatus = SD_OK;
+        SDIO_ClearFlag(SDIO_FLAG_CMDREND);
+        return(errorstatus);
+    }
     return(errorstatus);
-  }
-  return(errorstatus);
 }
 
 /**
@@ -2202,143 +2202,143 @@ static SD_Error CmdResp7Error(void)
   */
 static SD_Error CmdResp1Error(uint8_t cmd)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t status;
-  uint32_t response_r1;
+    SD_Error errorstatus = SD_OK;
+    uint32_t status;
+    uint32_t response_r1;
 
-  status = SDIO->STA;
-
-  while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)))
-  {
     status = SDIO->STA;
-  }
 
-  if (status & SDIO_FLAG_CTIMEOUT)
-  {
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
-    return(errorstatus);
-  }
-  else if (status & SDIO_FLAG_CCRCFAIL)
-  {
-    errorstatus = SD_CMD_CRC_FAIL;
-    SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
-    return(errorstatus);
-  }
+    while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)))
+    {
+        status = SDIO->STA;
+    }
 
-  /* Check response received is of desired command */
-  if (SDIO_GetCommandResponse() != cmd)
-  {
-    errorstatus = SD_ILLEGAL_CMD;
-    return(errorstatus);
-  }
+    if (status & SDIO_FLAG_CTIMEOUT)
+    {
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+        return(errorstatus);
+    }
+    else if (status & SDIO_FLAG_CCRCFAIL)
+    {
+        errorstatus = SD_CMD_CRC_FAIL;
+        SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
+        return(errorstatus);
+    }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    /* Check response received is of desired command */
+    if (SDIO_GetCommandResponse() != cmd)
+    {
+        errorstatus = SD_ILLEGAL_CMD;
+        return(errorstatus);
+    }
 
-  /* We have received response, retrieve it for analysis  */
-  response_r1 = SDIO_GetResponse(SDIO_RESP1);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  if ((response_r1 & SD_OCR_ERRORBITS) == SD_ALLZERO)
-  {
-    return(errorstatus);
-  }
+    /* We have received response, retrieve it for analysis  */
+    response_r1 = SDIO_GetResponse(SDIO_RESP1);
 
-  if (response_r1 & SD_OCR_ADDR_OUT_OF_RANGE)
-  {
-    return(SD_ADDR_OUT_OF_RANGE);
-  }
+    if ((response_r1 & SD_OCR_ERRORBITS) == SD_ALLZERO)
+    {
+        return(errorstatus);
+    }
 
-  if (response_r1 & SD_OCR_ADDR_MISALIGNED)
-  {
-    return(SD_ADDR_MISALIGNED);
-  }
+    if (response_r1 & SD_OCR_ADDR_OUT_OF_RANGE)
+    {
+        return(SD_ADDR_OUT_OF_RANGE);
+    }
 
-  if (response_r1 & SD_OCR_BLOCK_LEN_ERR)
-  {
-    return(SD_BLOCK_LEN_ERR);
-  }
+    if (response_r1 & SD_OCR_ADDR_MISALIGNED)
+    {
+        return(SD_ADDR_MISALIGNED);
+    }
 
-  if (response_r1 & SD_OCR_ERASE_SEQ_ERR)
-  {
-    return(SD_ERASE_SEQ_ERR);
-  }
+    if (response_r1 & SD_OCR_BLOCK_LEN_ERR)
+    {
+        return(SD_BLOCK_LEN_ERR);
+    }
 
-  if (response_r1 & SD_OCR_BAD_ERASE_PARAM)
-  {
-    return(SD_BAD_ERASE_PARAM);
-  }
+    if (response_r1 & SD_OCR_ERASE_SEQ_ERR)
+    {
+        return(SD_ERASE_SEQ_ERR);
+    }
 
-  if (response_r1 & SD_OCR_WRITE_PROT_VIOLATION)
-  {
-    return(SD_WRITE_PROT_VIOLATION);
-  }
+    if (response_r1 & SD_OCR_BAD_ERASE_PARAM)
+    {
+        return(SD_BAD_ERASE_PARAM);
+    }
 
-  if (response_r1 & SD_OCR_LOCK_UNLOCK_FAILED)
-  {
-    return(SD_LOCK_UNLOCK_FAILED);
-  }
+    if (response_r1 & SD_OCR_WRITE_PROT_VIOLATION)
+    {
+        return(SD_WRITE_PROT_VIOLATION);
+    }
 
-  if (response_r1 & SD_OCR_COM_CRC_FAILED)
-  {
-    return(SD_COM_CRC_FAILED);
-  }
+    if (response_r1 & SD_OCR_LOCK_UNLOCK_FAILED)
+    {
+        return(SD_LOCK_UNLOCK_FAILED);
+    }
 
-  if (response_r1 & SD_OCR_ILLEGAL_CMD)
-  {
-    return(SD_ILLEGAL_CMD);
-  }
+    if (response_r1 & SD_OCR_COM_CRC_FAILED)
+    {
+        return(SD_COM_CRC_FAILED);
+    }
 
-  if (response_r1 & SD_OCR_CARD_ECC_FAILED)
-  {
-    return(SD_CARD_ECC_FAILED);
-  }
+    if (response_r1 & SD_OCR_ILLEGAL_CMD)
+    {
+        return(SD_ILLEGAL_CMD);
+    }
+
+    if (response_r1 & SD_OCR_CARD_ECC_FAILED)
+    {
+        return(SD_CARD_ECC_FAILED);
+    }
 
-  if (response_r1 & SD_OCR_CC_ERROR)
-  {
-    return(SD_CC_ERROR);
-  }
+    if (response_r1 & SD_OCR_CC_ERROR)
+    {
+        return(SD_CC_ERROR);
+    }
 
-  if (response_r1 & SD_OCR_GENERAL_UNKNOWN_ERROR)
-  {
-    return(SD_GENERAL_UNKNOWN_ERROR);
-  }
+    if (response_r1 & SD_OCR_GENERAL_UNKNOWN_ERROR)
+    {
+        return(SD_GENERAL_UNKNOWN_ERROR);
+    }
 
-  if (response_r1 & SD_OCR_STREAM_READ_UNDERRUN)
-  {
-    return(SD_STREAM_READ_UNDERRUN);
-  }
+    if (response_r1 & SD_OCR_STREAM_READ_UNDERRUN)
+    {
+        return(SD_STREAM_READ_UNDERRUN);
+    }
 
-  if (response_r1 & SD_OCR_STREAM_WRITE_OVERRUN)
-  {
-    return(SD_STREAM_WRITE_OVERRUN);
-  }
+    if (response_r1 & SD_OCR_STREAM_WRITE_OVERRUN)
+    {
+        return(SD_STREAM_WRITE_OVERRUN);
+    }
 
-  if (response_r1 & SD_OCR_CID_CSD_OVERWRIETE)
-  {
-    return(SD_CID_CSD_OVERWRITE);
-  }
+    if (response_r1 & SD_OCR_CID_CSD_OVERWRIETE)
+    {
+        return(SD_CID_CSD_OVERWRITE);
+    }
 
-  if (response_r1 & SD_OCR_WP_ERASE_SKIP)
-  {
-    return(SD_WP_ERASE_SKIP);
-  }
+    if (response_r1 & SD_OCR_WP_ERASE_SKIP)
+    {
+        return(SD_WP_ERASE_SKIP);
+    }
 
-  if (response_r1 & SD_OCR_CARD_ECC_DISABLED)
-  {
-    return(SD_CARD_ECC_DISABLED);
-  }
+    if (response_r1 & SD_OCR_CARD_ECC_DISABLED)
+    {
+        return(SD_CARD_ECC_DISABLED);
+    }
 
-  if (response_r1 & SD_OCR_ERASE_RESET)
-  {
-    return(SD_ERASE_RESET);
-  }
+    if (response_r1 & SD_OCR_ERASE_RESET)
+    {
+        return(SD_ERASE_RESET);
+    }
 
-  if (response_r1 & SD_OCR_AKE_SEQ_ERROR)
-  {
-    return(SD_AKE_SEQ_ERROR);
-  }
-  return(errorstatus);
+    if (response_r1 & SD_OCR_AKE_SEQ_ERROR)
+    {
+        return(SD_AKE_SEQ_ERROR);
+    }
+    return(errorstatus);
 }
 
 /**
@@ -2349,25 +2349,25 @@ static SD_Error CmdResp1Error(uint8_t cmd)
   */
 static SD_Error CmdResp3Error(void)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t status;
-
-  status = SDIO->STA;
+    SD_Error errorstatus = SD_OK;
+    uint32_t status;
 
-  while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)))
-  {
     status = SDIO->STA;
-  }
 
-  if (status & SDIO_FLAG_CTIMEOUT)
-  {
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+    while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)))
+    {
+        status = SDIO->STA;
+    }
+
+    if (status & SDIO_FLAG_CTIMEOUT)
+    {
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+        return(errorstatus);
+    }
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
     return(errorstatus);
-  }
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
-  return(errorstatus);
 }
 
 /**
@@ -2378,33 +2378,33 @@ static SD_Error CmdResp3Error(void)
   */
 static SD_Error CmdResp2Error(void)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t status;
-
-  status = SDIO->STA;
+    SD_Error errorstatus = SD_OK;
+    uint32_t status;
 
-  while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CTIMEOUT | SDIO_FLAG_CMDREND)))
-  {
     status = SDIO->STA;
-  }
 
-  if (status & SDIO_FLAG_CTIMEOUT)
-  {
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
-    return(errorstatus);
-  }
-  else if (status & SDIO_FLAG_CCRCFAIL)
-  {
-    errorstatus = SD_CMD_CRC_FAIL;
-    SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
-    return(errorstatus);
-  }
+    while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CTIMEOUT | SDIO_FLAG_CMDREND)))
+    {
+        status = SDIO->STA;
+    }
+
+    if (status & SDIO_FLAG_CTIMEOUT)
+    {
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+        return(errorstatus);
+    }
+    else if (status & SDIO_FLAG_CCRCFAIL)
+    {
+        errorstatus = SD_CMD_CRC_FAIL;
+        SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
+        return(errorstatus);
+    }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -2417,65 +2417,65 @@ static SD_Error CmdResp2Error(void)
   */
 static SD_Error CmdResp6Error(uint8_t cmd, uint16_t *prca)
 {
-  SD_Error errorstatus = SD_OK;
-  uint32_t status;
-  uint32_t response_r1;
-
-  status = SDIO->STA;
+    SD_Error errorstatus = SD_OK;
+    uint32_t status;
+    uint32_t response_r1;
 
-  while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CTIMEOUT | SDIO_FLAG_CMDREND)))
-  {
     status = SDIO->STA;
-  }
 
-  if (status & SDIO_FLAG_CTIMEOUT)
-  {
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
-    return(errorstatus);
-  }
-  else if (status & SDIO_FLAG_CCRCFAIL)
-  {
-    errorstatus = SD_CMD_CRC_FAIL;
-    SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
-    return(errorstatus);
-  }
+    while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CTIMEOUT | SDIO_FLAG_CMDREND)))
+    {
+        status = SDIO->STA;
+    }
 
-  /* Check response received is of desired command */
-  if (SDIO_GetCommandResponse() != cmd)
-  {
-    errorstatus = SD_ILLEGAL_CMD;
-    return(errorstatus);
-  }
+    if (status & SDIO_FLAG_CTIMEOUT)
+    {
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+        return(errorstatus);
+    }
+    else if (status & SDIO_FLAG_CCRCFAIL)
+    {
+        errorstatus = SD_CMD_CRC_FAIL;
+        SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
+        return(errorstatus);
+    }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    /* Check response received is of desired command */
+    if (SDIO_GetCommandResponse() != cmd)
+    {
+        errorstatus = SD_ILLEGAL_CMD;
+        return(errorstatus);
+    }
 
-  /* We have received response, retrieve it.  */
-  response_r1 = SDIO_GetResponse(SDIO_RESP1);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  if (SD_ALLZERO == (response_r1 & (SD_R6_GENERAL_UNKNOWN_ERROR | SD_R6_ILLEGAL_CMD | SD_R6_COM_CRC_FAILED)))
-  {
-    *prca = (uint16_t) (response_r1 >> 16);
-    return(errorstatus);
-  }
+    /* We have received response, retrieve it.  */
+    response_r1 = SDIO_GetResponse(SDIO_RESP1);
 
-  if (response_r1 & SD_R6_GENERAL_UNKNOWN_ERROR)
-  {
-    return(SD_GENERAL_UNKNOWN_ERROR);
-  }
+    if (SD_ALLZERO == (response_r1 & (SD_R6_GENERAL_UNKNOWN_ERROR | SD_R6_ILLEGAL_CMD | SD_R6_COM_CRC_FAILED)))
+    {
+        *prca = (uint16_t) (response_r1 >> 16);
+        return(errorstatus);
+    }
 
-  if (response_r1 & SD_R6_ILLEGAL_CMD)
-  {
-    return(SD_ILLEGAL_CMD);
-  }
+    if (response_r1 & SD_R6_GENERAL_UNKNOWN_ERROR)
+    {
+        return(SD_GENERAL_UNKNOWN_ERROR);
+    }
 
-  if (response_r1 & SD_R6_COM_CRC_FAILED)
-  {
-    return(SD_COM_CRC_FAILED);
-  }
+    if (response_r1 & SD_R6_ILLEGAL_CMD)
+    {
+        return(SD_ILLEGAL_CMD);
+    }
+
+    if (response_r1 & SD_R6_COM_CRC_FAILED)
+    {
+        return(SD_COM_CRC_FAILED);
+    }
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -2486,111 +2486,111 @@ static SD_Error CmdResp6Error(uint8_t cmd, uint16_t *prca)
   */
 static SD_Error SDEnWideBus(FunctionalState NewState)
 {
-  SD_Error errorstatus = SD_OK;
+    SD_Error errorstatus = SD_OK;
 
-  uint32_t scr[2] = {0, 0};
+    uint32_t scr[2] = {0, 0};
 
-  if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
-  {
-    errorstatus = SD_LOCK_UNLOCK_FAILED;
-    return(errorstatus);
-  }
+    if (SDIO_GetResponse(SDIO_RESP1) & SD_CARD_LOCKED)
+    {
+        errorstatus = SD_LOCK_UNLOCK_FAILED;
+        return(errorstatus);
+    }
 
-  /* Get SCR Register */
-  errorstatus = FindSCR(RCA, scr);
+    /* Get SCR Register */
+    errorstatus = FindSCR(RCA, scr);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  /* If wide bus operation to be enabled */
-  if (NewState == ENABLE)
-  {
-    /* If requested card supports wide bus operation */
-    if ((scr[1] & SD_WIDE_BUS_SUPPORT) != SD_ALLZERO)
+    /* If wide bus operation to be enabled */
+    if (NewState == ENABLE)
     {
-      /* Send CMD55 APP_CMD with argument as card's RCA.*/
-      SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+        /* If requested card supports wide bus operation */
+        if ((scr[1] & SD_WIDE_BUS_SUPPORT) != SD_ALLZERO)
+        {
+            /* Send CMD55 APP_CMD with argument as card's RCA.*/
+            SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp1Error(SDIO_APP_CMD);
+            errorstatus = CmdResp1Error(SDIO_APP_CMD);
 
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
 
-      /* Send ACMD6 APP_CMD with argument as 2 for wide bus mode */
-      SDIO_CmdInitStructure.SDIO_Argument = 0x2;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_SD_SET_BUSWIDTH;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+            /* Send ACMD6 APP_CMD with argument as 2 for wide bus mode */
+            SDIO_CmdInitStructure.SDIO_Argument = 0x2;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_SD_SET_BUSWIDTH;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp1Error(SDIO_APP_SD_SET_BUSWIDTH);
+            errorstatus = CmdResp1Error(SDIO_APP_SD_SET_BUSWIDTH);
 
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
-      return(errorstatus);
-    }
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
+            return(errorstatus);
+        }
+        else
+        {
+            errorstatus = SD_REQUEST_NOT_APPLICABLE;
+            return(errorstatus);
+        }
+    }   /* If wide bus operation to be disabled */
     else
     {
-      errorstatus = SD_REQUEST_NOT_APPLICABLE;
-      return(errorstatus);
-    }
-  }   /* If wide bus operation to be disabled */
-  else
-  {
-    /* If requested card supports 1 bit mode operation */
-    if ((scr[1] & SD_SINGLE_BUS_SUPPORT) != SD_ALLZERO)
-    {
-      /* Send CMD55 APP_CMD with argument as card's RCA.*/
-      SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+        /* If requested card supports 1 bit mode operation */
+        if ((scr[1] & SD_SINGLE_BUS_SUPPORT) != SD_ALLZERO)
+        {
+            /* Send CMD55 APP_CMD with argument as card's RCA.*/
+            SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
 
-      errorstatus = CmdResp1Error(SDIO_APP_CMD);
+            errorstatus = CmdResp1Error(SDIO_APP_CMD);
 
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
 
-      /* Send ACMD6 APP_CMD with argument as 2 for wide bus mode */
-      SDIO_CmdInitStructure.SDIO_Argument = 0x00;
-      SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_SD_SET_BUSWIDTH;
-      SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-      SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-      SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-      SDIO_SendCommand(&SDIO_CmdInitStructure);
+            /* Send ACMD6 APP_CMD with argument as 2 for wide bus mode */
+            SDIO_CmdInitStructure.SDIO_Argument = 0x00;
+            SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_SD_SET_BUSWIDTH;
+            SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+            SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+            SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+            SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-      errorstatus = CmdResp1Error(SDIO_APP_SD_SET_BUSWIDTH);
+            errorstatus = CmdResp1Error(SDIO_APP_SD_SET_BUSWIDTH);
 
-      if (errorstatus != SD_OK)
-      {
-        return(errorstatus);
-      }
+            if (errorstatus != SD_OK)
+            {
+                return(errorstatus);
+            }
 
-      return(errorstatus);
-    }
-    else
-    {
-      errorstatus = SD_REQUEST_NOT_APPLICABLE;
-      return(errorstatus);
+            return(errorstatus);
+        }
+        else
+        {
+            errorstatus = SD_REQUEST_NOT_APPLICABLE;
+            return(errorstatus);
+        }
     }
-  }
 }
 
 /**
@@ -2601,155 +2601,155 @@ static SD_Error SDEnWideBus(FunctionalState NewState)
   */
 static SD_Error IsCardProgramming(uint8_t *pstatus)
 {
-  SD_Error errorstatus = SD_OK;
-  __IO uint32_t respR1 = 0, status = 0;
+    SD_Error errorstatus = SD_OK;
+    __IO uint32_t respR1 = 0, status = 0;
 
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SEND_STATUS;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  status = SDIO->STA;
-  while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)))
-  {
     status = SDIO->STA;
-  }
+    while (!(status & (SDIO_FLAG_CCRCFAIL | SDIO_FLAG_CMDREND | SDIO_FLAG_CTIMEOUT)))
+    {
+        status = SDIO->STA;
+    }
 
-  if (status & SDIO_FLAG_CTIMEOUT)
-  {
-    errorstatus = SD_CMD_RSP_TIMEOUT;
-    SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
-    return(errorstatus);
-  }
-  else if (status & SDIO_FLAG_CCRCFAIL)
-  {
-    errorstatus = SD_CMD_CRC_FAIL;
-    SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
-    return(errorstatus);
-  }
+    if (status & SDIO_FLAG_CTIMEOUT)
+    {
+        errorstatus = SD_CMD_RSP_TIMEOUT;
+        SDIO_ClearFlag(SDIO_FLAG_CTIMEOUT);
+        return(errorstatus);
+    }
+    else if (status & SDIO_FLAG_CCRCFAIL)
+    {
+        errorstatus = SD_CMD_CRC_FAIL;
+        SDIO_ClearFlag(SDIO_FLAG_CCRCFAIL);
+        return(errorstatus);
+    }
 
-  status = (uint32_t)SDIO_GetCommandResponse();
+    status = (uint32_t)SDIO_GetCommandResponse();
 
-  /* Check response received is of desired command */
-  if (status != SDIO_SEND_STATUS)
-  {
-    errorstatus = SD_ILLEGAL_CMD;
-    return(errorstatus);
-  }
+    /* Check response received is of desired command */
+    if (status != SDIO_SEND_STATUS)
+    {
+        errorstatus = SD_ILLEGAL_CMD;
+        return(errorstatus);
+    }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
 
-  /* We have received response, retrieve it for analysis  */
-  respR1 = SDIO_GetResponse(SDIO_RESP1);
+    /* We have received response, retrieve it for analysis  */
+    respR1 = SDIO_GetResponse(SDIO_RESP1);
 
-  /* Find out card status */
-  *pstatus = (uint8_t) ((respR1 >> 9) & 0x0000000F);
+    /* Find out card status */
+    *pstatus = (uint8_t) ((respR1 >> 9) & 0x0000000F);
 
-  if ((respR1 & SD_OCR_ERRORBITS) == SD_ALLZERO)
-  {
-    return(errorstatus);
-  }
+    if ((respR1 & SD_OCR_ERRORBITS) == SD_ALLZERO)
+    {
+        return(errorstatus);
+    }
 
-  if (respR1 & SD_OCR_ADDR_OUT_OF_RANGE)
-  {
-    return(SD_ADDR_OUT_OF_RANGE);
-  }
+    if (respR1 & SD_OCR_ADDR_OUT_OF_RANGE)
+    {
+        return(SD_ADDR_OUT_OF_RANGE);
+    }
 
-  if (respR1 & SD_OCR_ADDR_MISALIGNED)
-  {
-    return(SD_ADDR_MISALIGNED);
-  }
+    if (respR1 & SD_OCR_ADDR_MISALIGNED)
+    {
+        return(SD_ADDR_MISALIGNED);
+    }
 
-  if (respR1 & SD_OCR_BLOCK_LEN_ERR)
-  {
-    return(SD_BLOCK_LEN_ERR);
-  }
+    if (respR1 & SD_OCR_BLOCK_LEN_ERR)
+    {
+        return(SD_BLOCK_LEN_ERR);
+    }
 
-  if (respR1 & SD_OCR_ERASE_SEQ_ERR)
-  {
-    return(SD_ERASE_SEQ_ERR);
-  }
+    if (respR1 & SD_OCR_ERASE_SEQ_ERR)
+    {
+        return(SD_ERASE_SEQ_ERR);
+    }
 
-  if (respR1 & SD_OCR_BAD_ERASE_PARAM)
-  {
-    return(SD_BAD_ERASE_PARAM);
-  }
+    if (respR1 & SD_OCR_BAD_ERASE_PARAM)
+    {
+        return(SD_BAD_ERASE_PARAM);
+    }
 
-  if (respR1 & SD_OCR_WRITE_PROT_VIOLATION)
-  {
-    return(SD_WRITE_PROT_VIOLATION);
-  }
+    if (respR1 & SD_OCR_WRITE_PROT_VIOLATION)
+    {
+        return(SD_WRITE_PROT_VIOLATION);
+    }
 
-  if (respR1 & SD_OCR_LOCK_UNLOCK_FAILED)
-  {
-    return(SD_LOCK_UNLOCK_FAILED);
-  }
+    if (respR1 & SD_OCR_LOCK_UNLOCK_FAILED)
+    {
+        return(SD_LOCK_UNLOCK_FAILED);
+    }
 
-  if (respR1 & SD_OCR_COM_CRC_FAILED)
-  {
-    return(SD_COM_CRC_FAILED);
-  }
+    if (respR1 & SD_OCR_COM_CRC_FAILED)
+    {
+        return(SD_COM_CRC_FAILED);
+    }
 
-  if (respR1 & SD_OCR_ILLEGAL_CMD)
-  {
-    return(SD_ILLEGAL_CMD);
-  }
+    if (respR1 & SD_OCR_ILLEGAL_CMD)
+    {
+        return(SD_ILLEGAL_CMD);
+    }
 
-  if (respR1 & SD_OCR_CARD_ECC_FAILED)
-  {
-    return(SD_CARD_ECC_FAILED);
-  }
+    if (respR1 & SD_OCR_CARD_ECC_FAILED)
+    {
+        return(SD_CARD_ECC_FAILED);
+    }
 
-  if (respR1 & SD_OCR_CC_ERROR)
-  {
-    return(SD_CC_ERROR);
-  }
+    if (respR1 & SD_OCR_CC_ERROR)
+    {
+        return(SD_CC_ERROR);
+    }
 
-  if (respR1 & SD_OCR_GENERAL_UNKNOWN_ERROR)
-  {
-    return(SD_GENERAL_UNKNOWN_ERROR);
-  }
+    if (respR1 & SD_OCR_GENERAL_UNKNOWN_ERROR)
+    {
+        return(SD_GENERAL_UNKNOWN_ERROR);
+    }
 
-  if (respR1 & SD_OCR_STREAM_READ_UNDERRUN)
-  {
-    return(SD_STREAM_READ_UNDERRUN);
-  }
+    if (respR1 & SD_OCR_STREAM_READ_UNDERRUN)
+    {
+        return(SD_STREAM_READ_UNDERRUN);
+    }
 
-  if (respR1 & SD_OCR_STREAM_WRITE_OVERRUN)
-  {
-    return(SD_STREAM_WRITE_OVERRUN);
-  }
+    if (respR1 & SD_OCR_STREAM_WRITE_OVERRUN)
+    {
+        return(SD_STREAM_WRITE_OVERRUN);
+    }
 
-  if (respR1 & SD_OCR_CID_CSD_OVERWRIETE)
-  {
-    return(SD_CID_CSD_OVERWRITE);
-  }
+    if (respR1 & SD_OCR_CID_CSD_OVERWRIETE)
+    {
+        return(SD_CID_CSD_OVERWRITE);
+    }
 
-  if (respR1 & SD_OCR_WP_ERASE_SKIP)
-  {
-    return(SD_WP_ERASE_SKIP);
-  }
+    if (respR1 & SD_OCR_WP_ERASE_SKIP)
+    {
+        return(SD_WP_ERASE_SKIP);
+    }
 
-  if (respR1 & SD_OCR_CARD_ECC_DISABLED)
-  {
-    return(SD_CARD_ECC_DISABLED);
-  }
+    if (respR1 & SD_OCR_CARD_ECC_DISABLED)
+    {
+        return(SD_CARD_ECC_DISABLED);
+    }
 
-  if (respR1 & SD_OCR_ERASE_RESET)
-  {
-    return(SD_ERASE_RESET);
-  }
+    if (respR1 & SD_OCR_ERASE_RESET)
+    {
+        return(SD_ERASE_RESET);
+    }
 
-  if (respR1 & SD_OCR_AKE_SEQ_ERROR)
-  {
-    return(SD_AKE_SEQ_ERROR);
-  }
+    if (respR1 & SD_OCR_AKE_SEQ_ERROR)
+    {
+        return(SD_AKE_SEQ_ERROR);
+    }
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -2760,111 +2760,111 @@ static SD_Error IsCardProgramming(uint8_t *pstatus)
   */
 static SD_Error FindSCR(uint16_t rca, uint32_t *pscr)
 {
-  uint32_t index = 0;
-  SD_Error errorstatus = SD_OK;
-  uint32_t tempscr[2] = {0, 0};
+    uint32_t index = 0;
+    SD_Error errorstatus = SD_OK;
+    uint32_t tempscr[2] = {0, 0};
 
-  /* Set Block Size To 8 Bytes */
-  /* Send CMD55 APP_CMD with argument as card's RCA */
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)8;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Set Block Size To 8 Bytes */
+    /* Send CMD55 APP_CMD with argument as card's RCA */
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)8;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SET_BLOCKLEN;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
+    errorstatus = CmdResp1Error(SDIO_SET_BLOCKLEN);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  /* Send CMD55 APP_CMD with argument as card's RCA */
-  SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Send CMD55 APP_CMD with argument as card's RCA */
+    SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) RCA << 16;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_APP_CMD;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_APP_CMD);
+    errorstatus = CmdResp1Error(SDIO_APP_CMD);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
-  SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
-  SDIO_DataInitStructure.SDIO_DataLength = 8;
-  SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_8b;
-  SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
-  SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
-  SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
-  SDIO_DataConfig(&SDIO_DataInitStructure);
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
+    SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT;
+    SDIO_DataInitStructure.SDIO_DataLength = 8;
+    SDIO_DataInitStructure.SDIO_DataBlockSize = SDIO_DataBlockSize_8b;
+    SDIO_DataInitStructure.SDIO_TransferDir = SDIO_TransferDir_ToSDIO;
+    SDIO_DataInitStructure.SDIO_TransferMode = SDIO_TransferMode_Block;
+    SDIO_DataInitStructure.SDIO_DPSM = SDIO_DPSM_Enable;
+    SDIO_DataConfig(&SDIO_DataInitStructure);
 
-  /* make a delay */
-  {
-    volatile uint32_t delay;
-    for(delay = 0; delay < 20; delay++);
-  }
+    /* make a delay */
+    {
+        volatile uint32_t delay;
+        for(delay = 0; delay < 20; delay++);
+    }
 
-  /* Send ACMD51 SD_APP_SEND_SCR with argument as 0 */
-  SDIO_CmdInitStructure.SDIO_Argument = 0x0;
-  SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_APP_SEND_SCR;
-  SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
-  SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
-  SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
-  SDIO_SendCommand(&SDIO_CmdInitStructure);
+    /* Send ACMD51 SD_APP_SEND_SCR with argument as 0 */
+    SDIO_CmdInitStructure.SDIO_Argument = 0x0;
+    SDIO_CmdInitStructure.SDIO_CmdIndex = SDIO_SD_APP_SEND_SCR;
+    SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short;
+    SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No;
+    SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable;
+    SDIO_SendCommand(&SDIO_CmdInitStructure);
 
-  errorstatus = CmdResp1Error(SDIO_SD_APP_SEND_SCR);
+    errorstatus = CmdResp1Error(SDIO_SD_APP_SEND_SCR);
 
-  if (errorstatus != SD_OK)
-  {
-    return(errorstatus);
-  }
+    if (errorstatus != SD_OK)
+    {
+        return(errorstatus);
+    }
 
-  while (!(SDIO->STA & (SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR)))
-  {
-    if (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
+    while (!(SDIO->STA & (SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR)))
     {
-      *(tempscr + index) = SDIO_ReadData();
-      index++;
+        if (SDIO_GetFlagStatus(SDIO_FLAG_RXDAVL) != RESET)
+        {
+            *(tempscr + index) = SDIO_ReadData();
+            index++;
+        }
     }
-  }
 
-  if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
-    errorstatus = SD_DATA_TIMEOUT;
-    return(errorstatus);
-  }
-  else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
-    errorstatus = SD_DATA_CRC_FAIL;
-    return(errorstatus);
-  }
-  else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
-    errorstatus = SD_RX_OVERRUN;
-    return(errorstatus);
-  }
-  else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
-  {
-    SDIO_ClearFlag(SDIO_FLAG_STBITERR);
-    errorstatus = SD_START_BIT_ERR;
-    return(errorstatus);
-  }
+    if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT);
+        errorstatus = SD_DATA_TIMEOUT;
+        return(errorstatus);
+    }
+    else if (SDIO_GetFlagStatus(SDIO_FLAG_DCRCFAIL) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_DCRCFAIL);
+        errorstatus = SD_DATA_CRC_FAIL;
+        return(errorstatus);
+    }
+    else if (SDIO_GetFlagStatus(SDIO_FLAG_RXOVERR) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_RXOVERR);
+        errorstatus = SD_RX_OVERRUN;
+        return(errorstatus);
+    }
+    else if (SDIO_GetFlagStatus(SDIO_FLAG_STBITERR) != RESET)
+    {
+        SDIO_ClearFlag(SDIO_FLAG_STBITERR);
+        errorstatus = SD_START_BIT_ERR;
+        return(errorstatus);
+    }
 
-  /* Clear all the static flags */
-  SDIO_ClearFlag(SDIO_STATIC_FLAGS);
+    /* Clear all the static flags */
+    SDIO_ClearFlag(SDIO_STATIC_FLAGS);
 
-  *(pscr + 1) = ((tempscr[0] & SD_0TO7BITS) << 24) | ((tempscr[0] & SD_8TO15BITS) << 8) | ((tempscr[0] & SD_16TO23BITS) >> 8) | ((tempscr[0] & SD_24TO31BITS) >> 24);
+    *(pscr + 1) = ((tempscr[0] & SD_0TO7BITS) << 24) | ((tempscr[0] & SD_8TO15BITS) << 8) | ((tempscr[0] & SD_16TO23BITS) >> 8) | ((tempscr[0] & SD_24TO31BITS) >> 24);
 
-  *(pscr) = ((tempscr[1] & SD_0TO7BITS) << 24) | ((tempscr[1] & SD_8TO15BITS) << 8) | ((tempscr[1] & SD_16TO23BITS) >> 8) | ((tempscr[1] & SD_24TO31BITS) >> 24);
+    *(pscr) = ((tempscr[1] & SD_0TO7BITS) << 24) | ((tempscr[1] & SD_8TO15BITS) << 8) | ((tempscr[1] & SD_16TO23BITS) >> 8) | ((tempscr[1] & SD_24TO31BITS) >> 24);
 
-  return(errorstatus);
+    return(errorstatus);
 }
 
 /**
@@ -2875,14 +2875,14 @@ static SD_Error FindSCR(uint16_t rca, uint32_t *pscr)
   */
 static uint8_t convert_from_bytes_to_power_of_two(uint16_t NumberOfBytes)
 {
-  uint8_t count = 0;
+    uint8_t count = 0;
 
-  while (NumberOfBytes != 1)
-  {
-    NumberOfBytes >>= 1;
-    count++;
-  }
-  return(count);
+    while (NumberOfBytes != 1)
+    {
+        NumberOfBytes >>= 1;
+        count++;
+    }
+    return(count);
 }
 
 /**
@@ -2892,20 +2892,20 @@ static uint8_t convert_from_bytes_to_power_of_two(uint16_t NumberOfBytes)
   */
 static void GPIO_Configuration(void)
 {
-  GPIO_InitTypeDef  GPIO_InitStructure;
+    GPIO_InitTypeDef  GPIO_InitStructure;
 
-  /* GPIOC and GPIOD Periph clock enable */
-  RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOD, ENABLE);
+    /* GPIOC and GPIOD Periph clock enable */
+    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOD, ENABLE);
 
-  /* Configure PC.08, PC.09, PC.10, PC.11, PC.12 pin: D0, D1, D2, D3, CLK pin */
-  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12;
-  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
-  GPIO_Init(GPIOC, &GPIO_InitStructure);
+    /* Configure PC.08, PC.09, PC.10, PC.11, PC.12 pin: D0, D1, D2, D3, CLK pin */
+    GPIO_InitStructure.GPIO_Pin = GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12;
+    GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+    GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
+    GPIO_Init(GPIOC, &GPIO_InitStructure);
 
-  /* Configure PD.02 CMD line */
-  GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2;
-  GPIO_Init(GPIOD, &GPIO_InitStructure);
+    /* Configure PD.02 CMD line */
+    GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2;
+    GPIO_Init(GPIOD, &GPIO_InitStructure);
 }
 
 /**
@@ -2916,29 +2916,29 @@ static void GPIO_Configuration(void)
   */
 static void DMA_TxConfiguration(uint32_t *BufferSRC, uint32_t BufferSize)
 {
-  DMA_InitTypeDef DMA_InitStructure;
+    DMA_InitTypeDef DMA_InitStructure;
 
-  DMA_ClearFlag(DMA2_FLAG_TC4 | DMA2_FLAG_TE4 | DMA2_FLAG_HT4 | DMA2_FLAG_GL4);
+    DMA_ClearFlag(DMA2_FLAG_TC4 | DMA2_FLAG_TE4 | DMA2_FLAG_HT4 | DMA2_FLAG_GL4);
 
-  /* DMA2 Channel4 disable */
-  DMA_Cmd(DMA2_Channel4, DISABLE);
+    /* DMA2 Channel4 disable */
+    DMA_Cmd(DMA2_Channel4, DISABLE);
 
-  /* DMA2 Channel4 Config */
-  DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_Address;
-  DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)BufferSRC;
-  DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralDST;
-  DMA_InitStructure.DMA_BufferSize = BufferSize / 4;
-  DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
-  DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
-  DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word;
-  DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word;
-  DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
-  DMA_InitStructure.DMA_Priority = DMA_Priority_High;
-  DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
-  DMA_Init(DMA2_Channel4, &DMA_InitStructure);
+    /* DMA2 Channel4 Config */
+    DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_Address;
+    DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)BufferSRC;
+    DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralDST;
+    DMA_InitStructure.DMA_BufferSize = BufferSize / 4;
+    DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
+    DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
+    DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word;
+    DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word;
+    DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
+    DMA_InitStructure.DMA_Priority = DMA_Priority_High;
+    DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
+    DMA_Init(DMA2_Channel4, &DMA_InitStructure);
 
-  /* DMA2 Channel4 enable */
-  DMA_Cmd(DMA2_Channel4, ENABLE);
+    /* DMA2 Channel4 enable */
+    DMA_Cmd(DMA2_Channel4, ENABLE);
 }
 
 /**
@@ -2949,29 +2949,29 @@ static void DMA_TxConfiguration(uint32_t *BufferSRC, uint32_t BufferSize)
   */
 static void DMA_RxConfiguration(uint32_t *BufferDST, uint32_t BufferSize)
 {
-  DMA_InitTypeDef DMA_InitStructure;
+    DMA_InitTypeDef DMA_InitStructure;
 
-  DMA_ClearFlag(DMA2_FLAG_TC4 | DMA2_FLAG_TE4 | DMA2_FLAG_HT4 | DMA2_FLAG_GL4);
+    DMA_ClearFlag(DMA2_FLAG_TC4 | DMA2_FLAG_TE4 | DMA2_FLAG_HT4 | DMA2_FLAG_GL4);
 
-  /* DMA2 Channel4 disable */
-  DMA_Cmd(DMA2_Channel4, DISABLE);
+    /* DMA2 Channel4 disable */
+    DMA_Cmd(DMA2_Channel4, DISABLE);
 
-  /* DMA2 Channel4 Config */
-  DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_Address;
-  DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)BufferDST;
-  DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC;
-  DMA_InitStructure.DMA_BufferSize = BufferSize / 4;
-  DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
-  DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
-  DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word;
-  DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word;
-  DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
-  DMA_InitStructure.DMA_Priority = DMA_Priority_High;
-  DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
-  DMA_Init(DMA2_Channel4, &DMA_InitStructure);
+    /* DMA2 Channel4 Config */
+    DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_Address;
+    DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)BufferDST;
+    DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC;
+    DMA_InitStructure.DMA_BufferSize = BufferSize / 4;
+    DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
+    DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
+    DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word;
+    DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word;
+    DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
+    DMA_InitStructure.DMA_Priority = DMA_Priority_High;
+    DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
+    DMA_Init(DMA2_Channel4, &DMA_InitStructure);
 
-  /* DMA2 Channel4 enable */
-  DMA_Cmd(DMA2_Channel4, ENABLE);
+    /* DMA2 Channel4 enable */
+    DMA_Cmd(DMA2_Channel4, ENABLE);
 }
 
 /**
@@ -3003,49 +3003,49 @@ static rt_uint8_t _sdcard_buffer[SECTOR_SIZE];
 /* RT-Thread Device Driver Interface */
 static rt_err_t rt_sdcard_init(rt_device_t dev)
 {
-	NVIC_InitTypeDef NVIC_InitStructure;
+    NVIC_InitTypeDef NVIC_InitStructure;
 
-	NVIC_InitStructure.NVIC_IRQChannel = SDIO_IRQn;
-	NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
-	NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
-	NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-	NVIC_Init(&NVIC_InitStructure);
+    NVIC_InitStructure.NVIC_IRQChannel = SDIO_IRQn;
+    NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
+    NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
+    NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
+    NVIC_Init(&NVIC_InitStructure);
 
-	if (rt_sem_init(&sd_lock, "sdlock", 1, RT_IPC_FLAG_FIFO) != RT_EOK)
-	{
-		rt_kprintf("init sd lock semaphore failed\n");
-	}
+    if (rt_sem_init(&sd_lock, "sdlock", 1, RT_IPC_FLAG_FIFO) != RT_EOK)
+    {
+        rt_kprintf("init sd lock semaphore failed\n");
+    }
 
-	return RT_EOK;
+    return RT_EOK;
 }
 
 static rt_err_t rt_sdcard_open(rt_device_t dev, rt_uint16_t oflag)
 {
-	return RT_EOK;
+    return RT_EOK;
 }
 
 static rt_err_t rt_sdcard_close(rt_device_t dev)
 {
-	return RT_EOK;
+    return RT_EOK;
 }
 
 static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
 {
-	SD_Error status;
-	rt_uint32_t retry;
-	rt_uint32_t factor;
+    SD_Error status;
+    rt_uint32_t retry;
+    rt_uint32_t factor;
 
-	if (CardType == SDIO_HIGH_CAPACITY_SD_CARD) factor = 1;
-	else factor = SECTOR_SIZE;
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD) factor = 1;
+    else factor = SECTOR_SIZE;
 
-	rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
+    rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
 
     retry = 3;
     while(retry)
     {
         /* read all sectors */
         if (((rt_uint32_t)buffer % 4 != 0) ||
-            ((rt_uint32_t)buffer > 0x20080000))
+                ((rt_uint32_t)buffer > 0x20080000))
         {
             rt_uint32_t index;
 
@@ -3053,7 +3053,7 @@ static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_
             for (index = 0; index < size; index ++)
             {
                 status = SD_ReadBlock((part.offset + index + pos) * factor,
-                    (uint32_t*)_sdcard_buffer, SECTOR_SIZE);
+                                      (uint32_t*)_sdcard_buffer, SECTOR_SIZE);
 
                 if (status != SD_OK) break;
 
@@ -3066,12 +3066,12 @@ static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_
             if (size == 1)
             {
                 status = SD_ReadBlock((part.offset + pos) * factor,
-                    (uint32_t*)buffer, SECTOR_SIZE);
+                                      (uint32_t*)buffer, SECTOR_SIZE);
             }
             else
             {
                 status = SD_ReadMultiBlocks((part.offset + pos) * factor,
-                    (uint32_t*)buffer, SECTOR_SIZE, size);
+                                            (uint32_t*)buffer, SECTOR_SIZE, size);
             }
         }
 
@@ -3079,29 +3079,29 @@ static rt_size_t rt_sdcard_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_
 
         retry --;
     }
-	rt_sem_release(&sd_lock);
+    rt_sem_release(&sd_lock);
 
-	if (status == SD_OK) return size;
+    if (status == SD_OK) return size;
 
-	rt_kprintf("read failed: %d, buffer 0x%08x\n", status, buffer);
-	return 0;
+    rt_kprintf("read failed: %d, buffer 0x%08x\n", status, buffer);
+    return 0;
 }
 
 static rt_size_t rt_sdcard_write (rt_device_t dev, rt_off_t pos, const void* buffer, rt_size_t size)
 {
-	SD_Error status;
-	rt_uint32_t factor;
+    SD_Error status;
+    rt_uint32_t factor;
 
-	if (CardType == SDIO_HIGH_CAPACITY_SD_CARD) factor = 1;
-	else factor = SECTOR_SIZE;
+    if (CardType == SDIO_HIGH_CAPACITY_SD_CARD) factor = 1;
+    else factor = SECTOR_SIZE;
 
-	rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
+    rt_sem_take(&sd_lock, RT_WAITING_FOREVER);
 
-	/* read all sectors */
-	if (((rt_uint32_t)buffer % 4 != 0) ||
-        ((rt_uint32_t)buffer > 0x20080000))
-	{
-	    rt_uint32_t index;
+    /* read all sectors */
+    if (((rt_uint32_t)buffer % 4 != 0) ||
+            ((rt_uint32_t)buffer > 0x20080000))
+    {
+        rt_uint32_t index;
 
         /* which is not alignment with 4 or not chip SRAM */
         for (index = 0; index < size; index ++)
@@ -3110,31 +3110,31 @@ static rt_size_t rt_sdcard_write (rt_device_t dev, rt_off_t pos, const void* buf
             rt_memcpy(_sdcard_buffer, ((rt_uint8_t*)buffer + index * SECTOR_SIZE), SECTOR_SIZE);
 
             status = SD_WriteBlock((part.offset + index + pos) * factor,
-                (uint32_t*)_sdcard_buffer, SECTOR_SIZE);
+                                   (uint32_t*)_sdcard_buffer, SECTOR_SIZE);
 
             if (status != SD_OK) break;
         }
-	}
-	else
-	{
+    }
+    else
+    {
         if (size == 1)
         {
             status = SD_WriteBlock((part.offset + pos) * factor,
-                (uint32_t*)buffer, SECTOR_SIZE);
+                                   (uint32_t*)buffer, SECTOR_SIZE);
         }
         else
         {
             status = SD_WriteMultiBlocks((part.offset + pos) * factor,
-                (uint32_t*)buffer, SECTOR_SIZE, size);
+                                         (uint32_t*)buffer, SECTOR_SIZE, size);
         }
-	}
+    }
 
-	rt_sem_release(&sd_lock);
+    rt_sem_release(&sd_lock);
 
-	if (status == SD_OK) return size;
+    if (status == SD_OK) return size;
 
-	rt_kprintf("write failed: %d, buffer 0x%08x\n", status, buffer);
-	return 0;
+    rt_kprintf("write failed: %d, buffer 0x%08x\n", status, buffer);
+    return 0;
 }
 
 static rt_err_t rt_sdcard_control(rt_device_t dev, rt_uint8_t cmd, void *args)
@@ -3150,16 +3150,16 @@ static rt_err_t rt_sdcard_control(rt_device_t dev, rt_uint8_t cmd, void *args)
 
         geometry->bytes_per_sector = 512;
         geometry->block_size = SDCardInfo.CardBlockSize;
-		if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
-			geometry->sector_count = (SDCardInfo.SD_csd.DeviceSize + 1)  * 1024;
-		else
-        	geometry->sector_count = SDCardInfo.CardCapacity/SDCardInfo.CardBlockSize;
+        if (CardType == SDIO_HIGH_CAPACITY_SD_CARD)
+            geometry->sector_count = (SDCardInfo.SD_csd.DeviceSize + 1)  * 1024;
+        else
+            geometry->sector_count = SDCardInfo.CardCapacity/SDCardInfo.CardBlockSize;
     }
 
-	return RT_EOK;
+    return RT_EOK;
 }
 
-void rt_hw_sdcard_init()
+int rt_hw_sdcard_init(void)
 {
     /* SDIO POWER */
     GPIO_InitTypeDef GPIO_InitStructure;
@@ -3173,74 +3173,75 @@ void rt_hw_sdcard_init()
     // delay same time for SD card power up
 
     if (SD_Init() == SD_OK)
-	{
-		SD_Error status;
-		rt_uint8_t *sector;
+    {
+        SD_Error status;
+        rt_uint8_t *sector;
 
-		status = SD_GetCardInfo(&SDCardInfo);
-		if (status != SD_OK) goto __return;
+        status = SD_GetCardInfo(&SDCardInfo);
+        if (status != SD_OK) goto __return;
 
-		status = SD_SelectDeselect((u32) (SDCardInfo.RCA << 16));
-		if (status != SD_OK) goto __return;
+        status = SD_SelectDeselect((u32) (SDCardInfo.RCA << 16));
+        if (status != SD_OK) goto __return;
 
-		SD_EnableWideBusOperation(SDIO_BusWide_4b);
-		SD_SetDeviceMode(SD_DMA_MODE);
+        SD_EnableWideBusOperation(SDIO_BusWide_4b);
+        SD_SetDeviceMode(SD_DMA_MODE);
 
-		/* get the first sector to read partition table */
-		sector = (rt_uint8_t*) rt_malloc (512);
-		if (sector == RT_NULL)
-		{
-			rt_kprintf("allocate partition sector buffer failed\n");
-			return;
-		}
-		status = SD_ReadBlock(0, (uint32_t*)sector, 512);
-		if (status == SD_OK)
-		{
-			/* get the first partition */
-			if (dfs_filesystem_get_partition(&part, sector, 0) != 0)
+        /* get the first sector to read partition table */
+        sector = (rt_uint8_t*) rt_malloc (512);
+        if (sector == RT_NULL)
+        {
+            rt_kprintf("allocate partition sector buffer failed\n");
+            return 0;
+        }
+        status = SD_ReadBlock(0, (uint32_t*)sector, 512);
+        if (status == SD_OK)
+        {
+            /* get the first partition */
+            if (dfs_filesystem_get_partition(&part, sector, 0) != 0)
             {
                 /* there is no partition */
                 part.offset = 0;
                 part.size   = 0;
             }
-		}
-		else
-		{
-			/* there is no partition table */
-			part.offset = 0;
-			part.size   = 0;
-		}
+        }
+        else
+        {
+            /* there is no partition table */
+            part.offset = 0;
+            part.size   = 0;
+        }
 
-		/* release sector buffer */
-		rt_free(sector);
+        /* release sector buffer */
+        rt_free(sector);
 
-		/* register sdcard device */
-		sdcard_device.type  = RT_Device_Class_Block;
-		sdcard_device.init 	= rt_sdcard_init;
-		sdcard_device.open 	= rt_sdcard_open;
-		sdcard_device.close = rt_sdcard_close;
-		sdcard_device.read 	= rt_sdcard_read;
-		sdcard_device.write = rt_sdcard_write;
-		sdcard_device.control = rt_sdcard_control;
+        /* register sdcard device */
+        sdcard_device.type  = RT_Device_Class_Block;
+        sdcard_device.init 	= rt_sdcard_init;
+        sdcard_device.open 	= rt_sdcard_open;
+        sdcard_device.close = rt_sdcard_close;
+        sdcard_device.read 	= rt_sdcard_read;
+        sdcard_device.write = rt_sdcard_write;
+        sdcard_device.control = rt_sdcard_control;
 
-		/* no private */
-		sdcard_device.user_data = &SDCardInfo;
+        /* no private */
+        sdcard_device.user_data = &SDCardInfo;
 
-		rt_device_register(&sdcard_device, "sd0",
-			RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE);
+        rt_device_register(&sdcard_device, "sd0",
+                           RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE);
 
-		return;
-	}
+        return 0;
+    }
 
 __return:
-	rt_kprintf("sdcard init failed\n");
+    rt_kprintf("sdcard init failed\n");
     GPIO_SetBits(GPIOC,GPIO_Pin_6); /* SD card power down */
+
+    return 0;
 }
+INIT_DEVICE_EXPORT(rt_hw_sdcard_init);
 
 void SDIO_IRQHandler(void)
 {
-    extern int SD_ProcessIRQSrc(void);
-
     /* enter interrupt */
     rt_interrupt_enter();