@@ -160,12 +160,12 @@ uint8_t BSP_SD_GetInstance(void)
160160 SD_PinNames .pin_d3 = PinMap_SD_DATA3 [0 ].pin ;
161161 SD_PinNames .pin_cmd = PinMap_SD_CMD [0 ].pin ;
162162 SD_PinNames .pin_ck = PinMap_SD_CK [0 ].pin ;
163- #if defined(SDMMC1 ) && defined(SDMMC2 )
163+ #if defined(SDMMC1 ) || defined(SDMMC2 )
164164 SD_PinNames .pin_ckin = PinMap_SD_CKIN [0 ].pin ;
165165 SD_PinNames .pin_cdir = PinMap_SD_CDIR [0 ].pin ;
166166 SD_PinNames .pin_d0dir = PinMap_SD_D0DIR [0 ].pin ;
167167 SD_PinNames .pin_d123dir = PinMap_SD_D123DIR [0 ].pin ;
168- #endif /* SDMMC1 && SDMMC2 */
168+ #endif /* SDMMC1 || SDMMC2 */
169169 }
170170 /* Get SD instance from pins */
171171 sd_d0 = pinmap_peripheral (SD_PinNames .pin_d0 , PinMap_SD_DATA0 );
@@ -192,7 +192,7 @@ uint8_t BSP_SD_GetInstance(void)
192192 return MSD_ERROR ;
193193 }
194194 uSdHandle .Instance = sd_base ;
195- #if defined(SDMMC1 ) && defined(SDMMC2 )
195+ #if defined(SDMMC1 ) || defined(SDMMC2 )
196196 if (SD_PinNames .pin_ckin != NC ) {
197197 SD_TypeDef * sd_ckin = pinmap_peripheral (SD_PinNames .pin_ckin , PinMap_SD_CKIN );
198198 SD_TypeDef * sd_cdir = pinmap_peripheral (SD_PinNames .pin_cdir , PinMap_SD_CDIR );
@@ -508,7 +508,7 @@ __weak void BSP_SD_MspInit(SD_HandleTypeDef *hsd, void *Params)
508508 pinmap_pinout (SD_PinNames .pin_d3 , PinMap_SD_DATA3 );
509509 pinmap_pinout (SD_PinNames .pin_cmd , PinMap_SD_CMD );
510510 pinmap_pinout (SD_PinNames .pin_ck , PinMap_SD_CK );
511- #if defined(SDMMC1 ) && defined(SDMMC2 )
511+ #if defined(SDMMC1 ) || defined(SDMMC2 )
512512 if (SD_PinNames .pin_ckin != NC ) {
513513 pinmap_pinout (SD_PinNames .pin_ckin , PinMap_SD_CKIN );
514514 pinmap_pinout (SD_PinNames .pin_cdir , PinMap_SD_CDIR );
@@ -573,7 +573,7 @@ __weak void BSP_SD_MspDeInit(SD_HandleTypeDef *hsd, void *Params)
573573 HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_d3 ), STM_GPIO_PIN (SD_PinNames .pin_d3 ));
574574 HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_cmd ), STM_GPIO_PIN (SD_PinNames .pin_cmd ));
575575 HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_ck ), STM_GPIO_PIN (SD_PinNames .pin_ck ));
576- #if defined(SDMMC1 ) && defined(SDMMC2 )
576+ #if defined(SDMMC1 ) || defined(SDMMC2 )
577577 if (SD_PinNames .pin_ckin != NC ) {
578578 HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_ckin ), STM_GPIO_PIN (SD_PinNames .pin_ckin ));
579579 HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_cdir ), STM_GPIO_PIN (SD_PinNames .pin_cdir ));
0 commit comments