Browse Source

[bsp/at32] remove #ifndef (#7168)

sheltonyu 2 years ago
parent
commit
3bee170d52

+ 1 - 0
bsp/at32/libraries/rt_drivers/drv_qspi.c

@@ -8,6 +8,7 @@
  * 2022-05-16     shelton      first version
  * 2022-05-16     shelton      first version
  */
  */
 
 
+#include <rtdevice.h>
 #include "drv_common.h"
 #include "drv_common.h"
 #include "drv_qspi.h"
 #include "drv_qspi.h"
 
 

+ 4 - 6
bsp/at32/libraries/rt_drivers/drv_qspi.h

@@ -17,23 +17,21 @@
 extern "C" {
 extern "C" {
 #endif
 #endif
 
 
-#ifdef BSP_USING_QSPI
-#ifndef QSPI1_BUS_CONFIG
+#ifdef BSP_USING_QSPI1
 #define QSPI1_BUS_CONFIG                                       \
 #define QSPI1_BUS_CONFIG                                       \
     {                                                          \
     {                                                          \
         .qspi_x                 = QSPI1,                       \
         .qspi_x                 = QSPI1,                       \
         .bus_name               = "qspi1",                     \
         .bus_name               = "qspi1",                     \
     }
     }
-#endif /* QSPI1_BUS_CONFIG */
+#endif /* BSP_USING_QSPI1 */
 
 
-#ifndef QSPI2_BUS_CONFIG
+#ifdef BSP_USING_QSPI2
 #define QSPI2_BUS_CONFIG                                       \
 #define QSPI2_BUS_CONFIG                                       \
     {                                                          \
     {                                                          \
         .qspi_x                 = QSPI2,                       \
         .qspi_x                 = QSPI2,                       \
         .bus_name               = "qspi2",                     \
         .bus_name               = "qspi2",                     \
     }
     }
-#endif /* QSPI2_BUS_CONFIG */
-#endif /* BSP_USING_QSPI */
+#endif /* BSP_USING_QSPI2 */
 
 
 rt_err_t at32_qspi_bus_attach_device(const char *bus_name, const char *device_name, rt_uint32_t pin, rt_uint8_t data_line_width,  void (*enter_qspi_mode)(),  void (*exit_qspi_mode)());
 rt_err_t at32_qspi_bus_attach_device(const char *bus_name, const char *device_name, rt_uint32_t pin, rt_uint8_t data_line_width,  void (*enter_qspi_mode)(),  void (*exit_qspi_mode)());