Merge branch 'console-dev'

[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 cbb39248a02564de6182aee1a27987cfa7db48b7..518d3760a8def0797976d627417ddeb38b60400d 100644 (file)
--- a/lunaix-os/includes/lunaix/tty/tty.h
+++ b/lunaix-os/includes/lunaix/tty/tty.h
@@ -9,8 +9,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,42 +19,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();
-
-void
-tty_clear();
-
-void 
-tty_clear_line(unsigned int y);
-
-void
-tty_set_cpos(unsigned int x, unsigned int y);
-
-void
-tty_get_cpos(unsigned int* x, unsigned int* y);
-

 vga_attribute
 tty_get_theme();
 
 vga_attribute
 tty_get_theme();
 

-void tty_set_cursor(unsigned char x, unsigned char y);
+size_t
+tty_flush_buffer(char* data, size_t pos, size_t limit, size_t buf_size);

 
 

-void tty_sync_cursor();
+void
+tty_clear_line(int line_num);

 
 

+void
+tty_put_str_at(char* str, int x, int y);

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