2 files changed, 6 insertions, 14 deletions
diff --git a/dev/kernel/ArchKit/ArchKit.h b/dev/kernel/ArchKit/ArchKit.h
index 8e225bf2..bc3447fc 100644
--- a/dev/kernel/ArchKit/ArchKit.h
+++ b/dev/kernel/ArchKit/ArchKit.h
@@ -93,8 +93,8 @@ inline Kernel::Array<HAL_KERNEL_DISPATCH_ENTRY, kMaxDispatchCallCount> kKernCall
 
 #ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 
-inline Kernel::VoidPtr kKernelVM     = nullptr;
+inline Kernel::VoidPtr kKernelVM = nullptr;
 
 #endif  // __NE_VIRTUAL_MEMORY_SUPPORT__
 
-inline Kernel::SizeT   kBitMapCursor = 0UL;
+inline Kernel::SizeT kBitMapCursor = 0UL;
diff --git a/dev/kernel/KernelKit/DebugOutput.h b/dev/kernel/KernelKit/DebugOutput.h
index 992d1ca7..d2839341 100644
--- a/dev/kernel/KernelKit/DebugOutput.h
+++ b/dev/kernel/KernelKit/DebugOutput.h
@@ -12,18 +12,6 @@
 #include <NeKit/Stream.h>
 #include <NeKit/Utils.h>
 
-#define kDebugPort (51820U)
-
-#define kDebugMag0 'K'
-#define kDebugMag1 'D'
-#define kDebugMag2 'B'
-#define kDebugMag3 'G'
-
-#define kDebugSourceFile 23
-#define kDebugLine 33
-#define kDebugTeam 43
-#define kDebugEOP 49
-
 namespace Kernel {
 class TerminalDevice;
 class DTraceDevice;
@@ -180,6 +168,10 @@ inline TerminalDevice get_console_in(Char* buf) {
   return self;
 }
 
+inline constexpr auto kDebugPort    = 51820;
+inline constexpr auto kDebugMagic   = "VMK1.0.0;";
+inline constexpr auto kDebugVersion = 0x0100;
+
 inline constexpr SizeT kDebugCmdLen = 256U;
 
 typedef Char rt_debug_cmd[kDebugCmdLen];