VESA: move debugging code to separate header file

Move the debugging function to a separate header file, so we can
include it at will when convenient.

2 files changed, 38 insertions, 25 deletions

diff --git a/com32/lib/sys/vesa/debug.h b/com32/lib/sys/vesa/debug.h
new file mode 100644
index 00000000..50fed465
--- /dev/null
+++ b/com32/lib/sys/vesa/debug.h
@@ -0,0 +1,36 @@
+#ifndef LIB_SYS_VESA_DEBUG_H
+#define LIB_SYS_VESA_DEBUG_H
+
+#if 0
+
+#include <stdio.h>
+#include <unistd.h>
+
+ssize_t __serial_write(void *fp, const void *buf, size_t count);
+
+static void debug(const char *str, ...)
+{
+  va_list va;
+  char buf[65536];
+  size_t len;
+
+  va_start(va, str);
+  len = vsnprintf(buf, sizeof buf, str, va);
+  va_end(va);
+
+  if (len >= sizeof buf)
+    len = sizeof buf - 1;
+
+  __serial_write(NULL, buf, len);
+}
+
+#else
+
+static inline void debug(const char *str, ...)
+{
+  (void)str;
+}
+
+#endif
+
+#endif /* LIB_SYS_VESA_DEBUG_H */
diff --git a/com32/lib/sys/vesa/initvesa.c b/com32/lib/sys/vesa/initvesa.c
index b5aba989..98888d32 100644
--- a/com32/lib/sys/vesa/initvesa.c
+++ b/com32/lib/sys/vesa/initvesa.c
@@ -34,14 +34,13 @@
 
 #include <inttypes.h>
 #include <com32.h>
-#include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <string.h>
 #include <sys/fpu.h>
 #include "vesa.h"
 #include "video.h"
 #include "fill.h"
+#include "debug.h"
 
 struct vesa_info __vesa_info;
 
@@ -54,28 +53,6 @@ uint8_t __vesacon_graphics_font[FONT_MAX_CHARS][FONT_MAX_HEIGHT];
 
 uint32_t __vesacon_background[VIDEO_Y_SIZE][VIDEO_X_SIZE];
 
-ssize_t __serial_write(void *fp, const void *buf, size_t count);
-
-static inline void debug(const char *str, ...)
-{
-#if 0
-  va_list va;
-  char buf[65536];
-  size_t len;
-
-  va_start(va, str);
-  len = vsnprintf(buf, sizeof buf, str, va);
-  va_end(va);
-
-  if (len >= sizeof buf)
-    len = sizeof buf - 1;
-
-  __serial_write(NULL, buf, len);
-#else
-  (void)str;
-#endif
-}
-
 static void unpack_font(uint8_t *dst, uint8_t *src, int height)
 {
   int i;