refactor: use a more decent physical memory map

[lunaix-os.git] / lunaix-os / kernel / tty / tty.c

diff --git a/lunaix-os/kernel/tty/tty.c b/lunaix-os/kernel/tty/tty.c
index 41642390ecdd4c03e4231699010243e2a3d9dbc7..6f988552822e239af0d7903b3b71a12606c19816 100644 (file)
--- a/lunaix-os/kernel/tty/tty.c
+++ b/lunaix-os/kernel/tty/tty.c
@@ -1,156 +1,145 @@
-#include <hal/io.h>

 #include <klibc/string.h>
 #include <klibc/string.h>

-#include <lunaix/common.h>
+#include <lunaix/spike.h>
+#include <lunaix/tty/console.h>

 #include <lunaix/tty/tty.h>
 #include <stdint.h>
 
 #include <lunaix/tty/tty.h>
 #include <stdint.h>
 

-#define TTY_WIDTH 80
-#define TTY_HEIGHT 25
+#include <sys/port_io.h>

 
 

-static vga_attribute* tty_vga_buffer = (vga_attribute*)VGA_BUFFER_PADDR;
+vga_attribute* tty_vga_buffer;

 
 

-static vga_attribute tty_theme_color = VGA_COLOR_BLACK;
+vga_attribute tty_theme_color = VGA_COLOR_BLACK;

 
 

-static uint32_t tty_x = 0;
-static uint32_t tty_y = 0;
-
-void
-tty_init(void* vga_buf)
+inline void
+tty_clear()

 {
 {

-    tty_vga_buffer = (vga_attribute*)vga_buf;
-    tty_clear();
-
-    io_outb(0x3D4, 0x0A);
-    io_outb(0x3D5, (io_inb(0x3D5) & 0xC0) | 13);
-
-    io_outb(0x3D4, 0x0B);
-    io_outb(0x3D5, (io_inb(0x3D5) & 0xE0) | 15);
+    asm volatile("rep stosw" ::"D"(tty_vga_buffer),
+                 "c"(TTY_HEIGHT * TTY_WIDTH),
+                 "a"(tty_theme_color)
+                 : "memory");

 }
 
 void
 }
 
 void

-tty_set_buffer(void* vga_buf)
+tty_init(void* vga_buf)

 {
     tty_vga_buffer = (vga_attribute*)vga_buf;
 {
     tty_vga_buffer = (vga_attribute*)vga_buf;

-}
-
-void
-tty_set_theme(vga_attribute fg, vga_attribute bg)
-{
-    tty_theme_color = (bg << 4 | fg) << 8;
-}

 
 

-void
-tty_put_char(char chr)
-{
-    switch (chr) {
-        case '\t':
-            tty_x += 4;
-            break;
-        case '\n':
-            tty_y++;
-            // fall through
-        case '\r':
-            tty_x = 0;
-            break;
-        case '\x08':
-            tty_x = tty_x ? tty_x - 1 : 0;
-            *(tty_vga_buffer + tty_x + tty_y * TTY_WIDTH) =
-              (tty_theme_color | 0x20);
-            break;
-        default:
-            *(tty_vga_buffer + tty_x + tty_y * TTY_WIDTH) =
-              (tty_theme_color | chr);
-            tty_x++;
-            break;
-    }
+    tty_clear();

 
 

-    if (tty_x >= TTY_WIDTH) {
-        tty_x = 0;
-        tty_y++;
-    }
-    if (tty_y >= TTY_HEIGHT) {
-        tty_scroll_up();
-    }
-}
+    port_wrbyte(0x3D4, 0x0A);
+    port_wrbyte(0x3D5, (port_rdbyte(0x3D5) & 0xC0) | 13);

 
 

-void
-tty_sync_cursor()
-{
-    tty_set_cursor(tty_x, tty_y);
+    port_wrbyte(0x3D4, 0x0B);
+    port_wrbyte(0x3D5, (port_rdbyte(0x3D5) & 0xE0) | 15);

 }
 
 void
 }
 
 void

-tty_set_cursor(uint8_t x, uint8_t y)
+tty_set_cursor(u8_t x, u8_t y)

 {
     if (x >= TTY_WIDTH || y >= TTY_HEIGHT) {
         x = y = 0;
     }
 {
     if (x >= TTY_WIDTH || y >= TTY_HEIGHT) {
         x = y = 0;
     }

-    uint32_t pos = y * TTY_WIDTH + x;
-    io_outb(0x3D4, 14);
-    io_outb(0x3D5, pos / 256);
-    io_outb(0x3D4, 15);
-    io_outb(0x3D5, pos % 256);
+    u32_t pos = y * TTY_WIDTH + x;
+    port_wrbyte(0x3D4, 14);
+    port_wrbyte(0x3D5, pos / 256);
+    port_wrbyte(0x3D4, 15);
+    port_wrbyte(0x3D5, pos % 256);

 }
 
 void
 }
 
 void

