Merge pull request #2833 from yangjie11/fix_dev1

[bsp][es32f0 334/654] 修改会在AC6下编译报错的函数
RT-Thread · Jul 5, 2019 · b70791d · b70791d
2 parents ba9dbed + 5a6204d
commit b70791d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bsp/es32f0334/drivers/drv_rtc.c b/bsp/es32f0334/drivers/drv_rtc.c
@@ -19,7 +19,7 @@
 
 #ifdef RT_USING_RTC
 
-static void rtc_init(rtc_init_t *init)
+static void __rtc_init(rtc_init_t *init)
 {
     assert_param(IS_RTC_HOUR_FORMAT(init->hour_format));
     assert_param(IS_RTC_OUTPUT_SEL(init->output));
@@ -129,7 +129,7 @@ int rt_hw_rtc_init(void)
     rtc_initstruct.asynch_pre_div = 0;
     rtc_initstruct.synch_pre_div = 32767;
     rtc_initstruct.output = RTC_OUTPUT_DISABLE;
-    rtc_init(&rtc_initstruct);
+    __rtc_init(&rtc_initstruct);
 
     rtc_dev.type = RT_Device_Class_RTC;
     rtc_dev.rx_indicate = RT_NULL;

diff --git a/bsp/es32f0334/drivers/drv_spiflash.c b/bsp/es32f0334/drivers/drv_spiflash.c
@@ -15,7 +15,7 @@
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
-static int rt_hw_spi_flash_init(void)
+int rt_hw_spi_flash_init(void)
 {
     es32f0_spi_device_attach(50, "spi0", "spi00");
 

diff --git a/bsp/es32f0654/drivers/drv_rtc.c b/bsp/es32f0654/drivers/drv_rtc.c
@@ -19,7 +19,7 @@
 
 #ifdef RT_USING_RTC
 
-static void rtc_init(rtc_init_t *init)
+static void __rtc_init(rtc_init_t *init)
 {
     assert_param(IS_RTC_HOUR_FORMAT(init->hour_format));
     assert_param(IS_RTC_OUTPUT_SEL(init->output));
@@ -129,7 +129,7 @@ int rt_hw_rtc_init(void)
     rtc_initstruct.asynch_pre_div = 0;
     rtc_initstruct.synch_pre_div = 32767;
     rtc_initstruct.output = RTC_OUTPUT_DISABLE;
-    rtc_init(&rtc_initstruct);
+    __rtc_init(&rtc_initstruct);
 
     rtc_dev.type = RT_Device_Class_RTC;
     rtc_dev.rx_indicate = RT_NULL;

diff --git a/bsp/es32f0654/drivers/drv_spiflash.c b/bsp/es32f0654/drivers/drv_spiflash.c
@@ -15,7 +15,7 @@
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
-static int rt_hw_spi_flash_init(void)
+int rt_hw_spi_flash_init(void)
 {
     es32f0_spi_device_attach(50, "spi0", "spi00");