Remove utility.*

src/boot/console.cpp

@@ -7,7 +7,6 @@
 
 #include "console.h"
 #include "error.h"
-#include "utility.h"
 
 #ifndef GIT_VERSION_WIDE
 #define GIT_VERSION_WIDE L"no version"
@@ -39,6 +38,16 @@ status_line *status_line::s_current = nullptr;
 static const wchar_t digits[] = {u'0', u'1', u'2', u'3', u'4', u'5',
 	u'6', u'7', u'8', u'9', u'a', u'b', u'c', u'd', u'e', u'f'};
 
+
+static size_t
+wstrlen(const wchar_t *s)
+{
+	size_t count = 0;
+	while (s && *s++) count++;
+	return count;
+}
+
+
 console::console(uefi::boot_services *bs, uefi::protos::simple_text_output *out) :
 	m_rows(0),
 	m_cols(0),

src/boot/memory.cpp

@@ -4,7 +4,6 @@
 #include "error.h"
 #include "console.h"
 #include "memory.h"
-#include "utility.h"
 
 namespace boot {
 namespace memory {

src/boot/utility.cpp

@@ -1,10 +0,0 @@
-#include "utility.h"
-
-size_t
-wstrlen(const wchar_t *s)
-{
-	size_t count = 0;
-	while (s && *s++) count++;
-	return count;
-}
-

src/boot/utility.h

@@ -1,14 +0,0 @@
-#include <stdint.h>
-#include <uefi/types.h>
-
-#include "console.h"
-
-#define UNUSED __attribute__((unused))
-
-size_t wstrlen(const wchar_t *s);
-
-#ifdef BOOTLOADER_DEBUG
-#define con_debug(msg, ...) console::print(L"DEBUG: " msg L"\r\n", __VA_ARGS__)
-#else
-#define con_debug(msg, ...)
-#endif