-tty_put_str(char* str)
+tty_set_theme(vga_attribute fg, vga_attribute bg)

 {
 {

-    while (*str != '\0') {
-        tty_put_char(*str);
-        str++;
-    }
-    // FIXME: This does not work in user mode.
-    // Work around:
-    //  1. (Easy) Define an IO Permission bitmap in TSS
-    //  2. (More effort) Mount onto file system. (/dev/tty)
-    // tty_sync_cursor();
+    tty_theme_color = (bg << 4 | fg) << 8;

 }
 
 void
 }
 
 void

-tty_scroll_up()
+tty_flush_buffer(struct fifo_buf* buf)

 {
 {

-    size_t last_line = TTY_WIDTH * (TTY_HEIGHT - 1);
-    memcpy(tty_vga_buffer, tty_vga_buffer + TTY_WIDTH, last_line * 2);
-    for (size_t i = 0; i < TTY_WIDTH; i++) {
-        *(tty_vga_buffer + i + last_line) = tty_theme_color;
-    }
-    tty_y = tty_y == 0 ? 0 : TTY_HEIGHT - 1;
-}
+    int x = 0, y = 0;

 
 

-void
-tty_clear()
-{
-    for (uint32_t i = 0; i < TTY_WIDTH * TTY_HEIGHT; i++) {
-        *(tty_vga_buffer + i) = tty_theme_color;
-    }
-    tty_x = 0;
-    tty_y = 0;
-}
+    // Clear screen
+    tty_clear();

 
 

-void
-tty_clear_line(unsigned int y)
-{
-    for (size_t i = 0; i < TTY_WIDTH; i++) {
-        *(tty_vga_buffer + i + y * TTY_WIDTH) = tty_theme_color;
+    char chr;
+    int state = 0;
+    int g[2] = { 0, 0 };
+    vga_attribute current_theme = tty_theme_color;
+    while (fifo_readone_async(buf, (u8_t*)&chr)) {
+        if (state == 0 && chr == '\033') {
+            state = 1;
+        } else if (state == 1 && chr == '[') {
+            state = 2;
+        } else if (state > 1) {
+            if ('0' <= chr && chr <= '9') {
+                g[state - 2] = (chr - '0') + g[state - 2] * 10;
+            } else if (chr == ';' && state == 2) {
+                state = 3;
+            } else {
+                if (g[0] == 39 && g[1] == 49) {
+                    current_theme = tty_theme_color;
+                } else {
+                    current_theme = (g[1] << 4 | g[0]) << 8;
+                }
+                g[0] = 0;
+                g[1] = 0;
+                state = 0;
+            }
+        } else {
+            state = 0;
+            switch (chr) {
+                case '\t':
+                    x += 4;
+                    break;
+                case '\n':
+                    y++;
+                    // fall through
+                case '\r':
+                    x = 0;
+                    break;
+                // case '\x08':
+                //     *(tty_vga_buffer + x + y * TTY_WIDTH) =
+                //       (current_theme | 0x20);
+                //     break;
+                default:
+                    *(tty_vga_buffer + x + y * TTY_WIDTH) =
+                      (current_theme | chr);
+                    (x)++;
+                    break;
+            }
+
+            if (x >= TTY_WIDTH) {
+                x = 0;
+                y++;
+            }
+            if (y >= TTY_HEIGHT) {
+                y--;
+                break;
+            }
+        }

     }
     }

+    tty_set_cursor(x, y);

 }
 
 void
 }
 
 void

-tty_set_cpos(unsigned int x, unsigned int y)
+tty_clear_line(int line_num)

 {
 {

-    tty_x = x % TTY_WIDTH;
-    tty_y = y % TTY_HEIGHT;
+    asm volatile("rep stosw" ::"D"(tty_vga_buffer + line_num * TTY_WIDTH),
+                 "c"(TTY_WIDTH),
+                 "a"(tty_theme_color)
+                 : "memory");

 }
 
 void
 }
 
 void

-tty_get_cpos(unsigned int* x, unsigned int* y)
+tty_put_str_at(char* str, int x, int y)

 {
 {

-    *x = tty_x;
-    *y = tty_y;
-}
-
-vga_attribute
-tty_get_theme()
-{
-    return tty_theme_color;
+    char c;
+    while ((c = (*str)) && y < TTY_HEIGHT) {
+        *(tty_vga_buffer + x + y * TTY_WIDTH) = c | tty_theme_color;
+        x++;
+        if (x >= TTY_WIDTH) {
+            y++;
+            x = 0;
+        }
+        str++;
+    }

 }
\ No newline at end of file
 }
\ No newline at end of file