X-Git-Url: http://git.dujemihanovic.xyz/projects?a=blobdiff_plain;f=kernel%2Farch%2Fx86%2Ftty%2Ftty.c;h=07d734e54fc00f1919e51e0efe624271158c2e01;hb=3568adbeba1623a28e80fa3680a2286fd48b0ed3;hp=d3ef87b1d862290002347932aaa03c8b02f2e4b0;hpb=9ef60208fec0c672248023d467f57eecd6e7214f;p=nameless-os.git

diff --git a/kernel/arch/x86/tty/tty.c b/kernel/arch/x86/tty/tty.c
index d3ef87b..07d734e 100644
--- a/kernel/arch/x86/tty/tty.c
+++ b/kernel/arch/x86/tty/tty.c
@@ -1,17 +1,23 @@
+#include <io.h>
+#include <tty.h>
+#include <stdint.h>
+
 #define VGA_WIDTH 80
 #define VGA_HEIGHT 25
 
 volatile char *video_memory = (char *) 0xB8000; /* VGA VRAM starts at 0xB8000 */
 
-static int cursor_x = 0;
+static int cursor_x = 0; /* keep track of where cursor is */
 static int cursor_y = 0;
 
+char *hex_chars = "0123456789ABCDEF";
+
 void screen_clear(void)
 {
 	int x, y;
 	for ( y = 0; y < VGA_HEIGHT; y++ ) {
 		for ( x = 0; x < VGA_WIDTH; x++ ) {
-			video_memory[(y * VGA_WIDTH + x) * 2 + 1] = 0x07;
+			video_memory[(y * VGA_WIDTH + x) * 2 + 1] = VGA_COLOR_LIGHT_GRAY;
 			video_memory[(y * VGA_WIDTH + x) * 2] = ' ';
 		}
 	}
@@ -34,16 +40,100 @@ void scroll_up(void)
 	cursor_y = VGA_HEIGHT - 1;
 }
 
-void kprint(const char *string)
+void kprint(const char *string, uint8_t color)
 {
 	char next_char;
+	uint8_t vga_misc_output;
+	uint16_t crtc_port;
 	next_char = *string;
 
 	while ( next_char != 0 ) {
 		if ( next_char == '\n') { cursor_x = 0; cursor_y++; }
-		else { video_memory[(cursor_y * VGA_WIDTH + cursor_x++) * 2] = next_char; }
+		else { video_memory[(cursor_y * VGA_WIDTH + cursor_x) * 2] = next_char; video_memory[((cursor_y * VGA_WIDTH + cursor_x++) * 2)+ 1] = color != 0 ? color : VGA_COLOR_LIGHT_GRAY; }
 		if ( cursor_x >= VGA_WIDTH ) { cursor_x = 0; cursor_y++; }
 		if ( cursor_y >= VGA_HEIGHT ) { scroll_up(); }
 		next_char = *++string;
 	}
+
+	vga_misc_output = inb(0x3CC);
+	if (vga_misc_output & 0x1 == 0) {
+		crtc_port = 0x3B4;
+	} else {
+		crtc_port = 0x3D4;
+	}
+
+	outb(crtc_port, 0xE);
+	outb(crtc_port + 1, (cursor_y * VGA_WIDTH + cursor_x) >> 8);
+	outb(crtc_port, 0xF);
+	outb(crtc_port + 1, (cursor_y * VGA_WIDTH + cursor_x) & 0xFF);
+}
+
+void kprintc(const char character, uint8_t color)
+{
+	uint8_t vga_misc_output;
+	uint16_t crtc_port;
+
+	if ( character == '\n') { cursor_x = 0; cursor_y++; }
+	else { video_memory[(cursor_y * VGA_WIDTH + cursor_x) * 2] = character; video_memory[((cursor_y * VGA_WIDTH + cursor_x++) * 2)+ 1] = color != 0 ? color : VGA_COLOR_LIGHT_GRAY; }
+	if ( cursor_x >= VGA_WIDTH ) { cursor_x = 0; cursor_y++; }
+	if ( cursor_y >= VGA_HEIGHT ) { scroll_up(); }
+
+	vga_misc_output = inb(0x3CC);
+	if (vga_misc_output & 0x1 == 0) {
+		crtc_port = 0x3B4;
+	} else {
+		crtc_port = 0x3D4;
+	}
+
+	outb(crtc_port, 0xE);
+	outb(crtc_port + 1, (cursor_y * VGA_WIDTH + cursor_x) >> 8);
+	outb(crtc_port, 0xF);
+	outb(crtc_port + 1, (cursor_y * VGA_WIDTH + cursor_x) & 0xFF);
+
+}
+
+void kprintb(uint8_t byte)
+{
+	uint8_t temp;
+	temp = byte >> 4;
+	kprint("0x", VGA_COLOR_LIGHT_GRAY);
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = byte & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+}
+
+void kprintw(uint16_t word)
+{
+	uint8_t temp;
+	temp = word >> 12;
+	kprint("0x", VGA_COLOR_LIGHT_GRAY);
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (word >> 8) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (word >> 4) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = word & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+}
+
+void kprintd(uint32_t dword)
+{
+	uint8_t temp;
+	temp = dword >> 28;
+	kprint("0x", VGA_COLOR_LIGHT_GRAY);
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (dword >> 24) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (dword >> 20) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (dword >> 16) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (dword >> 12) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (dword >> 8) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = (dword >> 4) & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
+	temp = dword & 0xF;
+	kprintc(hex_chars[temp], VGA_COLOR_LIGHT_GRAY);
 }