1 files changed, 7 insertions, 12 deletions
diff --git a/kernel/include/drivers/vga_text_buffer.h b/kernel/include/drivers/vga_text_buffer.h
index 389c864..0961536 100644
--- a/kernel/include/drivers/vga_text_buffer.h
+++ b/kernel/include/drivers/vga_text_buffer.h
@@ -34,18 +34,15 @@
  * bg   fg
  * 1110 0101
  */
-#define vga_entry_color(fg, bg) (bg << 4 | fg)
+#define VGA_ENTRY_COLOR(fg, bg) (bg << 4 | fg)
 
 /*
  * color     character
  * 1110 0101 1001 1010
  */
-#define vga_entry(character, color)                                           \
+#define VGA_ENTRY(character, color)                                           \
   ((uint16_t) color << 8 | (uint16_t) character)
 
-namespace VGATextBuffer
-{
-
 /* Hardware text mode color constants. */
 typedef enum {
   COLOR_BLACK = 0,
@@ -64,13 +61,11 @@ typedef enum {
   COLOR_LIGHT_MAGENTA = 13,
   COLOR_LIGHT_BROWN = 14,
   COLOR_WHITE = 15
-} colors;
-
-void initialize(void);
-void write_char(const char);
-void write_string(const char *string);
-void printf(const char *string, ...);
+} vgatb_colors;
 
-}
+void vgatb_initialize(void);
+void vgatb_write_char(const char);
+void vgatb_write_string(const char *string);
+void vgatb_printf(const char *string, ...);
 
 #endif