summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/drivers/include/drivers/rtc.h34
-rw-r--r--components/drivers/include/drivers/rtc_core.h45
-rw-r--r--components/drivers/rtc/SConscript2
-rw-r--r--components/drivers/rtc/rtc.c132
-rw-r--r--components/drivers/rtc/rtc_core.c123
5 files changed, 147 insertions, 189 deletions
diff --git a/components/drivers/include/drivers/rtc.h b/components/drivers/include/drivers/rtc.h
index 9eddf801b7..0bafbad7ad 100644
--- a/components/drivers/include/drivers/rtc.h
+++ b/components/drivers/include/drivers/rtc.h
@@ -6,13 +6,43 @@
* Change Logs:
* Date Author Notes
* 2012-10-10 aozima first version.
+ * 2021-06-11 iysheng implement RTC framework V2.0
+ * 2021-07-30 Meco Man move rtc_core.h to rtc.h
*/
#ifndef __RTC_H__
#define __RTC_H__
-#include <rtconfig.h>
-#include <drivers/rtc_core.h>
+#include <rtdef.h>
+
+#define RT_DEVICE_CTRL_RTC_GET_TIME 0x10 /**< get second time */
+#define RT_DEVICE_CTRL_RTC_SET_TIME 0x11 /**< set second time */
+#define RT_DEVICE_CTRL_RTC_GET_TIME_US 0x12 /**< get microsecond time */
+#define RT_DEVICE_CTRL_RTC_SET_TIME_US 0x13 /**< set microsecond time */
+#define RT_DEVICE_CTRL_RTC_GET_ALARM 0x14 /**< get alarm */
+#define RT_DEVICE_CTRL_RTC_SET_ALARM 0x15 /**< set alarm */
+
+struct rt_rtc_ops
+{
+ rt_err_t (*init)(void);
+ rt_err_t (*get_secs)(void *arg);
+ rt_err_t (*set_secs)(void *arg);
+ rt_err_t (*get_alarm)(void *arg);
+ rt_err_t (*set_alarm)(void *arg);
+ rt_err_t (*get_usecs)(void *arg);
+ rt_err_t (*set_usecs)(void *arg);
+};
+
+typedef struct rt_rtc_device
+{
+ struct rt_device parent;
+ const struct rt_rtc_ops *ops;
+} rt_rtc_dev_t;
+
+rt_err_t rt_hw_rtc_register(rt_rtc_dev_t *rtc,
+ const char *name,
+ rt_uint32_t flag,
+ void *data);
rt_err_t set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day);
rt_err_t set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second);
diff --git a/components/drivers/include/drivers/rtc_core.h b/components/drivers/include/drivers/rtc_core.h
deleted file mode 100644
index f0c7b64e94..0000000000
--- a/components/drivers/include/drivers/rtc_core.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date Author Notes
- * 2021-06-11 iysheng first version.
- */
-
-#ifndef __RTC_CORE_H__
-#define __RTC_CORE_H__
-
-#include <rtthread.h>
-
-#define RT_DEVICE_CTRL_RTC_GET_TIME 0x10 /**< get second time */
-#define RT_DEVICE_CTRL_RTC_SET_TIME 0x11 /**< set second time */
-#define RT_DEVICE_CTRL_RTC_GET_TIME_US 0x12 /**< get microsecond time */
-#define RT_DEVICE_CTRL_RTC_SET_TIME_US 0x13 /**< set microsecond time */
-#define RT_DEVICE_CTRL_RTC_GET_ALARM 0x14 /**< get alarm */
-#define RT_DEVICE_CTRL_RTC_SET_ALARM 0x15 /**< set alarm */
-
-struct rt_rtc_ops
-{
- rt_err_t (*init)(void);
- rt_err_t (*get_secs)(void *arg);
- rt_err_t (*set_secs)(void *arg);
- rt_err_t (*get_alarm)(void *arg);
- rt_err_t (*set_alarm)(void *arg);
- rt_err_t (*get_usecs)(void *arg);
- rt_err_t (*set_usecs)(void *arg);
-};
-
-typedef struct rt_rtc_device
-{
- struct rt_device parent;
- const struct rt_rtc_ops *ops;
-} rt_rtc_dev_t;
-
-rt_err_t rt_rtc_dev_register(rt_rtc_dev_t *rtc,
- const char *name,
- rt_uint32_t flag,
- void *data);
-
-#endif /* __RTC_CORE_H__ */
diff --git a/components/drivers/rtc/SConscript b/components/drivers/rtc/SConscript
index c3252fe7f9..6ec8bcb3c5 100644
--- a/components/drivers/rtc/SConscript
+++ b/components/drivers/rtc/SConscript
@@ -7,7 +7,7 @@ CPPPATH = [cwd + '/../include']
group = []
if GetDepend(['RT_USING_RTC']):
- src = src + ['rtc.c', 'rtc_core.c']
+ src = src + ['rtc.c']
if GetDepend(['RT_USING_ALARM']):
src = src + ['alarm.c']
if GetDepend(['RT_USING_SOFT_RTC']):
diff --git a/components/drivers/rtc/rtc.c b/components/drivers/rtc/rtc.c
index 3a843e2e0c..5eabeed2dd 100644
--- a/components/drivers/rtc/rtc.c
+++ b/components/drivers/rtc/rtc.c
@@ -10,6 +10,8 @@
* 2012-04-16 aozima add scheduler lock for set_date and set_time.
* 2018-02-16 armink add auto sync time by NTP
* 2021-05-09 Meco Man remove NTP
+ * 2021-06-11 iysheng implement RTC framework V2.0
+ * 2021-07-30 Meco Man move rtc_core.c to rtc.c
*/
#include <time.h>
@@ -20,7 +22,117 @@
#ifdef RT_USING_RTC
+/*
+ * This function initializes rtc_core
+ */
+static rt_err_t rt_rtc_init(struct rt_device *dev)
+{
+ rt_rtc_dev_t *rtc_core;
+
+ RT_ASSERT(dev != RT_NULL);
+ rtc_core = (rt_rtc_dev_t *)dev;
+ if (rtc_core->ops->init)
+ {
+ return (rtc_core->ops->init());
+ }
+
+ return -RT_ENOSYS;
+}
+
+static rt_err_t rt_rtc_open(struct rt_device *dev, rt_uint16_t oflag)
+{
+ return RT_EOK;
+}
+static rt_err_t rt_rtc_close(struct rt_device *dev)
+{
+ /* Add close member function in rt_rtc_ops when need,
+ * then call that function here.
+ * */
+ return RT_EOK;
+}
+
+static rt_err_t rt_rtc_control(struct rt_device *dev, int cmd, void *args)
+{
+#define TRY_DO_RTC_FUNC(rt_rtc_dev, func_name, args) \
+ rt_rtc_dev->ops->func_name ? rt_rtc_dev->ops->func_name(args) : -RT_EINVAL;
+
+ rt_rtc_dev_t *rtc_device;
+ rt_err_t ret = -RT_EINVAL;
+
+ RT_ASSERT(dev != RT_NULL);
+ rtc_device = (rt_rtc_dev_t *)dev;
+
+ switch (cmd)
+ {
+ case RT_DEVICE_CTRL_RTC_GET_TIME:
+ ret = TRY_DO_RTC_FUNC(rtc_device, get_secs, args);
+ break;
+ case RT_DEVICE_CTRL_RTC_SET_TIME:
+ ret = TRY_DO_RTC_FUNC(rtc_device, set_secs, args);
+ break;
+ case RT_DEVICE_CTRL_RTC_GET_TIME_US:
+ ret = TRY_DO_RTC_FUNC(rtc_device, get_usecs, args);
+ break;
+ case RT_DEVICE_CTRL_RTC_SET_TIME_US:
+ ret = TRY_DO_RTC_FUNC(rtc_device, set_usecs, args);
+ break;
+ case RT_DEVICE_CTRL_RTC_GET_ALARM:
+ ret = TRY_DO_RTC_FUNC(rtc_device, get_alarm, args);
+ break;
+ case RT_DEVICE_CTRL_RTC_SET_ALARM:
+ ret = TRY_DO_RTC_FUNC(rtc_device, set_alarm, args);
+ break;
+ default:
+ break;
+ }
+
+ return ret;
+
+#undef TRY_DO_RTC_FUNC
+}
+
+#ifdef RT_USING_DEVICE_OPS
+const static struct rt_device_ops rtc_core_ops =
+{
+ rt_rtc_init,
+ rt_rtc_open,
+ rt_rtc_close,
+ RT_NULL,
+ RT_NULL,
+ rt_rtc_control,
+};
+#endif /* RT_USING_DEVICE_OPS */
+
+rt_err_t rt_hw_rtc_register(rt_rtc_dev_t *rtc,
+ const char *name,
+ rt_uint32_t flag,
+ void *data)
+{
+ struct rt_device *device;
+ RT_ASSERT(rtc != RT_NULL);
+
+ device = &(rtc->parent);
+
+ device->type = RT_Device_Class_RTC;
+ device->rx_indicate = RT_NULL;
+ device->tx_complete = RT_NULL;
+
+#ifdef RT_USING_DEVICE_OPS
+ device->ops = &rtc_core_ops;
+#else
+ device->init = rt_rtc_init;
+ device->open = rt_rtc_open;
+ device->close = rt_rtc_close;
+ device->read = RT_NULL;
+ device->write = RT_NULL;
+ device->control = rt_rtc_control;
+#endif /* RT_USING_DEVICE_OPS */
+ device->user_data = data;
+
+ /* register a character device */
+ return rt_device_register(device, name, flag);
+}
/**
* Set system date(time not modify, local timezone).
@@ -30,12 +142,10 @@
* @param rt_uint32_t day e.g: 31.
*
* @return rt_err_t if set success, return RT_EOK.
- *
*/
rt_err_t set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day)
{
time_t now;
- struct tm *p_tm;
struct tm tm_new;
rt_device_t device;
rt_err_t ret = -RT_ERROR;
@@ -43,14 +153,8 @@ rt_err_t set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day)
/* get current time */
now = time(RT_NULL);
- /* lock scheduler. */
- rt_enter_critical();
/* converts calendar time into local time. */
- p_tm = localtime(&now);
- /* copy the statically located variable */
- rt_memcpy(&tm_new, p_tm, sizeof(struct tm));
- /* unlock scheduler. */
- rt_exit_critical();
+ localtime_r(&now, &tm_new);
/* update date. */
tm_new.tm_year = year - 1900;
@@ -80,12 +184,10 @@ rt_err_t set_date(rt_uint32_t year, rt_uint32_t month, rt_uint32_t day)
* @param rt_uint32_t second e.g: 0~59.
*
* @return rt_err_t if set success, return RT_EOK.
- *
*/
rt_err_t set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second)
{
time_t now;
- struct tm *p_tm;
struct tm tm_new;
rt_device_t device;
rt_err_t ret = -RT_ERROR;
@@ -93,14 +195,8 @@ rt_err_t set_time(rt_uint32_t hour, rt_uint32_t minute, rt_uint32_t second)
/* get current time */
now = time(RT_NULL);
- /* lock scheduler. */
- rt_enter_critical();
/* converts calendar time into local time. */
- p_tm = localtime(&now);
- /* copy the statically located variable */
- rt_memcpy(&tm_new, p_tm, sizeof(struct tm));
- /* unlock scheduler. */
- rt_exit_critical();
+ localtime_r(&now, &tm_new);
/* update time. */
tm_new.tm_hour = hour;
diff --git a/components/drivers/rtc/rtc_core.c b/components/drivers/rtc/rtc_core.c
deleted file mode 100644
index 80bb61c8aa..0000000000
--- a/components/drivers/rtc/rtc_core.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * COPYRIGHT (C) 2011-2021, Real-Thread Information Technology Ltd
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date Author Notes
- * 2021-06-11 iysheng first version.
- */
-
-#include <drivers/rtc_core.h>
-
-#define TRY_DO_RTC_FUNC(rt_rtc_dev, func_name, args) \
- rt_rtc_dev->ops->func_name ? rt_rtc_dev->ops->func_name(args) : -RT_EINVAL;
-
-/*
- * This function initializes rtc_core
- */
-static rt_err_t rt_rtc_core_init(struct rt_device *dev)
-{
- rt_rtc_dev_t *rtc_core;
-
- RT_ASSERT(dev != RT_NULL);
- rtc_core = (rt_rtc_dev_t *)dev;
- if (rtc_core->ops->init)
- {
- return (rtc_core->ops->init());
- }
-
- return (-RT_ENOSYS);
-}
-
-static rt_err_t rt_rtc_core_open(struct rt_device *dev, rt_uint16_t oflag)
-{
- return (RT_EOK);
-}
-
-static rt_err_t rt_rtc_core_close(struct rt_device *dev)
-{
- /* Add close member function in rt_rtc_ops when need,
- * then call that function here.
- * */
- return (RT_EOK);
-}
-
-static rt_err_t rt_rtc_core_control(struct rt_device *dev,
- int cmd,
- void *args)
-{
- rt_rtc_dev_t *rtc_core;
- rt_err_t ret = -RT_EINVAL;
-
- RT_ASSERT(dev != RT_NULL);
- rtc_core = (rt_rtc_dev_t *)dev;
-
- switch (cmd)
- {
- case RT_DEVICE_CTRL_RTC_GET_TIME:
- ret = TRY_DO_RTC_FUNC(rtc_core, get_secs, args);
- break;
- case RT_DEVICE_CTRL_RTC_SET_TIME:
- ret = TRY_DO_RTC_FUNC(rtc_core, set_secs, args);
- break;
- case RT_DEVICE_CTRL_RTC_GET_TIME_US:
- ret = TRY_DO_RTC_FUNC(rtc_core, get_usecs, args);
- break;
- case RT_DEVICE_CTRL_RTC_SET_TIME_US:
- ret = TRY_DO_RTC_FUNC(rtc_core, set_usecs, args);
- break;
- case RT_DEVICE_CTRL_RTC_GET_ALARM:
- ret = TRY_DO_RTC_FUNC(rtc_core, get_alarm, args);
- break;
- case RT_DEVICE_CTRL_RTC_SET_ALARM:
- ret = TRY_DO_RTC_FUNC(rtc_core, set_alarm, args);
- break;
- default:
- break;
- }
-
- return ret;
-}
-#ifdef RT_USING_DEVICE_OPS
-const static struct rt_device_ops rtc_core_ops =
-{
- rt_rtc_core_init,
- rt_rtc_core_open,
- rt_rtc_core_close,
- RT_NULL,
- RT_NULL,
- rt_rtc_core_control,
-};
-#endif
-
-rt_err_t rt_rtc_dev_register(rt_rtc_dev_t *rtc,
- const char *name,
- rt_uint32_t flag,
- void *data)
-{
- struct rt_device *device;
- RT_ASSERT(rtc != RT_NULL);
-
- device = &(rtc->parent);
-
- device->type = RT_Device_Class_RTC;
- device->rx_indicate = RT_NULL;
- device->tx_complete = RT_NULL;
-
-#ifdef RT_USING_DEVICE_OPS
- device->ops = &rtc_core_ops;
-#else
- device->init = rt_rtc_core_init;
- device->open = rt_rtc_core_open;
- device->close = rt_rtc_core_close;
- device->read = RT_NULL;
- device->write = RT_NULL;
- device->control = rt_rtc_core_control;
-#endif
- device->user_data = data;
-
- /* register a character device */
- return rt_device_register(device, name, flag);
-}
-
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-30 14:33:19 +0000