diff --git a/include/kernel/iomisc.h b/include/kernel/iomisc.h index edea848..5c9da8e 100644 --- a/include/kernel/iomisc.h +++ b/include/kernel/iomisc.h @@ -66,20 +66,6 @@ extern void IoEnableNMI(void); extern void IoDisableNMI(void); extern void IdtRegisterIrq(void (*isr)(void), uchar irq, uchar flags); -typedef struct -{ - uchar sec; - uchar min; - uchar hour; - uchar weekday; - uchar day; - uchar month; - uchar year; - uchar century; -} Time_t; - -extern void IoPrintRtcTime(void); - // // Restore IRQ flag to its state before KePauseIRQs // diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index eb160c9..a143352 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -28,6 +28,7 @@ #include #include #include +#include // info.c extern void BtDoSanityChecks(uint mbMagic); @@ -40,11 +41,6 @@ extern error_t IoInitVGABuffer(void); extern void IoSetupKeyb(void); extern void IoEnableKeyb(void); -//io/rtc.c -extern void IoSetupRtc(void); -extern void IoEnableRtc(void); -extern ulong IoRtcTicks; - // cpu/idt.c extern void IdtSetup(void); diff --git a/kaleid/kernel/io/rtc.c b/kaleid/kernel/io/rtc.c index 376b6bf..bd0971b 100644 --- a/kaleid/kernel/io/rtc.c +++ b/kaleid/kernel/io/rtc.c @@ -25,6 +25,7 @@ #include #include #include +#include extern void RtcIsr(void); @@ -32,9 +33,6 @@ ulong IoRtcTicks = 0; Time_t IoRtcTime; -char* WeekDays[7] = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}; - - void IoSetupRtc(void) { IdtRegisterIrq(RtcIsr, 0x28, 0x8E); @@ -195,3 +193,14 @@ void IoPrintRtcTime(void) IoRtcTime.sec ); } + +Time_t* IoGetRtcTime(void) +{ + return &IoRtcTime; +} + +ulong IoGetRtcTicks(void) +{ + return IoRtcTicks; +} +