From 2da088f031206c3a9dd4ff20140c9a0d00dbbae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Thu, 15 Feb 2018 10:22:16 +0100
Subject: [PATCH] Clean up interface

---
 src/kernel/drivers/vga.c   | 13 +++++++++++++
 src/kernel/include/debug.h |  9 +++------
 src/kernel/include/vga.h   | 13 -------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/kernel/drivers/vga.c b/src/kernel/drivers/vga.c
index 79cbc7e..2b7282b 100644
--- a/src/kernel/drivers/vga.c
+++ b/src/kernel/drivers/vga.c
@@ -2,6 +2,19 @@
 #include <memory.h>
 #include <ports.h>
 
+#define VGA_COLS 80
+#define VGA_ROWS 24
+#define VGA_SIZE (VGA_COLS*VGA_ROWS)
+
+#define VGA_ROW(pos) ((pos)/VGA_COLS)
+#define VGA_COL(pos) ((pos)%VGA_COLS)
+#define VGA_POS(row, col) ((row)*VGA_COLS + (col))
+
+#define VGA_ADDRESS_PORT 0x3D4
+#define VGA_DATA_PORT 0x3D5
+#define VGA_REGISTER_CURSOR_POS_LOW 0xF
+#define VGA_REGISTER_CURSOR_POS_HIGH 0xE
+
 void *vidmem;
 struct vga_cell{
   uint8_t c;
diff --git a/src/kernel/include/debug.h b/src/kernel/include/debug.h
index f2716b0..51a80ff 100644
--- a/src/kernel/include/debug.h
+++ b/src/kernel/include/debug.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <stddef.h>
-#include <stdarg.h>
 
 #ifndef NDEBUG
 #define debug(...) debug_printf(__VA_ARGS__)
@@ -20,8 +18,7 @@
 #define debug_error(...)
 #endif
 
-void debug_putch(char c);
-void debug_putsn(char *s, size_t n);
-void debug_puts(char *s);
-void debug_vprintf(char *fmt, va_list args);
 void debug_printf(char *fmt, ...);
+void debug_puts(char *s);
+void debug_putsn(char *s, size_t n);
+void debug_putch(char c);
diff --git a/src/kernel/include/vga.h b/src/kernel/include/vga.h
index 315fc00..bddf6ba 100644
--- a/src/kernel/include/vga.h
+++ b/src/kernel/include/vga.h
@@ -1,19 +1,6 @@
 #pragma once
 
-#define VGA_COLS 80
-#define VGA_ROWS 24
-#define VGA_SIZE (VGA_COLS*VGA_ROWS)
-
-#define VGA_ROW(pos) ((pos)/VGA_COLS)
-#define VGA_COL(pos) ((pos)%VGA_COLS)
-#define VGA_POS(row, col) ((row)*VGA_COLS + (col))
-
 #define VGA_MEMORY P2V(0xB8000)
 
 void vga_init();
 void vga_write(char c);
-
-#define VGA_ADDRESS_PORT 0x3D4
-#define VGA_DATA_PORT 0x3D5
-#define VGA_REGISTER_CURSOR_POS_LOW 0xF
-#define VGA_REGISTER_CURSOR_POS_HIGH 0xE