feat: support transceiver for H7, L5 and U5

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

Author: fpistm

README.md

@@ -54,12 +54,12 @@ Some default definitions can be overridden using:
 
 #### SD Transceiver
 
-* `SD_TRANSCEIVER_MODE`: specifies whether external Transceiver is enabled or disabled. Available only on some STM32
-  * `SDMMC_TRANSCEIVER_ENABLE`
-  * `SDMMC_TRANSCEIVER_DISABLE` (default)
+* To specifies whether external Transceiver is present and enabled (Available only on some STM32) add:
 
-* `SD_TRANSCEIVER_EN` pin number to enable the level shifter
-* `SD_TRANSCEIVER_SEL` pin number for voltage selection
+  `#define USE_SD_TRANSCEIVER  1`
+* Then define pins:
+  * `SD_TRANSCEIVER_EN` pin number to enable the level shifter
+  * `SD_TRANSCEIVER_SEL` pin number for voltage selection
 
 #### SD detect and timeout
 * `SD_DETECT_PIN` pin number

src/Sd2Card.cpp

@@ -47,13 +47,15 @@ bool Sd2Card::init(uint32_t detectpin)
       return false;
     }
   }
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
   PinName sd_en = digitalPinToPinName(SD_TRANSCEIVER_EN);
   PinName sd_sel = digitalPinToPinName(SD_TRANSCEIVER_SEL);
-  BSP_SD_TransceiverPin(set_GPIO_Port_Clock(STM_PORT(sd_en)),
-                        STM_LL_GPIO_PIN(sd_en),
-                        set_GPIO_Port_Clock(STM_PORT(sd_sel)),
-                        STM_LL_GPIO_PIN(sd_sel));
+  if (BSP_SD_TransceiverPin(set_GPIO_Port_Clock(STM_PORT(sd_en)),
+                            STM_LL_GPIO_PIN(sd_en),
+                            set_GPIO_Port_Clock(STM_PORT(sd_sel)),
+                            STM_LL_GPIO_PIN(sd_sel)) == MSD_ERROR) {
+    return false;
+  }
 #endif
   if (BSP_SD_Init() == MSD_OK) {
     BSP_SD_GetCardInfo(&_SdCardInfo);

src/bsp_sd.c

@@ -69,9 +69,14 @@
     #define SD_CLK_DIV               SDMMC_NSpeed_CLK_DIV
   #endif
 
-  #ifdef SDMMC_TRANSCEIVER_ENABLE
-    #define SD_TRANSCEIVER_ENABLE    SDMMC_TRANSCEIVER_ENABLE
-    #define SD_TRANSCEIVER_DISABLE   SDMMC_TRANSCEIVER_DISABLE
+  #if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
+    #if defined(SDMMC_TRANSCEIVER_ENABLE)
+      #define SD_TRANSCEIVER_ENABLE    SDMMC_TRANSCEIVER_ENABLE
+      #define SD_TRANSCEIVER_DISABLE   SDMMC_TRANSCEIVER_DISABLE
+    #else
+      #define SD_TRANSCEIVER_ENABLE    SDMMC_TRANSCEIVER_PRESENT
+      #define SD_TRANSCEIVER_DISABLE   SDMMC_TRANSCEIVER_NOT_PRESENT
+    #endif
   #endif
 
 #elif defined(SDIO)
@@ -101,15 +106,11 @@
   #define SD_BUS_WIDE              SD_BUS_WIDE_4B
 #endif
 
-#if defined(SDMMC_TRANSCEIVER_ENABLE) && !defined(SD_TRANSCEIVER_MODE)
-  #define SD_TRANSCEIVER_MODE      SD_TRANSCEIVER_DISABLE
-#endif
-
 /* BSP SD Private Variables */
 static SD_HandleTypeDef uSdHandle;
 static uint32_t SD_detect_ll_gpio_pin = LL_GPIO_PIN_ALL;
 static GPIO_TypeDef *SD_detect_gpio_port = GPIOA;
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
   static uint32_t SD_trans_en_ll_gpio_pin = LL_GPIO_PIN_ALL;
   static GPIO_TypeDef *SD_trans_en_gpio_port = GPIOA;
   static uint32_t SD_trans_sel_ll_gpio_pin = LL_GPIO_PIN_ALL;
@@ -143,12 +144,13 @@ uint8_t BSP_SD_Init(void)
   uSdHandle.Init.BusWide             = SD_BUS_WIDE_1B;
   uSdHandle.Init.HardwareFlowControl = SD_HW_FLOW_CTRL;
   uSdHandle.Init.ClockDiv            = SD_CLK_DIV;
-#ifdef SDMMC_TRANSCEIVER_ENABLE
-  uSdHandle.Init.Transceiver = SD_TRANSCEIVER_MODE;
-  if (SD_TRANSCEIVER_MODE == SD_TRANSCEIVER_ENABLE) {
-
-    BSP_SD_Transceiver_MspInit(&uSdHandle, NULL);
-  }
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
+#if defined(SDMMC_TRANSCEIVER_ENABLE)
+  uSdHandle.Init.Transceiver = SD_TRANSCEIVER_ENABLE;
+#else
+  uSdHandle.Init.TranceiverPresent   = SD_TRANSCEIVER_ENABLE;
+#endif
+  BSP_SD_Transceiver_MspInit(&uSdHandle, NULL);
 #endif
 
   if (SD_detect_ll_gpio_pin != LL_GPIO_PIN_ALL) {
@@ -205,11 +207,13 @@ uint8_t BSP_SD_DeInit(void)
   return  sd_state;
 }
 
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
 /**
-  * @brief  Set the SD card device detect pin and port.
-  * @param  port one of the gpio port
-  * @param  pin one of the gpio pin
+  * @brief  Set the transceiver pin and port.
+  * @param  enport enable gpio port
+  * @param  enpin enable gpio pin
+  * @param  selport select gpio port
+  * @param  selpin select gpio pin
   * @retval SD status
   */
 uint8_t BSP_SD_TransceiverPin(GPIO_TypeDef *enport, uint32_t enpin, GPIO_TypeDef *selport, uint32_t selpin)
@@ -483,7 +487,7 @@ __weak void BSP_SD_MspDeInit(SD_HandleTypeDef *hsd, void *Params)
 #endif
 }
 
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
 /**
   * @brief  Initializes the SD Transceiver pin MSP.
   * @param  hsd: SD handle
@@ -514,15 +518,19 @@ __weak void BSP_SD_Transceiver_MspInit(SD_HandleTypeDef *hsd, void *Params)
   * @param  status: Voltage Switch State
   * @retval None
   */
