From 787e46c6a3591d133e051f509b7a262a0eee034a Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Tue, 4 May 2021 13:06:24 +0800
Subject: [rtc]调整rtc驱动框架函数位置，功能无影响，为后续新的RTC框架铺路
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/include/drivers/rtc.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'components/drivers/include')

diff --git a/components/drivers/include/drivers/rtc.h b/components/drivers/include/drivers/rtc.h
index 4845937113..6eda9cbf53 100644
--- a/components/drivers/include/drivers/rtc.h
+++ b/components/drivers/include/drivers/rtc.h
@@ -11,10 +11,14 @@
 #ifndef __RTC_H__
 #define __RTC_H__
 
+#include <rtconfig.h>
+
 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);
 
+#ifdef RTC_SYNC_USING_NTP
 int rt_soft_rtc_init(void);
 int rt_rtc_ntp_sync_init(void);
+#endif /* RTC_SYNC_USING_NTP */
 
 #endif /* __RTC_H__ */
-- 
cgit v1.3.1


From f982d813892971a7e9ba75ace7061805cd8f2458 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Thu, 6 May 2021 23:43:44 +0800
Subject: [rtc driver]remove NTP

---
 components/drivers/include/drivers/rtc.h |  5 ----
 components/drivers/rtc/rtc.c             | 51 --------------------------------
 2 files changed, 56 deletions(-)

(limited to 'components/drivers/include')

diff --git a/components/drivers/include/drivers/rtc.h b/components/drivers/include/drivers/rtc.h
index 6eda9cbf53..a9e1c17a9d 100644
--- a/components/drivers/include/drivers/rtc.h
+++ b/components/drivers/include/drivers/rtc.h
@@ -16,9 +16,4 @@
 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);
 
-#ifdef RTC_SYNC_USING_NTP
-int rt_soft_rtc_init(void);
-int rt_rtc_ntp_sync_init(void);
-#endif /* RTC_SYNC_USING_NTP */
-
 #endif /* __RTC_H__ */
diff --git a/components/drivers/rtc/rtc.c b/components/drivers/rtc/rtc.c
index 2c184bad21..f15b8a7754 100644
--- a/components/drivers/rtc/rtc.c
+++ b/components/drivers/rtc/rtc.c
@@ -196,55 +196,4 @@ MSH_CMD_EXPORT(list_date, show date and time (local timezone))
 MSH_CMD_EXPORT(date, get date and time or set (local timezone) [year month day hour min sec])
 #endif /* FINSH_USING_MSH */
 
-/* Using NTP auto sync RTC time */
-#ifdef RTC_SYNC_USING_NTP
-/* NTP first sync delay time for network connect, unit: second */
-#ifndef RTC_NTP_FIRST_SYNC_DELAY
-#define RTC_NTP_FIRST_SYNC_DELAY                 (30)
-#endif
-/* NTP sync period, unit: second */
-#ifndef RTC_NTP_SYNC_PERIOD
-#define RTC_NTP_SYNC_PERIOD                      (1L*60L*60L)
-#endif
-
-static void ntp_sync_thread_enrty(void *param)
-{
-    extern time_t ntp_sync_to_rtc(const char *host_name);
-    /* first sync delay for network connect */
-    rt_thread_delay(RTC_NTP_FIRST_SYNC_DELAY * RT_TICK_PER_SECOND);
-
-    while (1)
-    {
-        ntp_sync_to_rtc(NULL);
-        rt_thread_delay(RTC_NTP_SYNC_PERIOD * RT_TICK_PER_SECOND);
-    }
-}
-
-int rt_rtc_ntp_sync_init(void)
-{
-    static rt_bool_t init_ok = RT_FALSE;
-    rt_thread_t thread;
-
-    if (init_ok)
-    {
-        return 0;
-    }
-
-    thread = rt_thread_create("ntp_sync", ntp_sync_thread_enrty, RT_NULL, 1536, 26, 2);
-    if (thread)
-    {
-        rt_thread_startup(thread);
-    }
-    else
-    {
-        return -RT_ENOMEM;
-    }
-
-    init_ok = RT_TRUE;
-
-    return RT_EOK;
-}
-INIT_COMPONENT_EXPORT(rt_rtc_ntp_sync_init);
-#endif /* RTC_SYNC_USING_NTP */
-
 #endif /* RT_USING_RTC */
-- 
cgit v1.3.1