X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/5fc669295655ec0eea7722aa4a48921dc6b700ec..8c06c883e7b13c115d5ff207f79d4b68fccd5ad6:/lunaix-os/kernel/time/clock.c

diff --git a/lunaix-os/kernel/time/clock.c b/lunaix-os/kernel/time/clock.c
index 15a6a32..3770dd0 100644
--- a/lunaix-os/kernel/time/clock.c
+++ b/lunaix-os/kernel/time/clock.c
@@ -1,87 +1,77 @@
-#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>
 
-static volatile time_t sys_time;
+#include <klibc/string.h>
 
 void
-clock_systime_counter(void* arg);
-
-void
-clock_init()
+__clock_read_systime(struct twimap* map)
 {
-    if (!timer_context()) {
-        panick("Systimer not initialized");
-    }
-
-    // 系统计时器每毫秒累加。
-    timer_run_ms(1, clock_systime_counter, NULL, TIMER_MODE_PERIODIC);
+    ticks_t sys_time = clock_systime();
+    twimap_printf(map, "%u", sys_time);
 }
 
 void
-clock_systime_counter(void* arg)
+__clock_read_datetime(struct twimap* map)
 {
-    sys_time++;
+    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);
 }
 
-int
-clock_datatime_eq(datetime_t* a, datetime_t* b)
+void
+__clock_read_unix(struct twimap* map)
 {
-    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;
+    twimap_printf(map, "%u", clock_unixtime());
 }
 
 void
-clock_walltime(datetime_t* datetime)
+clock_build_mapping()
 {
-    datetime_t current;
-
-    do {
-        while (rtc_read_reg(RTC_REG_A) & 0x80)
-            ;
-        memcpy(&current, datetime, sizeof(datetime_t));
+    struct twifs_node* root = twifs_dir_node(NULL, "clock");
+    struct twimap* map;
 
-        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));
+    map = twifs_mapping(root, NULL, "systime");
+    map->read = __clock_read_systime;
 
-    uint8_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);
-    }
+    map = twifs_mapping(root, NULL, "unix");
+    map->read = __clock_read_unix;
 
-    // To 24 hour format
-    if (!RTC_24HRS_ENCODED(regbv) && (datetime->hour >> 7)) {
-        datetime->hour = (12 + datetime->hour & 0x80);
-    }
-
-    datetime->year += RTC_CURRENT_CENTRY * 100;
+    map = twifs_mapping(root, NULL, "datetime");
+    map->read = __clock_read_datetime;
 }
+EXPORT_TWIFS_PLUGIN(sys_clock, clock_build_mapping);
 
 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;
+    if (!current_timer) {
+        return 0;
+    }
+
+    ticks_t t = hwtimer_current_systicks();
+    return t / current_timer->running_freq;
+}
+
+void
+clock_walltime(datetime_t* datetime)
+{
+    primary_rtc->get_walltime(primary_rtc, datetime);
 }
\ No newline at end of file