[ros-diffs] [hbelusca] 58952: Further remove legacy, now only 3 functions remain.

Author: hbelusca
Date: Sun May  5 19:55:42 2013
New Revision: 58952

URL: http://svn.reactos.org/svn/reactos?rev=58952&view=rev
Log:
Further remove legacy, now only 3 functions remain.

Modified:
    branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c
    branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c
    branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec
    branches/kd++/ntoskrnl/include/internal/kd.h

Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/…
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c	[iso-8859-1] (original)
+++ branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c	[iso-8859-1] Sun May  5 19:55:42 2013
@@ -93,18 +93,6 @@
 
 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,
                 OUT PUCHAR ByteReceived)
 {
@@ -127,16 +115,6 @@
     // Send the character
     //
     WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend);
-}
-
-VOID
-NTAPI
-KdPortPutByte(IN UCHAR ByteToSend)
-{
-    //
-    // Call the extended version
-    //
-    KdPortPutByteEx(&DefaultPort, ByteToSend);
 }
 
 /* WINDOWS FUNCTIONS **********************************************************/

Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/…
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c	[iso-8859-1] (original)
+++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c	[iso-8859-1] Sun May  5 19:55:42 2013
@@ -127,16 +127,23 @@
 
 /* FUNCTIONS ****************************************************************/
 
-/* HAL.KdPortInitialize */
-BOOLEAN
-NTAPI
-KdPortInitialize(
+/* ReactOS-specific */
+BOOLEAN
+NTAPI
+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 @@
         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 @@
     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 @@
     KdPortPutByteEx(&DefaultPort, ByteToSend);
 }
 
-/* HAL.KdPortPutByteEx ; ReactOS-specific */
+/* ReactOS-specific */
 VOID
 NTAPI
 KdPortPutByteEx(

Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/…
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec	[iso-8859-1] (original)
+++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec	[iso-8859-1] Sun May  5 19:55:42
2013
@@ -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)

Modified: branches/kd++/ntoskrnl/include/internal/kd.h
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/include/inter…
==============================================================================
--- branches/kd++/ntoskrnl/include/internal/kd.h	[iso-8859-1] (original)
+++ branches/kd++/ntoskrnl/include/internal/kd.h	[iso-8859-1] Sun May  5 19:55:42 2013
@@ -25,14 +25,6 @@
 
 BOOLEAN
 NTAPI
-KdPortInitialize(
-    PKD_PORT_INFORMATION PortInformation,
-    ULONG Unknown1,
-    ULONG Unknown2
-);
-
-BOOLEAN
-NTAPI
 KdPortInitializeEx(
     PKD_PORT_INFORMATION PortInformation,
     ULONG Unknown1,
@@ -44,12 +36,6 @@
 KdPortGetByteEx(
     PKD_PORT_INFORMATION PortInformation,
     PUCHAR ByteReceived);
-
-VOID
-NTAPI
-KdPortPutByte(
-    UCHAR ByteToSend
-);
 
 VOID
 NTAPI