Further celanup and a little modularization

1 files changed, 19 insertions, 10 deletions

diff --git a/kernel/console.h b/kernel/console.h
index a8b2b86..44fdca9 100644
--- a/kernel/console.h
+++ b/kernel/console.h
@@ -1,7 +1,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include <stdint.h> //needed for uint16_t
+#include "kernel.h"
 
 #define SCR_VIDEOMEM 0xb8000
 
@@ -11,20 +11,29 @@
 #define SCR_CTRL 0x3D4
 #define SCR_DATA 0x3D5
 
-#define SCR_BLACK 0x0
-#define SCR_BLUE 0x1
-#define SCR_GREEN 0x2
-#define SCR_CYAN 0x3
-#define SCR_RED 0x4
-
-// TODO: more colors here...
-# define SCR_WHITE 0xf
+// colors
+#define SCR_BLACK   0x0
+#define SCR_BLUE    0x1
+#define SCR_GREEN   0x2
+#define SCR_CYAN    0x3
+#define SCR_RED	    0x4
+#define SCR_VIOLET  0x5
+#define SCR_BROWN   0x6
+#define SCR_GRAY1   0x7
+#define SCR_GRAY2   0x8
+#define SCR_LBLUE   0x9
+#define SCR_LGREEN  0xa
+#define SCR_LCYAN   0xb
+#define SCR_LRED    0xc
+#define SCR_PINK    0xd
+#define SCR_YELLOW  0xe
+#define SCR_WHITE   0xf
 
 //autoscroll
 void scr_clear();
 void scr_nextline();
 void scr_put_string(char *str);
+void scr_put_string_nl(char *str);
 void scr_put_hex(uint16_t val);
-//void scr_put_int(uint16_t int);
 
 #endif