From 0811c4fabe20726cc180c0631b712a14d07f858a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Wed, 8 May 2013 15:36:38 +0000
Subject: [PATCH] [KDROSDBG-NTOS] Put the 3 helper COM functions into KDBG
 directly.

svn path=/branches/kd++/; revision=58970
---
 drivers/base/kdrosdbg/CMakeLists.txt          |  7 -------
 drivers/base/kdrosdbg/kdrosdbg.spec           | 21 +++++++------------
 ntoskrnl/CMakeLists.txt                       |  4 ++++
 .../base/kdrosdbg => ntoskrnl/kd}/arm/kdbg.c  | 17 +++++++--------
 .../base/kdrosdbg => ntoskrnl/kd}/i386/kdbg.c | 18 ++++++++--------
 5 files changed, 29 insertions(+), 38 deletions(-)
 rename {drivers/base/kdrosdbg => ntoskrnl/kd}/arm/kdbg.c (92%)
 rename {drivers/base/kdrosdbg => ntoskrnl/kd}/i386/kdbg.c (95%)

diff --git a/drivers/base/kdrosdbg/CMakeLists.txt b/drivers/base/kdrosdbg/CMakeLists.txt
index 0b1746abfde..038ccdbb41b 100644
--- a/drivers/base/kdrosdbg/CMakeLists.txt
+++ b/drivers/base/kdrosdbg/CMakeLists.txt
@@ -1,13 +1,6 @@
 
 spec2def(kdcom.dll kdrosdbg.spec ADD_IMPORTLIB)
 
-if(ARCH STREQUAL "i386")
-    list(APPEND SOURCE i386/kdbg.c)
-elseif(ARCH STREQUAL "amd64")
-    list(APPEND SOURCE i386/kdbg.c)
-elseif(ARCH STREQUAL "arm")
-    list(APPEND SOURCE arm/kdbg.c)
-endif(ARCH STREQUAL "i386")
 list(APPEND SOURCE
     kdrosdbg.c
     kdrosdbg.rc
diff --git a/drivers/base/kdrosdbg/kdrosdbg.spec b/drivers/base/kdrosdbg/kdrosdbg.spec
index d21ce30dbec..4098dd6e2ad 100644
--- a/drivers/base/kdrosdbg/kdrosdbg.spec
+++ b/drivers/base/kdrosdbg/kdrosdbg.spec
@@ -1,13 +1,8 @@
-1 stdcall KdD0Transition()
-2 stdcall KdD3Transition()
-3 stdcall KdDebuggerInitialize0(ptr)
-4 stdcall KdDebuggerInitialize1(ptr)
-5 stdcall KdReceivePacket(long ptr ptr ptr ptr)
-6 stdcall KdRestore(long)
-7 stdcall KdSave(long)
-8 stdcall KdSendPacket(long ptr ptr ptr)
-
-; Legacy KD
-@ stdcall KdPortInitializeEx(ptr long)
-@ stdcall KdPortGetByteEx(ptr ptr)
-@ stdcall KdPortPutByteEx(ptr long)
+@ stdcall KdD0Transition()
+@ stdcall KdD3Transition()
+@ stdcall KdDebuggerInitialize0(ptr)
+@ stdcall KdDebuggerInitialize1(ptr)
+@ stdcall KdReceivePacket(long ptr ptr ptr ptr)
+@ stdcall KdRestore(long)
+@ stdcall KdSave(long)
+@ stdcall KdSendPacket(long ptr ptr ptr)
diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt
index 381b7bcee59..391868aecd5 100644
--- a/ntoskrnl/CMakeLists.txt
+++ b/ntoskrnl/CMakeLists.txt
@@ -363,6 +363,7 @@ endif()
 if(NOT _WINKD_)
     if(ARCH STREQUAL "i386")
         list(APPEND SOURCE
+            kd/i386/kdbg.c
             kd/i386/kdmemsup.c
             kd/wrappers/gdbstub.c)
         if(KDBG)
@@ -372,6 +373,7 @@ if(NOT _WINKD_)
     elseif(ARCH STREQUAL "amd64")
         list(APPEND SOURCE
             kd/amd64/kd.c
+            kd/i386/kdbg.c  # Use the x86 file
             kd/amd64/kdmemsup.c)
         if(KDBG)
             list(APPEND ASM_SOURCE kdbg/amd64/kdb_help.S)
@@ -379,6 +381,8 @@ if(NOT _WINKD_)
                 kdbg/amd64/i386-dis.c
                 kdbg/amd64/kdb.c)
         endif()
+    elseif(ARCH STREQUAL "arm")
+        list(APPEND SOURCE kd/arm/kdbg.c)
     elseif(ARCH STREQUAL "powerpc")
         list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c)
     endif()
diff --git a/drivers/base/kdrosdbg/arm/kdbg.c b/ntoskrnl/kd/arm/kdbg.c
similarity index 92%
rename from drivers/base/kdrosdbg/arm/kdbg.c
rename to ntoskrnl/kd/arm/kdbg.c
index 425c47c37c6..375ddcbf867 100644
--- a/drivers/base/kdrosdbg/arm/kdbg.c
+++ b/ntoskrnl/kd/arm/kdbg.c
@@ -8,16 +8,8 @@
 
 /* INCLUDES *******************************************************************/
 
-#define NOEXTAPI
-#include <ntifs.h>
-#include <arc/arc.h>
-#include <halfuncs.h>
-#include <windbgkd.h>
-#include <ioaccess.h> /* port intrinsics */
-#include <cportlib/cportlib.h>
+#include <ntoskrnl.h>
 #include <arm/peripherals/pl011.h>
-#include <stdio.h>
-
 #define NDEBUG
 #include <debug.h>
 
@@ -33,6 +25,13 @@ CPPORT DefaultPort = {0, 0, 0};
 
 /* REACTOS FUNCTIONS **********************************************************/
 
+NTSTATUS
+NTAPI
+KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
+{
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 BOOLEAN
 NTAPI
 KdPortInitializeEx(IN PCPPORT PortInformation,
diff --git a/drivers/base/kdrosdbg/i386/kdbg.c b/ntoskrnl/kd/i386/kdbg.c
similarity index 95%
rename from drivers/base/kdrosdbg/i386/kdbg.c
rename to ntoskrnl/kd/i386/kdbg.c
index 12a54b78eac..93084d69b68 100644
--- a/drivers/base/kdrosdbg/i386/kdbg.c
+++ b/ntoskrnl/kd/i386/kdbg.c
@@ -9,15 +9,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NOEXTAPI
-#include <ntifs.h>
-#include <arc/arc.h>
-#include <halfuncs.h>
-#include <windbgkd.h>
-#include <ioaccess.h> /* port intrinsics */
-#include <cportlib/cportlib.h>
-#include <stdio.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <debug.h>
 
@@ -46,6 +38,14 @@ const ULONG BaseArray[] = {0, 0xF1012000};
 
 /* REACTOS FUNCTIONS **********************************************************/
 
+NTSTATUS
+NTAPI
+KdDebuggerInitialize1(
+    IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
+{
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 BOOLEAN
 NTAPI
 KdPortInitializeEx(