Fixed interrupts and added keyboard handler

4 files changed, 5 insertions, 3 deletions

diff --git a/src/loader/inc/dev.h b/src/loader/inc/dev.h
index 7120a83..cbefe99 100644
--- a/src/loader/inc/dev.h
+++ b/src/loader/inc/dev.h
@@ -7,6 +7,7 @@
 #include <dsk.h>
 
 enum dev_type {
+	DEV_NONE,
 	DEV_DISK,
 	DEV_FB,
 };
diff --git a/src/loader/inc/impl.h b/src/loader/inc/impl.h
index c7b1261..58ae706 100644
--- a/src/loader/inc/impl.h
+++ b/src/loader/inc/impl.h
@@ -13,7 +13,7 @@ enum impl_type {
 
 struct impl {
 	enum impl_type type;
-	void *start; // Of header/entry
+	u32 offset; // Of header/entry
 	void (*load)(struct dev *, const char *);
 };
 
diff --git a/src/loader/inc/int.h b/src/loader/inc/int.h
index 8336cd8..ccd9ea8 100644
--- a/src/loader/inc/int.h
+++ b/src/loader/inc/int.h
@@ -43,8 +43,6 @@ struct idt_ptr {
 	void *base;
 } PACKED;
 
-extern struct idt_ptr idt;
-
 void idt_install(void);
 void int_event_handler_add(u32 int_no, void (*handler)(void));
 
diff --git a/src/loader/inc/log.h b/src/loader/inc/log.h
index c40ce50..cb1acd8 100644
--- a/src/loader/inc/log.h
+++ b/src/loader/inc/log.h
@@ -3,9 +3,12 @@
 #ifndef LOG_H
 #define LOG_H
 
+#include <def.h>
+
 void serial_install(void);
 void serial_print(const char *data);
 
+void vga_put_at(char ch, u8 x, u8 y, u8 color);
 void vga_clear(void);
 
 void log(const char *format, ...);