@@ -160,12 +160,12 @@ uint8_t BSP_SD_GetInstance(void)
160
160
SD_PinNames .pin_d3 = PinMap_SD_DATA3 [0 ].pin ;
161
161
SD_PinNames .pin_cmd = PinMap_SD_CMD [0 ].pin ;
162
162
SD_PinNames .pin_ck = PinMap_SD_CK [0 ].pin ;
163
- #if defined(SDMMC1 ) && defined(SDMMC2 )
163
+ #if defined(SDMMC1 ) || defined(SDMMC2 )
164
164
SD_PinNames .pin_ckin = PinMap_SD_CKIN [0 ].pin ;
165
165
SD_PinNames .pin_cdir = PinMap_SD_CDIR [0 ].pin ;
166
166
SD_PinNames .pin_d0dir = PinMap_SD_D0DIR [0 ].pin ;
167
167
SD_PinNames .pin_d123dir = PinMap_SD_D123DIR [0 ].pin ;
168
- #endif /* SDMMC1 && SDMMC2 */
168
+ #endif /* SDMMC1 || SDMMC2 */
169
169
}
170
170
/* Get SD instance from pins */
171
171
sd_d0 = pinmap_peripheral (SD_PinNames .pin_d0 , PinMap_SD_DATA0 );
@@ -192,7 +192,7 @@ uint8_t BSP_SD_GetInstance(void)
192
192
return MSD_ERROR ;
193
193
}
194
194
uSdHandle .Instance = sd_base ;
195
- #if defined(SDMMC1 ) && defined(SDMMC2 )
195
+ #if defined(SDMMC1 ) || defined(SDMMC2 )
196
196
if (SD_PinNames .pin_ckin != NC ) {
197
197
SD_TypeDef * sd_ckin = pinmap_peripheral (SD_PinNames .pin_ckin , PinMap_SD_CKIN );
198
198
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)
508
508
pinmap_pinout (SD_PinNames .pin_d3 , PinMap_SD_DATA3 );
509
509
pinmap_pinout (SD_PinNames .pin_cmd , PinMap_SD_CMD );
510
510
pinmap_pinout (SD_PinNames .pin_ck , PinMap_SD_CK );
511
- #if defined(SDMMC1 ) && defined(SDMMC2 )
511
+ #if defined(SDMMC1 ) || defined(SDMMC2 )
512
512
if (SD_PinNames .pin_ckin != NC ) {
513
513
pinmap_pinout (SD_PinNames .pin_ckin , PinMap_SD_CKIN );
514
514
pinmap_pinout (SD_PinNames .pin_cdir , PinMap_SD_CDIR );
@@ -573,7 +573,7 @@ __weak void BSP_SD_MspDeInit(SD_HandleTypeDef *hsd, void *Params)
573
573
HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_d3 ), STM_GPIO_PIN (SD_PinNames .pin_d3 ));
574
574
HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_cmd ), STM_GPIO_PIN (SD_PinNames .pin_cmd ));
575
575
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 )
577
577
if (SD_PinNames .pin_ckin != NC ) {
578
578
HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_ckin ), STM_GPIO_PIN (SD_PinNames .pin_ckin ));
579
579
HAL_GPIO_DeInit ((GPIO_TypeDef * )STM_PORT (SD_PinNames .pin_cdir ), STM_GPIO_PIN (SD_PinNames .pin_cdir ));
0 commit comments