Changeset 84 for trunk

Timestamp:

Jun 28, 2017, 2:20:29 PM (7 years ago)

Author:

max@…

Message:

scroll the console

File:

• trunk/hal/x86_64/core/x86_printf.c (modified) (2 diffs)

trunk/hal/x86_64/core/x86_printf.c

@@ -35 +35 @@
 
 #define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-#define CONS_X_SIZE     160
-#define CONS_Y_SIZE     80
-
+#define CONS_X_SIZE     80
+#define CONS_Y_SIZE     26
+
+static char cons_buffer[CONS_X_SIZE * 2 * CONS_Y_SIZE] __in_kdata;
 extern intptr_t iom_base;
 size_t cons_ptr __in_kdata = 0;
@@ -49 +50 @@
 }
 
+static void check_scroll()
+{
+        char *base = (uint64_t)iom_base + (0xB8000 - IOM_BEGIN);
+        char *src, *dst;
+        size_t i;
+
+        if (cons_ptr < (CONS_X_SIZE * 2) * CONS_Y_SIZE) {
+                return;
+        }
+
+        for (i = 0; i < CONS_Y_SIZE - 1; i++) {
+                dst = (char *)&cons_buffer[0] + i * (CONS_X_SIZE * 2);
+                src = (char *)&cons_buffer[0] + (i + 1) * (CONS_X_SIZE * 2);
+
+                memcpy(dst, src, (CONS_X_SIZE * 2));
+        }
+
+        memset(base, 0, CONS_X_SIZE * 2 * CONS_Y_SIZE);
+
+        cons_ptr -= (CONS_X_SIZE * 2);
+        memcpy(base, &cons_buffer[0], (CONS_X_SIZE * 2) * (CONS_Y_SIZE - 1));
+}
+
 static void x86_putc(char c)
 {
         if (c == '\n') {
-                cons_ptr = roundup(cons_ptr, CONS_X_SIZE);
+                cons_ptr = roundup(cons_ptr, CONS_X_SIZE * 2);
+                check_scroll();
                 return;
         }
 
         char *video = (char *)iom_base + (0xB8000 - IOM_BEGIN) + cons_ptr;
+        char *buf = &cons_buffer[cons_ptr];
         *video = c;
-        cons_ptr++, video++;
+        *buf = c;
+        cons_ptr++, video++, buf++;
         *video = 0x7;
-        cons_ptr++, video++;
+        *buf = 0x7;
+        cons_ptr++, video++, buf++;
+
+        check_scroll();
 }