From e8b4c2e0631426ac7ee596884d35432d02afdb57 Mon Sep 17 00:00:00 2001 From: phillid Date: Wed, 14 Aug 2013 15:53:28 +1200 Subject: Delete console.h, string.c, string.h, console.c, --- console.c | 81 --------------------------------------------------------------- console.h | 41 -------------------------------- string.c | 14 ----------- string.h | 6 ----- 4 files changed, 142 deletions(-) delete mode 100644 console.c delete mode 100644 console.h delete mode 100644 string.c delete mode 100644 string.h diff --git a/console.c b/console.c deleted file mode 100644 index 9b51a75..0000000 --- a/console.c +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef CONSOLE_C -#define CONSOLE_C - -#include - -/********************************************************* - * Set up the console buffer and pointer - ********************************************************/ -void console_init() -{ - console_buffer = (char*)0xB8000; - console_pointer = 0; -} - -/********************************************************* - * Update flashing cursor to match console_position - * Note: Does _NOT_ dictate the pos for next printed byte - ********************************************************/ -void console_update_cursor() -{ - outb(0x3D4, 0x0F); - outb(0x3D5, ((console_pointer/2) & 0xFF)); - outb(0x3D4, 0x0E); - outb(0x3D5, (((console_pointer/2)>>8)&0xFF)); -} - -/********************************************************* - * Clear the console with the current colour scheme - ********************************************************/ -void console_clear() -{ - int console_pointer; - for (console_pointer = 0; console_pointer < 4000; console_pointer++) - { - console_buffer[console_pointer] = console_color; - console_buffer[console_pointer++] = 0; - } - //console_update_cursor(); -} - - -/********************************************************* - * Set the console foreground and background colours - ********************************************************/ -void console_set_colors(uint8_t fg, uint8_t bg) -{ - console_color = (bg << 4) | fg; -} - - -/********************************************************* - * Set the console foreground colour - ********************************************************/ -void console_set_color(uint8_t fg) -{ - console_color &= 0xF0; // Zero-out foreground color - console_color |= fg; // Apply foreground color -} - -/********************************************************* - * Print a null-terminated string to the text screen - ********************************************************/ -void console_print(char *string) -{ - uint16_t i; - for (i = 0; i < strlen(string); i++) - { - // If special char, handle appropriately - if (string[i] < 32) - { - switch (string[i]) - case 10: - console_pointer = 160 + (console_pointer / 160) * 160; - } else { - console_buffer[console_pointer++] = string[i]; - console_buffer[console_pointer++] = console_color; - } - } - console_update_cursor(); -} -#endif \ No newline at end of file diff --git a/console.h b/console.h deleted file mode 100644 index 85dd5d6..0000000 --- a/console.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef __CONSOLE_H -#define __CONSOLE_H - -#define console_width 80 -#define console_height 25 -#define console_x_pos (console_pointer%(2*console_width)) -#define console_y_pos (uint8_t)(console_pointer/(2*console_width)) - -#define COLOR_BLACK 0x0 -#define COLOR_BLUE 0x1 -#define COLOR_GREEN 0x2 -#define COLOR_TEAL 0x3 -#define COLOR_BROWN 0x4 -#define COLOR_PURPLE 0x5 -#define COLOR_GOLD 0x6 -#define COLOR_BRIGHT_GREY 0x7 -#define COLOR_BRIGHT_GRAY 0x7 // Alias for grey vs gray -#define COLOR_GRAY 0x8 -#define COLOR_GREY 0x8 // Alias for grey vs gray -#define COLOR_BRIGHT_BLUE 0x9 -#define COLOR_BRIGHT_GREEN 0xA -#define COLOR_LIME 0xA // Alias for lime vs bright green -#define COLOR_AQUA 0xB -#define COLOR_RED 0xC -#define COLOR_PINK 0xD -#define COLOR_YELLOW 0xE -#define COLOR_WHITE 0xF - - -char* console_buffer; -uint16_t console_pointer; -uint8_t console_color; - -void console_init(); -void console_update_cursor(); -void console_clear(); -void console_set_colors(uint8_t fg, uint8_t bg); -void console_set_color(uint8_t fg); -void console_print(char *string); - -#endif \ No newline at end of file diff --git a/string.c b/string.c deleted file mode 100644 index 14bee28..0000000 --- a/string.c +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef STRING_C -#define STRING_C - -#include - -uint64_t strlen(char *string) -{ - uint64_t l = 0; - while (string[l] != 0) - l++; - return l; -} - -#endif diff --git a/string.h b/string.h deleted file mode 100644 index 41956c5..0000000 --- a/string.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef STRING_H -#define STRING_H - -uint64_t strlen(char *string); - -#endif \ No newline at end of file -- cgit v1.1