From 4908927d8f813f21769acf3ce66255d387717f81 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: Sun, 5 May 2013 19:55:42 +0000
Subject: [PATCH] Further remove legacy, now only 3 functions remain.

svn path=/branches/kd++/; revision=58952
---
 drivers/base/kdrosdbg/arm/kdbg.c    | 22 -------------
 drivers/base/kdrosdbg/i386/kdbg.c   | 49 ++++++++++-------------------
 drivers/base/kdrosdbg/kdrosdbg.spec | 13 +++-----
 ntoskrnl/include/internal/kd.h      | 14 ---------
 4 files changed, 22 insertions(+), 76 deletions(-)

diff --git a/drivers/base/kdrosdbg/arm/kdbg.c b/drivers/base/kdrosdbg/arm/kdbg.c
index 327133699a7..38404e3c5ef 100644
--- a/drivers/base/kdrosdbg/arm/kdbg.c
+++ b/drivers/base/kdrosdbg/arm/kdbg.c
@@ -91,18 +91,6 @@ KdPortInitializeEx(IN PKD_PORT_INFORMATION PortInformation,
     return TRUE;
 }
 
-BOOLEAN
-NTAPI
-KdPortInitialize(IN PKD_PORT_INFORMATION PortInformation,
-                 IN ULONG Unknown1,
-                 IN ULONG Unknown2)
-{
-    //
-    // Call the extended version
-    //
-    return KdPortInitializeEx(PortInformation, Unknown1, Unknown2);
-}
-
 BOOLEAN
 NTAPI
 KdPortGetByteEx(IN PKD_PORT_INFORMATION PortInformation,
@@ -129,16 +117,6 @@ KdPortPutByteEx(IN PKD_PORT_INFORMATION PortInformation,
     WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend);
 }
 
-VOID
-NTAPI
-KdPortPutByte(IN UCHAR ByteToSend)
-{
-    //
-    // Call the extended version
-    //
-    KdPortPutByteEx(&DefaultPort, ByteToSend);
-}
-
 /* WINDOWS FUNCTIONS **********************************************************/
 
 NTSTATUS
diff --git a/drivers/base/kdrosdbg/i386/kdbg.c b/drivers/base/kdrosdbg/i386/kdbg.c
index c1bb13b4513..1f9cb680d79 100644
--- a/drivers/base/kdrosdbg/i386/kdbg.c
+++ b/drivers/base/kdrosdbg/i386/kdbg.c
@@ -127,16 +127,23 @@ static BOOLEAN PortInitialized = FALSE;
 
 /* FUNCTIONS ****************************************************************/
 
-/* HAL.KdPortInitialize */
+/* ReactOS-specific */
 BOOLEAN
 NTAPI
-KdPortInitialize(
+KdPortInitializeEx(
     IN PKD_PORT_INFORMATION PortInformation,
     IN ULONG Unknown1,
     IN ULONG Unknown2)
 {
     SIZE_T i;
+    ULONG ComPortBase;
     CHAR buffer[80];
+    ULONG divisor;
+    UCHAR lcr;
+
+    /*
+     * Find the port if needed
+     */
 
     if (!PortInitialized)
     {
@@ -171,34 +178,9 @@ KdPortInitialize(
         PortInitialized = TRUE;
     }
 
-    /* initialize port */
-    if (!KdPortInitializeEx(&DefaultPort, Unknown1, Unknown2))
-        return FALSE;
-
-    /* set global info */
-    KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
-
-    return TRUE;
-}
-
-
-/* HAL.KdPortInitializeEx ; ReactOS-specific */
-BOOLEAN
-NTAPI
-KdPortInitializeEx(
-    IN PKD_PORT_INFORMATION PortInformation,
-    IN ULONG Unknown1,
-    IN ULONG Unknown2)
-{
-    ULONG ComPortBase;
-    CHAR buffer[80];
-    ULONG divisor;
-    UCHAR lcr;
-
-#ifdef _ARM_
-    UNIMPLEMENTED;
-    return FALSE;
-#endif
+    /*
+     * Initialize the port
+     */
 
     if (PortInformation->BaudRate == 0)
         PortInformation->BaudRate = DEFAULT_BAUD_RATE;
@@ -264,11 +246,14 @@ KdPortInitializeEx(
     HalDisplayString(buffer);
 #endif /* NDEBUG */
 
+    /* set global info */
+    KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
+
     return TRUE;
 }
 
 
-/* HAL.KdPortGetByteEx ; ReactOS-specific */
+/* ReactOS-specific */
 BOOLEAN
 NTAPI
 KdPortGetByteEx(
@@ -297,7 +282,7 @@ KdPortPutByte(
     KdPortPutByteEx(&DefaultPort, ByteToSend);
 }
 
-/* HAL.KdPortPutByteEx ; ReactOS-specific */
+/* ReactOS-specific */
 VOID
 NTAPI
 KdPortPutByteEx(
diff --git a/drivers/base/kdrosdbg/kdrosdbg.spec b/drivers/base/kdrosdbg/kdrosdbg.spec
index d8f4b0c6508..2645cace4ed 100644
--- a/drivers/base/kdrosdbg/kdrosdbg.spec
+++ b/drivers/base/kdrosdbg/kdrosdbg.spec
@@ -1,11 +1,3 @@
-; Old KD
-@ stdcall KdPortGetByteEx(ptr ptr)
-@ stdcall KdPortInitialize(ptr long long)
-@ stdcall KdPortInitializeEx(ptr long long)
-@ stdcall KdPortPutByte(long)
-@ stdcall KdPortPutByteEx(ptr long)
-
-; New KD
 @ stdcall KdD0Transition()
 @ stdcall KdD3Transition()
 @ stdcall KdDebuggerInitialize0(ptr)
@@ -14,3 +6,8 @@
 @ stdcall KdRestore(long)
 @ stdcall KdSave(long)
 @ stdcall KdSendPacket(long ptr ptr ptr)
+
+; Legacy KD
+@ stdcall KdPortGetByteEx(ptr ptr)
+@ stdcall KdPortInitializeEx(ptr long long)
+@ stdcall KdPortPutByteEx(ptr long)
diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h
index 36621bebc8c..5777d6023e9 100644
--- a/ntoskrnl/include/internal/kd.h
+++ b/ntoskrnl/include/internal/kd.h
@@ -23,14 +23,6 @@ extern BOOLEAN KdBreakAfterSymbolLoad;
 extern BOOLEAN KdPitchDebugger;
 extern BOOLEAN KdIgnoreUmExceptions;
 
-BOOLEAN
-NTAPI
-KdPortInitialize(
-    PKD_PORT_INFORMATION PortInformation,
-    ULONG Unknown1,
-    ULONG Unknown2
-);
-
 BOOLEAN
 NTAPI
 KdPortInitializeEx(
@@ -45,12 +37,6 @@ KdPortGetByteEx(
     PKD_PORT_INFORMATION PortInformation,
     PUCHAR ByteReceived);
 
-VOID
-NTAPI
-KdPortPutByte(
-    UCHAR ByteToSend
-);
-
 VOID
 NTAPI
 KdPortPutByteEx(