Merge branch 'device-sys'

[lunaix-os.git] / lunaix-os / includes / lunaix / tty / tty.h

diff --git a/lunaix-os/includes/lunaix/tty/tty.h b/lunaix-os/includes/lunaix/tty/tty.h
index 28ad83d794211575c5e07b7133358ef02d51972a..96fe4859c5a1fe3ece1c6579bbc9025b98f8133b 100644 (file)
--- a/lunaix-os/includes/lunaix/tty/tty.h
+++ b/lunaix-os/includes/lunaix/tty/tty.h
@@ -1,5 +1,8 @@
 #ifndef __LUNAIX_TTY_H
 #define __LUNAIX_TTY_H
 #ifndef __LUNAIX_TTY_H
 #define __LUNAIX_TTY_H

+
+#include <lunaix/ds/fifo.h>
+

 typedef unsigned short vga_attribute;
 
 #define VGA_COLOR_BLACK 0
 typedef unsigned short vga_attribute;
 
 #define VGA_COLOR_BLACK 0


@@ -9,8 +12,8 @@ typedef unsigned short vga_attribute;
 #define VGA_COLOR_RED 4
 #define VGA_COLOR_MAGENTA 5
 #define VGA_COLOR_BROWN 6
 #define VGA_COLOR_RED 4
 #define VGA_COLOR_MAGENTA 5
 #define VGA_COLOR_BROWN 6

-#define VGA_COLOR_LIGHT_GREY 7

 #define VGA_COLOR_DARK_GREY 8
 #define VGA_COLOR_DARK_GREY 8

+#define VGA_COLOR_LIGHT_GREY 7

 #define VGA_COLOR_LIGHT_BLUE 9
 #define VGA_COLOR_LIGHT_GREEN 10
 #define VGA_COLOR_LIGHT_CYAN 11
 #define VGA_COLOR_LIGHT_BLUE 9
 #define VGA_COLOR_LIGHT_GREEN 10
 #define VGA_COLOR_LIGHT_CYAN 11


@@ -19,38 +22,25 @@ typedef unsigned short vga_attribute;
 #define VGA_COLOR_LIGHT_BROWN 14
 #define VGA_COLOR_WHITE 15
 
 #define VGA_COLOR_LIGHT_BROWN 14
 #define VGA_COLOR_WHITE 15
 

-void 
-tty_init(void* vga_buf);
+#define TTY_WIDTH 80
+#define TTY_HEIGHT 25

 
 void
 
 void

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

 
 void
 tty_set_theme(vga_attribute fg, vga_attribute bg);
 
 
 void
 tty_set_theme(vga_attribute fg, vga_attribute bg);
 

-void
-tty_put_char(char chr);
-
-void
-tty_put_str(char* str);
-
-void
-tty_scroll_up();
+vga_attribute
+tty_get_theme();

 
 void
 
 void

-tty_clear();
-
-void 
-tty_clear_line(unsigned int y);
+tty_flush_buffer(struct fifo_buf* buf);

 
 void
 
 void

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

 
 void
 
 void

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

 
 #endif /* __LUNAIX_TTY_H */
 
 #endif /* __LUNAIX_TTY_H */