selectors, descriptors, more interrupt init

[3sys] / sys1 / kern / src / main.c

diff --git a/sys1/kern/src/main.c b/sys1/kern/src/main.c
index 00d3882..1a84caf 100644 (file)
--- a/sys1/kern/src/main.c
+++ b/sys1/kern/src/main.c
@@ -2,6 +2,8 @@
 #include <string.h>
 #include <stdint.h>
 #include "vga.h"
+#include "mem.h"
+#include "intr.h"
 
 void drawtext(int x, int y, const char *s)
 {
@@ -19,6 +21,9 @@ void kmain(void)
 
        vga_reset();
 
+       mem_init();
+       intr_init();
+
        line = 0;
        for(;;) {
                scroll = line <= 24 ? 0 : line - 24;
@@ -31,8 +36,8 @@ void kmain(void)
                vga_setcolor(VGA_YELLOW | VGA_BRIGHT, VGA_BLACK);
                drawtext(line & 7, row, buf);
 
-               for(i=0; i<65536 * 4; i++) {
-                       buf[0] = twirl[(i >> 18) & 3];
+               for(i=0; i<65536 * 16; i++) {
+                       buf[0] = twirl[(i >> 15) & 3];
                        buf[1] = 0;
                        vga_setcolor(VGA_WHITE, VGA_BLACK);
                        drawtext(50, row, buf);