refactor: one more step towards arch-agnostic design

[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 f197559e8b6a41607180bdea361c1e83dcfcbba1..e90899b6f55301aa4f8fa1b92a6d753e1b8eb9e3 100644 (file)
--- a/lunaix-os/kernel/tty/tty.c
+++ b/lunaix-os/kernel/tty/tty.c
@@ -1,4 +1,3 @@
-#include <hal/io.h>

 #include <klibc/string.h>
 #include <lunaix/common.h>
 #include <lunaix/spike.h>
 #include <klibc/string.h>
 #include <lunaix/common.h>
 #include <lunaix/spike.h>


@@ -6,7 +5,9 @@
 #include <lunaix/tty/tty.h>
 #include <stdint.h>
 
 #include <lunaix/tty/tty.h>
 #include <stdint.h>
 

-vga_attribute* tty_vga_buffer = (vga_attribute*)VGA_BUFFER_PADDR;
+#include <sys/port_io.h>
+
+vga_attribute* tty_vga_buffer;

 
 vga_attribute tty_theme_color = VGA_COLOR_BLACK;
 
 
 vga_attribute tty_theme_color = VGA_COLOR_BLACK;
 


@@ -26,11 +27,24 @@ tty_init(void* vga_buf)
 
     tty_clear();
 
 
     tty_clear();
 

-    io_outb(0x3D4, 0x0A);
-    io_outb(0x3D5, (io_inb(0x3D5) & 0xC0) | 13);
+    port_wrbyte(0x3D4, 0x0A);
+    port_wrbyte(0x3D5, (port_rdbyte(0x3D5) & 0xC0) | 13);
+
+    port_wrbyte(0x3D4, 0x0B);
+    port_wrbyte(0x3D5, (port_rdbyte(0x3D5) & 0xE0) | 15);
+}

 
 

-    io_outb(0x3D4, 0x0B);
-    io_outb(0x3D5, (io_inb(0x3D5) & 0xE0) | 15);
+void
+tty_set_cursor(u8_t x, u8_t y)
+{
+    if (x >= TTY_WIDTH || y >= TTY_HEIGHT) {
+        x = y = 0;
+    }
+    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


@@ -51,7 +65,7 @@ tty_flush_buffer(struct fifo_buf* buf)
     int state = 0;
     int g[2] = { 0, 0 };
     vga_attribute current_theme = tty_theme_color;
     int state = 0;
     int g[2] = { 0, 0 };
     vga_attribute current_theme = tty_theme_color;

-    while (fifo_readone_async(buf, &chr)) {
+    while (fifo_readone_async(buf, (u8_t*)&chr)) {

         if (state == 0 && chr == '\033') {
             state = 1;
         } else if (state == 1 && chr == '[') {
         if (state == 0 && chr == '\033') {
             state = 1;
         } else if (state == 1 && chr == '[') {


@@ -107,19 +121,6 @@ tty_flush_buffer(struct fifo_buf* buf)
     tty_set_cursor(x, y);
 }
 
     tty_set_cursor(x, y);
 }
 

-void
-tty_set_cursor(uint8_t x, uint8_t y)
-{
-    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);
-}
-

 void
 tty_clear_line(int line_num)
 {
 void
 tty_clear_line(int line_num)
 {