From aa7db0c50f6db870640888d03a79b5cf4549eddc Mon Sep 17 00:00:00 2001
From: n2-krishna <nithesh2.krishna@live.uwe.ac.uk>
Date: Sat, 27 Mar 2021 00:49:13 +0000
Subject: [PATCH] Update kernel.c
---
kernel.c | 50 +++++++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/kernel.c b/kernel.c
index e41db16..9d4f33a 100644
--- a/kernel.c
+++ b/kernel.c
@@ -18,33 +18,33 @@
#endif
/* Hardware text mode color constants. */
-enum vga_color {
- COLOR_BLACK = 0,
- COLOR_BLUE = 1,
- COLOR_GREEN = 2,
- COLOR_CYAN = 3,
- COLOR_RED = 4,
- COLOR_MAGENTA = 5,
- COLOR_BROWN = 6,
- COLOR_LIGHT_GREY = 7,
- COLOR_DARK_GREY = 8,
- COLOR_LIGHT_BLUE = 9,
- COLOR_LIGHT_GREEN = 10,
- COLOR_LIGHT_CYAN = 11,
- COLOR_LIGHT_RED = 12,
- COLOR_LIGHT_MAGENTA = 13,
- COLOR_LIGHT_BROWN = 14,
- COLOR_WHITE = 15,
+enum vga_colour {
+ COLOUR_BLACK = 0,
+ COLOUR_BLUE = 1,
+ COLOUR_GREEN = 2,
+ COLOUR_CYAN = 3,
+ COLOUR_RED = 4,
+ COLOUR_MAGENTA = 5,
+ COLOUR_BROWN = 6,
+ COLOUR_LIGHT_GREY = 7,
+ COLOUR_DARK_GREY = 8,
+ COLOUR_LIGHT_BLUE = 9,
+ COLOUR_LIGHT_GREEN = 10,
+ COLOUR_LIGHT_CYAN = 11,
+ COLOUR_LIGHT_RED = 12,
+ COLOUR_LIGHT_MAGENTA = 13,
+ COLOUR_LIGHT_BROWN = 14,
+ COLOUR_WHITE = 15,
};
-uint8_t make_color(enum vga_color fg, enum vga_color bg) {
+uint8_t make_Colour(enum vga_color fg, enum vga_colour bg) {
return fg | bg << 4;
}
-uint16_t make_vgaentry(char c, uint8_t color) {
+uint16_t make_vgaentry(char c, uint8_t colour) {
uint16_t c16 = c;
- uint16_t color16 = color;
- return c16 | color16 << 8;
+ uint16_t colour16 = colour;
+ return c16 | colour16 << 8;
}
size_t strlen(const char* str) {
@@ -57,10 +57,10 @@ size_t strlen(const char* str) {
static const size_t VGA_WIDTH = 80;
static const size_t VGA_HEIGHT = 25;
-size_t terminal_row;
-size_t terminal_column;
-uint8_t terminal_color;
-uint16_t* terminal_buffer;
+size_t terminal_Row;
+size_t terminal_Column;
+uint8_t terminal_Colour;
+uint16_t* terminal_Buffer;
void terminal_initialize() {
terminal_row = 0;
--
GitLab