From 0a47d43644191aeac522a51ad0ac0861ac1a890a Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Thu, 18 Jan 2024 14:32:40 +0100
Subject: [PATCH] Move target specific code

---
 sdk/xtdk/bltarget.h | 32 ++++++++++++++++++++++++++++++++
 sdk/xtdk/bltypes.h  | 17 -----------------
 sdk/xtdk/xtblapi.h  |  1 +
 3 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 sdk/xtdk/bltarget.h

diff --git a/sdk/xtdk/bltarget.h b/sdk/xtdk/bltarget.h
new file mode 100644
index 0000000..99b6611
--- /dev/null
+++ b/sdk/xtdk/bltarget.h
@@ -0,0 +1,32 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            sdk/xtdk/bltarget.h
+ * DESCRIPTION:     XT Boot Loader target architecture specific definitions
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTDK_BLTARGET_H
+#define __XTDK_BLTARGET_H
+
+#include <xttypes.h>
+
+
+/* Boot Loader module segment macros */
+#define XTBL_MODDEPS                                                SEGMENT(".moddeps") CONST WCHAR XtBlpDeps[][8]
+#define XTBL_MODINFO                                                SEGMENT(".modinfo") CONST WCHAR XtBlpInfo[]
+
+/* Architecture specific definitions */
+#if defined(__i386__) || defined(__i686__)
+    #define XTBL_ARCH_LOADER_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR32\\"
+    #define XTBL_ARCH_MODULES_DIRECTORY_PATH                        L"\\EFI\\BOOT\\XTLDR32\\MODULES\\"
+    #define XTBL_ARCH_THEMES_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR32\\THEMES\\"
+#elif defined(__amd64__) || defined(__x86_64__)
+    #define XTBL_ARCH_LOADER_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR64\\"
+    #define XTBL_ARCH_MODULES_DIRECTORY_PATH                        L"\\EFI\\BOOT\\XTLDR64\\MODULES\\"
+    #define XTBL_ARCH_THEMES_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR64\\THEMES\\"
+#else
+    #error Unknown architecture
+#endif
+
+#endif /* __XTDK_BLTARGET_H */
diff --git a/sdk/xtdk/bltypes.h b/sdk/xtdk/bltypes.h
index 5b739a1..719950a 100644
--- a/sdk/xtdk/bltypes.h
+++ b/sdk/xtdk/bltypes.h
@@ -16,28 +16,11 @@
 #include ARCH_HEADER(xtstruct.h)
 
 
-/* Architecture specific definitions */
-#if defined(__i386__) || defined(__i686__)
-    #define XTBL_ARCH_LOADER_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR32\\"
-    #define XTBL_ARCH_MODULES_DIRECTORY_PATH                        L"\\EFI\\BOOT\\XTLDR32\\MODULES\\"
-    #define XTBL_ARCH_THEMES_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR32\\THEMES\\"
-#elif defined(__amd64__) || defined(__x86_64__)
-    #define XTBL_ARCH_LOADER_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR64\\"
-    #define XTBL_ARCH_MODULES_DIRECTORY_PATH                        L"\\EFI\\BOOT\\XTLDR64\\MODULES\\"
-    #define XTBL_ARCH_THEMES_DIRECTORY_PATH                         L"\\EFI\\BOOT\\XTLDR64\\THEMES\\"
-#else
-    #error Unknown architecture
-#endif
-
 /* XTLDR directories */
 #define XTBL_LOADER_DIRECTORY_PATH                                  L"\\EFI\\BOOT\\XTLDR\\"
 #define XTBL_MODULES_DIRECTORY_PATH                                 L"\\EFI\\BOOT\\XTLDR\\MODULES\\"
 #define XTBL_THEMES_DIRECTORY_PATH                                  L"\\EFI\\BOOT\\XTLDR\\THEMES\\"
 
-/* XTLDR module segment macros */
-#define XTBL_MODDEPS                                                SEGMENT(".moddeps") CONST WCHAR XtBlpDeps[][8]
-#define XTBL_MODINFO                                                SEGMENT(".modinfo") CONST WCHAR XtBlpInfo[]
-
 /* EFI XT boot devices */
 #define XTBL_BOOT_DEVICE_UNKNOWN                                    0x00
 #define XTBL_BOOT_DEVICE_CDROM                                      0x01
diff --git a/sdk/xtdk/xtblapi.h b/sdk/xtdk/xtblapi.h
index e13f9c4..5d00676 100644
--- a/sdk/xtdk/xtblapi.h
+++ b/sdk/xtdk/xtblapi.h
@@ -46,5 +46,6 @@
 #include ARCH_HEADER(hlfuncs.h)
 
 /* Boot Manager specific structures */
+#include <bltarget.h>
 #include <bltypes.h>
 #include <blfuncs.h>