Unify begin() methods and BSP_SD_*init() functions

Use Class methods with default parameters value.

Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>

Author: fpistm

src/SD.cpp

@@ -59,25 +59,7 @@ SDClass SD;
 
 /**
   * @brief  Link SD, register the file system object to the FatFs mode and configure
-  *         relatives SD IOs except SD Detect Pin
-  * @param  None
-  * @retval TRUE or FALSE
-  */
-uint8_t SDClass::begin()
-{
-	/*##-1- Initializes SD IOs #############################################*/
-	if (_card.init()) {
-		return _fatFs.init();
-    }
-    else
-    {
-	  return FALSE;
-    }
-}
-
-/**
-  * @brief  Link SD, register the file system object to the FatFs mode and configure
-  *         relatives SD IOs including SD Detect Pin
+  *         relatives SD IOs including SD Detect Pin if any
   * @param  None
   * @retval TRUE or FALSE
   */
@@ -87,10 +69,7 @@ uint8_t SDClass::begin(uint32_t cspin)
 	if (_card.init(cspin)) {
 		return _fatFs.init();
     }
-    else
-    {
-	  return FALSE;
-    }
+    return FALSE;
 }
 
 /**

src/STM32SD.h

@@ -78,8 +78,7 @@ class SDClass {
 public:
 
   /* Initialize the SD peripheral */
-  uint8_t begin();
-  uint8_t begin(uint32_t cspin);
+  uint8_t begin(uint32_t cspin = SD_DETECT_NONE);
   static File open(const char *filepath, uint8_t mode);
   static File open(const char *filepath);
   static uint8_t exists(const char *filepath);

src/Sd2Card.cpp

@@ -37,22 +37,18 @@
 #include <Arduino.h>
 #include "Sd2Card.h"
 
