Merge pull request #2833 from yangjie11/fix_dev1

[bsp][es32f0 334/654] 修改会在AC6下编译报错的函数
This commit is contained in:
Bernard Xiong 2019-07-05 17:00:22 +08:00 committed by GitHub
commit b70791d9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@
#ifdef RT_USING_RTC #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_HOUR_FORMAT(init->hour_format));
assert_param(IS_RTC_OUTPUT_SEL(init->output)); 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.asynch_pre_div = 0;
rtc_initstruct.synch_pre_div = 32767; rtc_initstruct.synch_pre_div = 32767;
rtc_initstruct.output = RTC_OUTPUT_DISABLE; rtc_initstruct.output = RTC_OUTPUT_DISABLE;
rtc_init(&rtc_initstruct); __rtc_init(&rtc_initstruct);
rtc_dev.type = RT_Device_Class_RTC; rtc_dev.type = RT_Device_Class_RTC;
rtc_dev.rx_indicate = RT_NULL; rtc_dev.rx_indicate = RT_NULL;

View File

@ -15,7 +15,7 @@
#include "drv_spi.h" #include "drv_spi.h"
#if defined(BSP_USING_SPI_FLASH) #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"); es32f0_spi_device_attach(50, "spi0", "spi00");

View File

@ -19,7 +19,7 @@
#ifdef RT_USING_RTC #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_HOUR_FORMAT(init->hour_format));
assert_param(IS_RTC_OUTPUT_SEL(init->output)); 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.asynch_pre_div = 0;
rtc_initstruct.synch_pre_div = 32767; rtc_initstruct.synch_pre_div = 32767;
rtc_initstruct.output = RTC_OUTPUT_DISABLE; rtc_initstruct.output = RTC_OUTPUT_DISABLE;
rtc_init(&rtc_initstruct); __rtc_init(&rtc_initstruct);
rtc_dev.type = RT_Device_Class_RTC; rtc_dev.type = RT_Device_Class_RTC;
rtc_dev.rx_indicate = RT_NULL; rtc_dev.rx_indicate = RT_NULL;

View File

@ -15,7 +15,7 @@
#include "drv_spi.h" #include "drv_spi.h"
#if defined(BSP_USING_SPI_FLASH) #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"); es32f0_spi_device_attach(50, "spi0", "spi00");