X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/b26d3165c52589d1f8de37bf0df27ad96f460f47..1fe5f5eb5378a47bf0f3451762743c162e40faad:/lunaix-os/kernel/time/clock.c

diff --git a/lunaix-os/kernel/time/clock.c b/lunaix-os/kernel/time/clock.c
index e91be19..726e333 100644
--- a/lunaix-os/kernel/time/clock.c
+++ b/lunaix-os/kernel/time/clock.c
@@ -1,21 +1,16 @@
-#include <hal/rtc.h>
+#include <hal/hwrtc.h>
+#include <hal/hwtimer.h>
 #include <lunaix/clock.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/spike.h>
-#include <lunaix/timer.h>
 
 #include <klibc/string.h>
 
-static volatile time_t sys_time;
-
-void
-clock_systime_counter(void* arg);
-
 void
 __clock_read_systime(struct twimap* map)
 {
-    time_t save = sys_time;
-    twimap_printf(map, "%u", save);
+    ticks_t sys_time = clock_systime();
+    twimap_printf(map, "%u", sys_time);
 }
 
 void
@@ -36,9 +31,7 @@ __clock_read_datetime(struct twimap* map)
 void
 __clock_read_unix(struct twimap* map)
 {
-    datetime_t dt;
-    clock_walltime(&dt);
-    twimap_printf(map, "%u", clock_tounixtime(&dt));
+    twimap_printf(map, "%u", clock_unixtime());
 }
 
 void
@@ -56,83 +49,31 @@ clock_build_mapping()
     map = twifs_mapping(root, NULL, "datetime");
     map->read = __clock_read_datetime;
 }
+EXPORT_TWIFS_PLUGIN(sys_clock, clock_build_mapping);
 
 void
 clock_init()
 {
-    if (!timer_context()) {
-        panick("Systimer not initialized");
-    }
-
-    // 系统计时器每毫秒累加。
-    timer_run_ms(1, clock_systime_counter, NULL, TIMER_MODE_PERIODIC);
-
-    clock_build_mapping();
-}
-
-void
-clock_systime_counter(void* arg)
-{
-    sys_time++;
-}
-
-int
-clock_datatime_eq(datetime_t* a, datetime_t* b)
-{
-    return a->year == b->year && a->month == b->month && a->day == b->day &&
-           a->weekday == b->weekday && a->minute == b->minute &&
-           a->second == b->second;
-}
-
-void
-clock_walltime(datetime_t* datetime)
-{
-    datetime_t current;
-
-    do {
-        while (rtc_read_reg(RTC_REG_A) & 0x80)
-            ;
-        memcpy(&current, datetime, sizeof(datetime_t));
-
-        datetime->year = rtc_read_reg(RTC_REG_YRS);
-        datetime->month = rtc_read_reg(RTC_REG_MTH);
-        datetime->day = rtc_read_reg(RTC_REG_DAY);
-        datetime->weekday = rtc_read_reg(RTC_REG_WDY);
-        datetime->hour = rtc_read_reg(RTC_REG_HRS);
-        datetime->minute = rtc_read_reg(RTC_REG_MIN);
-        datetime->second = rtc_read_reg(RTC_REG_SEC);
-    } while (!clock_datatime_eq(datetime, &current));
-
-    u8_t regbv = rtc_read_reg(RTC_REG_B);
-
-    // Convert from bcd to binary when needed
-    if (!RTC_BIN_ENCODED(regbv)) {
-        datetime->year = bcd2dec(datetime->year);
-        datetime->month = bcd2dec(datetime->month);
-        datetime->day = bcd2dec(datetime->day);
-        datetime->hour = bcd2dec(datetime->hour);
-        datetime->minute = bcd2dec(datetime->minute);
-        datetime->second = bcd2dec(datetime->second);
-    }
-
-    // To 24 hour format
-    if (!RTC_24HRS_ENCODED(regbv) && (datetime->hour >> 7)) {
-        datetime->hour = 12 + (datetime->hour & 0x80);
-    }
-
-    datetime->year += RTC_CURRENT_CENTRY * 100;
+    hwrtc_init();
 }
 
 time_t
 clock_unixtime()
 {
     datetime_t dt;
-    clock_walltime(&dt);
-    return clock_tounixtime(&dt);
+    hwrtc_walltime(&dt);
+    return datetime_tounix(&dt);
 }
 
 time_t
 clock_systime()
 {
-    return sys_time;
+    ticks_t t = hwtimer_current_systicks();
+    return t / hwtimer_base_frequency();
+}
+
+void
+clock_walltime(datetime_t* datetime)
+{
+    current_rtc->get_walltime(current_rtc, datetime);
 }
\ No newline at end of file