-void HAL_SDEx_DriveTransceiver_1_8V_Callback(FlagStatus status)
+#if defined(SDMMC_TRANSCEIVER_ENABLE)
+  void HAL_SDEx_DriveTransceiver_1_8V_Callback(FlagStatus status)
+#else
+  void HAL_SD_DriveTransceiver_1_8V_Callback(FlagStatus status)
+#endif
 {
   if (status == SET) {
     LL_GPIO_SetOutputPin(SD_trans_sel_gpio_port, SD_trans_sel_ll_gpio_pin);
   } else {
     LL_GPIO_ResetOutputPin(SD_trans_sel_gpio_port, SD_trans_sel_ll_gpio_pin);
   }
 }
-#endif /* SDMMC_TRANSCEIVER_ENABLE */
+#endif /* USE_SD_TRANSCEIVER && (USE_SD_TRANSCEIVER != 0U) */
 
 #ifndef STM32L1xx
 /**

src/bsp_sd.h

@@ -53,6 +53,11 @@ extern "C" {
 Please update the core or install previous library version."
 #endif
 
+/* For backward compatibility */
+#if defined(SD_TRANSCEIVER_MODE) && !defined(USE_SD_TRANSCEIVER)
+#define USE_SD_TRANSCEIVER        1
+#endif
+
 /*SD Card information structure */
 #ifndef STM32L1xx
 #define HAL_SD_CardInfoTypedef         HAL_SD_CardInfoTypeDef
@@ -72,22 +77,19 @@ Please update the core or install previous library version."
 #define SD_PRESENT               ((uint8_t)0x01)
 #define SD_NOT_PRESENT           ((uint8_t)0x00)
 #define SD_DETECT_NONE           NUM_DIGITAL_PINS
-#ifdef SDMMC_TRANSCEIVER_ENABLE
-#define SD_TRANSCEIVER_NONE      NUM_DIGITAL_PINS
-#endif
 
 /* Could be redefined in variant.h or using build_opt.h */
 #ifndef SD_DATATIMEOUT
 #define SD_DATATIMEOUT         100000000U
 #endif
 
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
 #ifndef SD_TRANSCEIVER_EN
-#define SD_TRANSCEIVER_EN      SD_TRANSCEIVER_NONE
+#define SD_TRANSCEIVER_EN        NUM_DIGITAL_PINS
 #endif
 
 #ifndef SD_TRANSCEIVER_SEL
-#define SD_TRANSCEIVER_SEL     SD_TRANSCEIVER_NONE
+#define SD_TRANSCEIVER_SEL       NUM_DIGITAL_PINS
 #endif
 #endif
 
@@ -98,7 +100,7 @@ Please update the core or install previous library version."
 /* SD Exported Functions */
 uint8_t BSP_SD_Init(void);
 uint8_t BSP_SD_DeInit(void);
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
 uint8_t BSP_SD_TransceiverPin(GPIO_TypeDef *enport, uint32_t enpin, GPIO_TypeDef *selport, uint32_t selpin);
 #endif
 uint8_t BSP_SD_DetectPin(GPIO_TypeDef *port, uint32_t pin);
@@ -124,7 +126,7 @@ uint8_t BSP_SD_IsDetected(void);
 void    BSP_SD_MspInit(SD_HandleTypeDef *hsd, void *Params);
 void    BSP_SD_Detect_MspInit(SD_HandleTypeDef *hsd, void *Params);
 void    BSP_SD_MspDeInit(SD_HandleTypeDef *hsd, void *Params);
-#ifdef SDMMC_TRANSCEIVER_ENABLE
+#if defined(USE_SD_TRANSCEIVER) && (USE_SD_TRANSCEIVER != 0U)
 void    BSP_SD_Transceiver_MspInit(SD_HandleTypeDef *hsd, void *Params);
 #endif