X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/80890b99fec2630ef0a1a0805d894c3d86c16506..58f0877fc16da760e2ed6910648ec67e9afff890:/lunaix-os/kernel/time/clock.c

diff --git a/lunaix-os/kernel/time/clock.c b/lunaix-os/kernel/time/clock.c
index e862f79..0f04575 100644
--- a/lunaix-os/kernel/time/clock.c
+++ b/lunaix-os/kernel/time/clock.c
@@ -1,33 +1,84 @@
-#include <lunaix/clock.h>
-#include <lunaix/timer.h>
 #include <hal/rtc.h>
+#include <lunaix/clock.h>
+#include <lunaix/fs/twifs.h>
 #include <lunaix/spike.h>
+#include <lunaix/timer.h>
 
 static volatile time_t sys_time;
 
-void clock_systime_counter(void* arg);
+void
+clock_systime_counter(void* arg);
+
+void
+__clock_read_systime(struct twimap* map)
+{
+    time_t save = sys_time;
+    twimap_printf(map, "%u", save);
+}
+
+void
+__clock_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);
+}
 
 void
-clock_init() {
+__clock_read_unix(struct twimap* map)
+{
+    datetime_t dt;
+    clock_walltime(&dt);
+    twimap_printf(map, "%u", clock_tounixtime(&dt));
+}
+
+void
+clock_build_mapping()
+{
+    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;
+}
+
+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) {
+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 &&
+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;
 }
 
@@ -35,10 +86,10 @@ void
 clock_walltime(datetime_t* datetime)
 {
     datetime_t current;
-    
-    do
-    {
-        while (rtc_read_reg(RTC_REG_A) & 0x80);
+
+    do {
+        while (rtc_read_reg(RTC_REG_A) & 0x80)
+            ;
         memcpy(&current, datetime, sizeof(datetime_t));
 
         datetime->year = rtc_read_reg(RTC_REG_YRS);
@@ -62,7 +113,6 @@ clock_walltime(datetime_t* datetime)
         datetime->second = bcd2dec(datetime->second);
     }
 
-
     // To 24 hour format
     if (!RTC_24HRS_ENCODED(regbv) && (datetime->hour >> 7)) {
         datetime->hour = (12 + datetime->hour & 0x80);
@@ -71,8 +121,16 @@ clock_walltime(datetime_t* datetime)
     datetime->year += RTC_CURRENT_CENTRY * 100;
 }
 
+time_t
+clock_unixtime()
+{
+    datetime_t dt;
+    clock_walltime(&dt);
+    return clock_tounixtime(&dt);
+}
 
-time_t 
-clock_systime() {
+time_t
+clock_systime()
+{
     return sys_time;
 }
\ No newline at end of file