* fix an issue that execve attempts to parse directory as elf file.

[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 c779ed524029b6eaa89f6efc11a92f6a0512ff86..e5a913f2c97256f76203c1ae29fa808c76596413 100644 (file)
--- a/lunaix-os/kernel/tty/tty.c
+++ b/lunaix-os/kernel/tty/tty.c
@@ -1,140 +1,116 @@
 #include <klibc/string.h>
 #include <klibc/string.h>

+#include <lunaix/spike.h>

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

-#include <lunaix/common.h>

 #include <stdint.h>
 #include <stdint.h>

-#include <hal/io.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) {
-    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);
-}
-
-void tty_set_buffer(void* vga_buf) {
-    tty_vga_buffer = (vga_attribute*)vga_buf;
-}
-
-void
-tty_set_theme(vga_attribute fg, vga_attribute bg)
+inline void
+tty_clear()

 {
 {

-    tty_theme_color = (bg << 4 | fg) << 8;
+    asm volatile("rep stosw" ::"D"(tty_vga_buffer),
+                 "c"(TTY_HEIGHT * TTY_WIDTH),
+                 "a"(tty_theme_color)
+                 : "memory");

 }
 
 void
 }
 
 void

-tty_put_char(char chr)
+tty_init(void* vga_buf)

 {
 {

-    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;
-    }
-
-    if (tty_x >= TTY_WIDTH) {
-        tty_x = 0;
-        tty_y++;
-    }
-    if (tty_y >= TTY_HEIGHT) {
-        tty_scroll_up();
-    }
-}
+    tty_vga_buffer = (vga_attribute*)vga_buf;

 
 

-void tty_sync_cursor() {
-    tty_set_cursor(tty_x, tty_y);
-}
+    tty_clear();

 
 

+    port_wrbyte(0x3D4, 0x0A);
+    port_wrbyte(0x3D5, (port_rdbyte(0x3D5) & 0xC0) | 13);

 
 

-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);
+    port_wrbyte(0x3D4, 0x0B);
+    port_wrbyte(0x3D5, (port_rdbyte(0x3D5) & 0xE0) | 15);

 }
 
 void
 }
 
 void

-tty_put_str(char* str)
+tty_set_cursor(u8_t x, u8_t y)

 {
 {

-    while (*str != '\0') {
-        tty_put_char(*str);
-        str++;
+    if (x >= TTY_WIDTH || y >= TTY_HEIGHT) {
+        x = y = 0;

     }
     }

-    tty_sync_cursor();
+    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_scroll_up()
+tty_set_theme(vga_attribute fg, vga_attribute bg)

 {
 {

-    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;
+    tty_theme_color = (bg << 4 | fg) << 8;

 }
 
 void
 }
 
 void

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

 {
 {

-    for (uint32_t i = 0; i < TTY_WIDTH * TTY_HEIGHT; i++) {
-        *(tty_vga_buffer + i) = tty_theme_color;
-    }
-    tty_x = 0;
-    tty_y = 0;
-}
+    int x = 0, y = 0;

 
 

-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;
+    // Clear screen
+    tty_clear();
+
+    char chr;
+    while (fifo_readone_async(buf, (u8_t*)&chr)) {
+        switch (chr) {
+            case '\t':
+                x += 4;
+                break;
+            case '\n':
+                y++;
+                // fall through
+            case '\r':
+                x = 0;
+                break;
+            default:
+                *(tty_vga_buffer + x + y * TTY_WIDTH) =
+                    (tty_theme_color | chr);
+                (x)++;
+                break;
+        }
+
+        if (x >= TTY_WIDTH) {
+            x = 0;
+            y++;
+        }
+        if (y >= TTY_HEIGHT) {
+            y--;
+            break;
+        }

     }
     }

-}

 
 

-void
-tty_set_cpos(unsigned int x, unsigned int y) {
-    tty_x = x % TTY_WIDTH;
-    tty_y = y % TTY_HEIGHT;
+    tty_set_cursor(x, y);

 }
 
 void
 }
 
 void

-tty_get_cpos(unsigned int* x, unsigned int* y) {
-    *x = tty_x;
-    *y = tty_y;
+tty_clear_line(int line_num)
+{
+    asm volatile("rep stosw" ::"D"(tty_vga_buffer + line_num * TTY_WIDTH),
+                 "c"(TTY_WIDTH),
+                 "a"(tty_theme_color)
+                 : "memory");

 }
 
 }
 

-vga_attribute
-tty_get_theme() {
-    return tty_theme_color;
+void
+tty_put_str_at(char* str, int x, int y)
+{
+    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