-uint8_t Sd2Card::init(void) {
+uint8_t Sd2Card::init(uint32_t cspin) {
+	if(cspin != SD_DETECT_NONE) {
+		PinName p = digitalPinToPinName(cspin);
+		if((p == NC) ||\
+		   BSP_SD_CSSet(set_GPIO_Port_Clock(STM_PORT(p)),
+						 STM_GPIO_PIN(p)) != MSD_OK) {
+			return FALSE;
+		}
+	}
 	if (BSP_SD_Init() == MSD_OK) {
 		BSP_SD_GetCardInfo(&_SdCardInfo);
 		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-uint8_t Sd2Card::init(uint32_t cspin) {
-	PinName p = digitalPinToPinName(cspin);
-	if(p != NC) {
-		if (BSP_SD_CSInit(set_GPIO_Port_Clock(STM_PORT(p)), STM_GPIO_PIN(p)) == MSD_OK) {
-			BSP_SD_GetCardInfo(&_SdCardInfo);
-			return TRUE;
-		}
 	}
 	return FALSE;
 }

src/Sd2Card.h

@@ -56,8 +56,7 @@
 class Sd2Card {
  public:
 
-  uint8_t init(void);
-  uint8_t init(uint32_t cspin);
+  uint8_t init(uint32_t cspin = SD_DETECT_NONE);
 
   /** Return the card type: SD V1, SD V2 or SDHC */
   uint8_t type(void) const;

src/bsp_sd.c

@@ -127,7 +127,7 @@ static SD_CardInfo uSdCardInfo;
 
 
 /**
-  * @brief  Initializes the SD card device without CS initialization.
+  * @brief  Initializes the SD card device with CS check if any.
   * @retval SD status
   */
 uint8_t BSP_SD_Init(void)
@@ -146,6 +146,15 @@ uint8_t BSP_SD_Init(void)
   uSdHandle.Init.HardwareFlowControl = SD_HW_FLOW_CTRL;
   uSdHandle.Init.ClockDiv            = SD_CLK_DIV;
 
+  if(SD_detect_gpio_pin != GPIO_PIN_All) {
+    /* Msp SD Detect pin initialization */
+    BSP_SD_Detect_MspInit(&uSdHandle, NULL);
+    if(BSP_SD_IsDetected() != SD_PRESENT)   /* Check if SD card is present */
+    {
+      return MSD_ERROR_SD_NOT_PRESENT;
+    }
+  }
+
   /* Msp SD initialization */
   BSP_SD_MspInit(&uSdHandle, NULL);
 
@@ -176,60 +185,19 @@ uint8_t BSP_SD_Init(void)
 }
 
 /**
-  * @brief  Initializes the SD card device with CS initialization.
+  * @brief  Set the SD card device detect pin and port.
+  * @param  csport one of the gpio port
+  * @param  cspin one of the gpio pin
   * @retval SD status
   */
-uint8_t BSP_SD_CSInit(GPIO_TypeDef *csport, uint32_t cspin)
+uint8_t BSP_SD_CSSet(GPIO_TypeDef *csport, uint32_t cspin)
 {
-  uint8_t sd_state = MSD_OK;
-  SD_detect_gpio_pin = cspin;
-  SD_detect_gpio_port = csport;
-  /* PLLSAI is dedicated to LCD periph. Do not use it to get 48MHz*/
-
-  /* uSD device interface configuration */
-  uSdHandle.Instance = SD_INSTANCE;
-
-  uSdHandle.Init.ClockEdge           = SD_CLK_EDGE;
-  uSdHandle.Init.ClockBypass         = SD_CLK_BYPASS;
-  uSdHandle.Init.ClockPowerSave      = SD_CLK_PWR_SAVE;
-  uSdHandle.Init.BusWide             = SD_BUS_WIDE_1B;
-  uSdHandle.Init.HardwareFlowControl = SD_HW_FLOW_CTRL;
-  uSdHandle.Init.ClockDiv            = SD_CLK_DIV;
-
-  /* Msp SD Detect pin initialization */
-  BSP_SD_Detect_MspInit(&uSdHandle, NULL);
-  if(BSP_SD_IsDetected() != SD_PRESENT)   /* Check if SD card is present */
-  {
-    return MSD_ERROR_SD_NOT_PRESENT;
-  }
-
-  /* Msp SD initialization */
-  BSP_SD_MspInit(&uSdHandle, NULL);
-
-  /* HAL SD initialization */
-#if defined (STM32F4xx) || defined(STM32F7xx) || defined(STM32L4xx)
-  if(HAL_SD_Init(&uSdHandle) != SD_OK)
-#else /* (STM32F1xx) || defined(STM32F2xx) || defined(STM32L1xx) */
-  if(HAL_SD_Init(&uSdHandle, &uSdCardInfo) != SD_OK)
-#endif
-  {
-    sd_state = MSD_ERROR;
+  if(csport != 0) {
+    SD_detect_gpio_pin = cspin;
+    SD_detect_gpio_port = csport;
+	return MSD_OK;
   }
-
-  /* Configure SD Bus width */
-  if(sd_state == MSD_OK)
-  {
-    /* Enable wide operation */
-    if(HAL_SD_WideBusOperation_Config(&uSdHandle, SD_BUS_WIDE_4B) != SD_OK)
-    {
-      sd_state = MSD_ERROR;
-    }
-    else
-    {
-      sd_state = MSD_OK;
-    }
-  }
-  return  sd_state;
+  return MSD_ERROR;
 }
 
 /**

src/bsp_sd.h

@@ -68,10 +68,11 @@
 /* SD Exported Constants */
 #define SD_PRESENT               ((uint8_t)0x01)
 #define SD_NOT_PRESENT           ((uint8_t)0x00)
+#define SD_DETECT_NONE           NUM_DIGITAL_PINS
 
 /* SD Exported Functions */
 uint8_t BSP_SD_Init(void);
-uint8_t BSP_SD_CSInit(GPIO_TypeDef *csport, uint32_t cspin);
+uint8_t BSP_SD_CSSet(GPIO_TypeDef *csport, uint32_t cspin);
 uint8_t BSP_SD_DeInit(void);
 uint8_t BSP_SD_ITConfig(void);