RT-Thread/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-10-21 07:11:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[drivers][rtc] Fixed software and hardware rtc device naming as rtc

Browse Source
This commit is contained in:
kurisaw
2024-12-13 13:24:48 +08:00
committed by Meco Man
parent 1c54ff4de6
commit 23256d35bc
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/drivers/rtc/dev_alarm.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2006-2023, RT-Thread Development Team * Copyright (c) 2006-2024 RT-Thread Development Team
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
@@ -52,11 +52,7 @@ static rt_err_t alarm_set(struct rt_alarm *alarm)
struct rt_rtc_wkalarm wkalarm; struct rt_rtc_wkalarm wkalarm;
rt_err_t ret; rt_err_t ret;
#ifdef RT_USING_SOFT_RTC
device = rt_device_find("sw_rtc");
#else
device = rt_device_find("rtc"); device = rt_device_find("rtc");
#endif
if (device == RT_NULL) if (device == RT_NULL)
{ {

13
components/drivers/rtc/dev_soft_rtc.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2006-2023, RT-Thread Development Team * Copyright (c) 2006-2024 RT-Thread Development Team
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
@@ -226,8 +226,11 @@ static int rt_soft_rtc_init(void)
{ {
return 0; return 0;
} }
/* make sure only one 'sw_rtc' device */ /* make sure only one 'rtc' device */
RT_ASSERT(!rt_device_find("sw_rtc")); #if defined(RT_USING_SOFT_RTC) && defined(RT_USING_RTC)
#warning "Please note: Currently only one RTC device is allowed in the system, and the name is "rtc"."
#endif
RT_ASSERT(!rt_device_find("rtc"));
#ifdef RT_USING_ALARM #ifdef RT_USING_ALARM
rt_timer_init(&alarm_time, rt_timer_init(&alarm_time,
@@ -258,7 +261,7 @@ static int rt_soft_rtc_init(void)
/* no private */ /* no private */
soft_rtc_dev.user_data = RT_NULL; soft_rtc_dev.user_data = RT_NULL;
rt_device_register(&soft_rtc_dev, "sw_rtc", RT_DEVICE_FLAG_RDWR); rt_device_register(&soft_rtc_dev, "rtc", RT_DEVICE_FLAG_RDWR);
source_device = &soft_rtc_dev; source_device = &soft_rtc_dev;
@@ -294,7 +297,7 @@ static void rtc_sync_work_func(struct rt_work *work, void *work_data)
rt_err_t rt_soft_rtc_set_source(const char *name) rt_err_t rt_soft_rtc_set_source(const char *name)
{ {
RT_ASSERT(name != RT_NULL); RT_ASSERT(name != RT_NULL);
RT_ASSERT(rt_device_find(name)); // make sure source is exist RT_ASSERT(rt_device_find(name)); /* make sure source is exist*/
source_device = rt_device_find(name); source_device = rt_device_find(name);
rt_work_init(&rtc_sync_work, rtc_sync_work_func, RT_NULL); rt_work_init(&rtc_sync_work, rtc_sync_work_func, RT_NULL);