diff --git a/sys/Makescript b/sys/Makescript index c2fd5c4..ba66e2f 100644 --- a/sys/Makescript +++ b/sys/Makescript @@ -3,3 +3,4 @@ echo "Kernel Build" cc $CFLAGS -c sys/lib.c -o $OBJ/lib.o cc $CFLAGS -c sys/video.c -o $OBJ/video.o cc $CFLAGS -c sys/sysinit.c -o $OBJ/sysinit.o +cc $CFLAGS -c sys/kbd.c -o $OBJ/kbd.o diff --git a/sys/include/kbd.h b/sys/include/kbd.h index 7626e57..da9e9cf 100644 --- a/sys/include/kbd.h +++ b/sys/include/kbd.h @@ -1,7 +1,9 @@ #ifndef KBD_H #define KBD_H -u8 inb(u16); -s8 waitkey(void); +#include + +static u8 inb(u16); +u8 waitkey(void); #endif diff --git a/sys/kbd.c b/sys/kbd.c index 3ec560d..eba019b 100644 --- a/sys/kbd.c +++ b/sys/kbd.c @@ -11,10 +11,10 @@ inb(u16 port) return ret; } -char +u8 waitkey(void) { - char k; + u8 k; while ((k=inb(0x60))<128); while (inb(0x60)>128); diff --git a/sys/sysinit.c b/sys/sysinit.c index 9d04d03..02178cb 100644 --- a/sys/sysinit.c +++ b/sys/sysinit.c @@ -1,7 +1,6 @@ #include #include - void sysinit(void) { @@ -12,5 +11,5 @@ sysinit(void) char thing = waitkey(); vga_write(&thing, 1, 0x1F); - memory_init(); + // memory_init(); }