Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Dec 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions components/drivers/rtc/dev_alarm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -52,11 +52,7 @@ static rt_err_t alarm_set(struct rt_alarm *alarm)
struct rt_rtc_wkalarm wkalarm;
rt_err_t ret;

#ifdef RT_USING_SOFT_RTC
device = rt_device_find("sw_rtc");
#else
device = rt_device_find("rtc");
#endif

if (device == RT_NULL)
{
Expand Down
13 changes: 8 additions & 5 deletions components/drivers/rtc/dev_soft_rtc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -226,8 +226,11 @@ static int rt_soft_rtc_init(void)
{
return 0;
}
/* make sure only one 'sw_rtc' device */
RT_ASSERT(!rt_device_find("sw_rtc"));
/* make sure only one 'rtc' device */
#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
rt_timer_init(&alarm_time,
Expand Down Expand Up @@ -258,7 +261,7 @@ static int rt_soft_rtc_init(void)
/* no private */
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;

Expand Down Expand Up @@ -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_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);
rt_work_init(&rtc_sync_work, rtc_sync_work_func, RT_NULL);
Expand Down
Loading