git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic PS/2 keyboard driver, and ...
[lunaix-os.git]
/
lunaix-os
/
kernel
/
k_init.c
diff --git
a/lunaix-os/kernel/k_init.c
b/lunaix-os/kernel/k_init.c
index ce97b6ef7c20edb8872b59e30540a29eb449da1a..74e3534fbacac48a5a6941ecac4af30298ba0cd8 100644
(file)
--- a/
lunaix-os/kernel/k_init.c
+++ b/
lunaix-os/kernel/k_init.c
@@
-8,6
+8,8
@@
#include <lunaix/spike.h>
#include <lunaix/syslog.h>
#include <lunaix/timer.h>
#include <lunaix/spike.h>
#include <lunaix/syslog.h>
#include <lunaix/timer.h>
+#include <lunaix/clock.h>
+#include <lunaix/peripheral/ps2kbd.h>
#include <hal/rtc.h>
#include <hal/apic.h>
#include <hal/rtc.h>
#include <hal/apic.h>
@@
-98,6
+100,8
@@
_kernel_post_init() {
apic_init();
ioapic_init();
timer_init(SYS_TIMER_FREQUENCY_HZ);
apic_init();
ioapic_init();
timer_init(SYS_TIMER_FREQUENCY_HZ);
+ clock_init();
+ ps2_kbd_init();
for (size_t i = 256; i < hhk_init_pg_count; i++) {
vmm_unmap_page((void*)(i << PG_SIZE_BITS));
for (size_t i = 256; i < hhk_init_pg_count; i++) {
vmm_unmap_page((void*)(i << PG_SIZE_BITS));