X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/45e1f8b055043e54be35462852ab6649d634da7c..refs/heads/nov/multiuser:/lunaix-os/kernel/time/clock.c

diff --git a/lunaix-os/kernel/time/clock.c b/lunaix-os/kernel/time/clock.c
index e91be19..93354bb 100644
--- a/lunaix-os/kernel/time/clock.c
+++ b/lunaix-os/kernel/time/clock.c
@@ -1,138 +1,75 @@
-#include <hal/rtc.h>
 #include <lunaix/clock.h>
+#include <lunaix/device.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)
+static void
+__twimap_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
-__clock_read_datetime(struct twimap* map)
+static void
+__twimap_read_datetime(struct twimap* map)
 {
     datetime_t dt;
     clock_walltime(&dt);
     twimap_printf(map,
                   "%.4d-%.2d-%.2d %.2d:%.2d:%.2d",
-                  dt.year,
-                  dt.month,
-                  dt.day,
-                  dt.hour,
-                  dt.minute,
-                  dt.second);
+                  dt.year, dt.month, dt.day,
+                  dt.hour, dt.minute, dt.second);
 }
 
-void
-__clock_read_unix(struct twimap* map)
+static void
+__twimap_read_unixtime(struct twimap* map)
 {
-    datetime_t dt;
-    clock_walltime(&dt);
-    twimap_printf(map, "%u", clock_tounixtime(&dt));
+    twimap_printf(map, "%u", clock_unixtime());
 }
 
-void
-clock_build_mapping()
+time_t
+clock_unixtime()
 {
-    struct twifs_node* root = twifs_dir_node(NULL, "clock");
-    struct twimap* map;
-
-    map = twifs_mapping(root, NULL, "systime");
-    map->read = __clock_read_systime;
-
-    map = twifs_mapping(root, NULL, "unix");
-    map->read = __clock_read_unix;
-
-    map = twifs_mapping(root, NULL, "datetime");
-    map->read = __clock_read_datetime;
+    datetime_t dt;
+    hwrtc_walltime(&dt);
+    return datetime_tounix(&dt);
 }
 
-void
-clock_init()
+time_t
+clock_systime()
 {
-    if (!timer_context()) {
-        panick("Systimer not initialized");
+    if (!systimer) {
+        return 0;
     }
 
-    // 系统计时器每毫秒累加。
-    timer_run_ms(1, clock_systime_counter, NULL, TIMER_MODE_PERIODIC);
+    ticks_t t = hwtimer_current_systicks();
+    ticks_t tu = systimer->running_freq / 1000;
 
-    clock_build_mapping();
-}
-
-void
-clock_systime_counter(void* arg)
-{
-    sys_time++;
-}
+    if (unlikely(!tu)) {
+        return t;
+    }
 
-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;
+    return t / (tu);
 }
 
 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;
+    sysrtc->ops->get_walltime(sysrtc, datetime);
 }
 
-time_t
-clock_unixtime()
+static void
+clock_build_mapping()
 {
-    datetime_t dt;
-    clock_walltime(&dt);
-    return clock_tounixtime(&dt);
-}
+    struct twifs_node* root;
+    struct twimap* map;
 
-time_t
-clock_systime()
-{
-    return sys_time;
-}
\ No newline at end of file
+    root = twifs_dir_node(NULL, "clock");
+    
+    twimap_export_value(root, systime, FSACL_ugR, NULL);
+    twimap_export_value(root, unixtime, FSACL_ugR, NULL);
+    twimap_export_value(root, datetime, FSACL_ugR, NULL);
+}
+EXPORT_TWIFS_PLUGIN(sys_clock, clock_build_mapping);