summaryrefslogtreecommitdiff
path: root/kernel/kmain.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kmain.c')
-rw-r--r--kernel/kmain.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/kernel/kmain.c b/kernel/kmain.c
index 5b10ee1..81fe741 100644
--- a/kernel/kmain.c
+++ b/kernel/kmain.c
@@ -1,27 +1,17 @@
-#include <asm/io.h>
#include <kernel/con.h>
#include <stdint.h>
+#include <sys/types.h>
-uint32_t ticks = 0;
-#define millis() \
- (ticks * 10)
+uint32_t ticks = 0;
-void sleep(int ms) {
- uint64_t t = millis() + ms;
- while(millis() < t);
-}
+extern void userspace_init(void);
void kmain(void) {
con_init();
- printf("Kernel booting...\n");
- printf("Kernel booted!\n");
-
- printf("PIC1 Mask: 0x%02x\n", inb(0x21));
+ printf("Kernel booting...\n\n");
+ printf("\nKernel booted!\n");
- while(1) {
- sleep(500);
- printf("Reliable 500ms tick!\n");
- }
+ userspace_init();
}