From 798e4c1d22544be665fb0880d9c401321281d7af Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Sun, 29 Oct 2023 00:52:05 +0200
Subject: [PATCH] Cleanup MM subsystem headers

---
 sdk/xtdk/amd64/mmfuncs.h     |  4 ----
 sdk/xtdk/i686/mmfuncs.h      |  4 ----
 sdk/xtdk/mmfuncs.h           | 10 ----------
 xtoskrnl/includes/amd64/mm.h | 20 ++++++++++++++++++++
 xtoskrnl/includes/i686/mm.h  | 20 ++++++++++++++++++++
 xtoskrnl/includes/mm.h       | 26 ++++++++++++++++++++++++++
 xtoskrnl/includes/xtos.h     |  2 ++
 7 files changed, 68 insertions(+), 18 deletions(-)
 create mode 100644 xtoskrnl/includes/amd64/mm.h
 create mode 100644 xtoskrnl/includes/i686/mm.h
 create mode 100644 xtoskrnl/includes/mm.h

diff --git a/sdk/xtdk/amd64/mmfuncs.h b/sdk/xtdk/amd64/mmfuncs.h
index efad6bd9..68f3894b 100644
--- a/sdk/xtdk/amd64/mmfuncs.h
+++ b/sdk/xtdk/amd64/mmfuncs.h
@@ -12,9 +12,5 @@
 #include <xtbase.h>
 
 
-XTFASTCALL
-VOID
-MmZeroPages(IN PVOID Address,
-            IN ULONG Size);
 
 #endif /* __XTDK_AMD64_MMFUNCS_H */
diff --git a/sdk/xtdk/i686/mmfuncs.h b/sdk/xtdk/i686/mmfuncs.h
index ffa2f8ce..efc2fde8 100644
--- a/sdk/xtdk/i686/mmfuncs.h
+++ b/sdk/xtdk/i686/mmfuncs.h
@@ -12,9 +12,5 @@
 #include <xtbase.h>
 
 
-XTFASTCALL
-VOID
-MmZeroPages(IN PVOID Address,
-            IN ULONG Size);
 
 #endif /* __XTDK_I686_MMFUNCS_H */
diff --git a/sdk/xtdk/mmfuncs.h b/sdk/xtdk/mmfuncs.h
index 8377fe02..dfa74ea4 100644
--- a/sdk/xtdk/mmfuncs.h
+++ b/sdk/xtdk/mmfuncs.h
@@ -12,15 +12,5 @@
 #include <xtbase.h>
 
 
-XTAPI
-XTSTATUS
-MmAllocateKernelStack(IN PVOID *Stack,
-                      IN BOOLEAN LargeStack,
-                      IN UCHAR SystemNode);
-
-XTAPI
-VOID
-MmFreeKernelStack(IN PVOID Stack,
-                  IN BOOLEAN LargeStack);
 
 #endif /* __XTDK_MMFUNCS_H */
diff --git a/xtoskrnl/includes/amd64/mm.h b/xtoskrnl/includes/amd64/mm.h
new file mode 100644
index 00000000..cfb606f3
--- /dev/null
+++ b/xtoskrnl/includes/amd64/mm.h
@@ -0,0 +1,20 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/amd64/mm.h
+ * DESCRIPTION:     XT memory manager routines specific to AMD64 architecture
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_AMD64_MM_H
+#define __XTOSKRNL_AMD64_MM_H
+
+#include <xtos.h>
+
+
+XTFASTCALL
+VOID
+MmZeroPages(IN PVOID Address,
+            IN ULONG Size);
+
+#endif /* __XTOSKRNL_AMD64_MM_H */
diff --git a/xtoskrnl/includes/i686/mm.h b/xtoskrnl/includes/i686/mm.h
new file mode 100644
index 00000000..42857ceb
--- /dev/null
+++ b/xtoskrnl/includes/i686/mm.h
@@ -0,0 +1,20 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/i686/mm.h
+ * DESCRIPTION:     XT memory manager routines specific to i686 architecture
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_I686_MM_H
+#define __XTOSKRNL_I686_MM_H
+
+#include <xtos.h>
+
+
+XTFASTCALL
+VOID
+MmZeroPages(IN PVOID Address,
+            IN ULONG Size);
+
+#endif /* __XTOSKRNL_I686_MM_H */
diff --git a/xtoskrnl/includes/mm.h b/xtoskrnl/includes/mm.h
new file mode 100644
index 00000000..7d46b513
--- /dev/null
+++ b/xtoskrnl/includes/mm.h
@@ -0,0 +1,26 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/mm.h
+ * DESCRIPTION:     Private routine definitions for memory manager
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_MM_H
+#define __XTOSKRNL_MM_H
+
+#include <xtos.h>
+
+
+XTAPI
+XTSTATUS
+MmAllocateKernelStack(IN PVOID *Stack,
+                      IN BOOLEAN LargeStack,
+                      IN UCHAR SystemNode);
+
+XTAPI
+VOID
+MmFreeKernelStack(IN PVOID Stack,
+                  IN BOOLEAN LargeStack);
+
+#endif /* __XTOSKRNL_MM_H */
diff --git a/xtoskrnl/includes/xtos.h b/xtoskrnl/includes/xtos.h
index d2dc8d93..ee2a309a 100644
--- a/xtoskrnl/includes/xtos.h
+++ b/xtoskrnl/includes/xtos.h
@@ -16,10 +16,12 @@
 #include "globals.h"
 #include "hl.h"
 #include "ke.h"
+#include "mm.h"
 #include "po.h"
 #include "rtl.h"
 
 #include ARCH_HEADER(globals.h)
 #include ARCH_HEADER(ar.h)
 #include ARCH_HEADER(ke.h)
+#include ARCH_HEADER(mm.h)
 #include ARCH_HEADER(rtl.h)