[ros-diffs] [hbelusca] 58958: [KDROSDBG] Place the (unimplemented) real KD functions into a dedicated file and isolate ReactOS-specific port functions. They can go into a libary along KDBG !

Author: hbelusca
Date: Sun May  5 21:57:42 2013
New Revision: 58958

URL: http://svn.reactos.org/svn/reactos?rev=58958&view=rev
Log:
[KDROSDBG]
Place the (unimplemented) real KD functions into a dedicated file and isolate
ReactOS-specific port functions. They can go into a libary along KDBG !

Added:
    branches/kd++/drivers/base/kdrosdbg/kdrosdbg.c
      - copied, changed from r58957, branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c
Modified:
    branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt
    branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c
    branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c

Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/…
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt	[iso-8859-1] (original)
+++ branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt	[iso-8859-1] Sun May  5 21:57:42
2013
@@ -9,6 +9,7 @@
     list(APPEND SOURCE arm/kdbg.c)
 endif(ARCH STREQUAL "i386")
 list(APPEND SOURCE
+    kdrosdbg.c
     kdrosdbg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def)
 

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 21:57:42 2013
@@ -10,15 +10,16 @@
 
 #define NOEXTAPI
 #include <ntifs.h>
-#define NDEBUG
 #include <halfuncs.h>
 #include <stdio.h>
-#include <debug.h>
-#include "arc/arc.h"
-#include "windbgkd.h"
+#include <arc/arc.h>
+#include <windbgkd.h>
 #include <kddll.h>
 #include <ioaccess.h>
 #include <arm/peripherals/pl011.h>
+
+#define NDEBUG
+#include <debug.h>
 
 /* GLOBALS ********************************************************************/
 
@@ -117,79 +118,4 @@
     WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend);
 }
 
-/* WINDOWS FUNCTIONS **********************************************************/
-
-NTSTATUS
-NTAPI
-KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-KdD0Transition(VOID)
-{
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-KdD3Transition(VOID)
-{
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-KdSave(IN BOOLEAN SleepTransition)
-{
-    UNIMPLEMENTED;
-    while (TRUE);
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-KdRestore(IN BOOLEAN SleepTransition)
-{
-    UNIMPLEMENTED;
-    while (TRUE);
-    return STATUS_SUCCESS;
-}
-
-VOID
-NTAPI
-KdSendPacket(IN ULONG PacketType,
-             IN PSTRING MessageHeader,
-             IN PSTRING MessageData,
-             IN OUT PKD_CONTEXT Context)
-{
-    UNIMPLEMENTED;
-    while (TRUE);
-    return;
-}
-
-KDSTATUS
-NTAPI
-KdReceivePacket(IN ULONG PacketType,
-                OUT PSTRING MessageHeader,
-                OUT PSTRING MessageData,
-                OUT PULONG DataLength,
-                IN OUT PKD_CONTEXT Context)
-{
-    UNIMPLEMENTED;
-    while (TRUE);
-    return 0;
-}
-
 /* EOF */

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 21:57:42 2013
@@ -13,8 +13,8 @@
 #include <ntifs.h>
 #include <halfuncs.h>
 #include <stdio.h>
-#include "arc/arc.h"
-#include "windbgkd.h"
+#include <arc/arc.h>
+#include <windbgkd.h>
 #include <kddll.h>
 #include <ioaccess.h> /* port intrinsics */
 #include <cportlib/cportlib.h>
@@ -98,9 +98,8 @@
 // static BOOLEAN PortInitialized = FALSE;
 
 
-/* FUNCTIONS ****************************************************************/
-
-/* ReactOS-specific */
+/* REACTOS FUNCTIONS **********************************************************/
+
 BOOLEAN
 NTAPI
 KdPortInitializeEx(
@@ -229,8 +228,6 @@
     return TRUE;
 }
 
-
-/* ReactOS-specific */
 BOOLEAN
 NTAPI
 KdPortGetByteEx(
@@ -248,7 +245,6 @@
     return FALSE;
 }
 
-/* ReactOS-specific */
 VOID
 NTAPI
 KdPortPutByteEx(
@@ -263,95 +259,4 @@
     WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend);
 }
 
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-KdDebuggerInitialize0(
-    IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
-{
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-KdDebuggerInitialize1(
-    IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
-{
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS
-NTAPI
-KdD0Transition(VOID)
-{
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-KdD3Transition(VOID)
-{
-    return STATUS_SUCCESS;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-KdSave(
-    IN BOOLEAN SleepTransition)
-{
-    /* Nothing to do on COM ports */
-    return STATUS_SUCCESS;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-KdRestore(
-    IN BOOLEAN SleepTransition)
-{
-    /* Nothing to do on COM ports */
-    return STATUS_SUCCESS;
-}
-
-/*
- * @unimplemented
- */
-VOID
-NTAPI
-KdSendPacket(
-    IN ULONG PacketType,
-    IN PSTRING MessageHeader,
-    IN PSTRING MessageData,
-    IN OUT PKD_CONTEXT Context)
-{
-    UNIMPLEMENTED;
-    return;
-}
-
-/*
- * @unimplemented
- */
-KDSTATUS
-NTAPI
-KdReceivePacket(
-    IN ULONG PacketType,
-    OUT PSTRING MessageHeader,
-    OUT PSTRING MessageData,
-    OUT PULONG DataLength,
-    IN OUT PKD_CONTEXT Context)
-{
-    UNIMPLEMENTED;
-    return 0;
-}
-
 /* EOF */

Copied: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.c (from r58957,
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/kdrosdbg.c	[iso-8859-1] Sun May  5 21:57:42 2013
@@ -13,255 +13,14 @@
 #include <ntifs.h>
 #include <halfuncs.h>
 #include <stdio.h>
-#include "arc/arc.h"
-#include "windbgkd.h"
+#include <arc/arc.h>
+#include <windbgkd.h>
 #include <kddll.h>
-#include <ioaccess.h> /* port intrinsics */
-#include <cportlib/cportlib.h>
 
 #define NDEBUG
 #include <debug.h>
 
-
-typedef struct _KD_PORT_INFORMATION
-{
-    ULONG ComPort;
-    ULONG BaudRate;
-    ULONG BaseAddress;
-} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION;
-
-#define DEFAULT_BAUD_RATE    19200
-
-#if defined(_M_IX86) || defined(_M_AMD64)
-const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8};
-#elif defined(_M_PPC)
-const ULONG BaseArray[] = {0, 0x800003F8};
-#elif defined(_M_MIPS)
-const ULONG BaseArray[] = {0, 0x80006000, 0x80007000};
-#elif defined(_M_ARM)
-const ULONG BaseArray[] = {0, 0xF1012000};
-#else
-#error Unknown architecture
-#endif
-
-/* MACROS *******************************************************************/
-
-#define   SER_RBR(x)   ((PUCHAR)(x)+0)
-#define   SER_THR(x)   ((PUCHAR)(x)+0)
-#define   SER_DLL(x)   ((PUCHAR)(x)+0)
-#define   SER_IER(x)   ((PUCHAR)(x)+1)
-#define     SR_IER_ERDA   0x01
-#define     SR_IER_ETHRE  0x02
-#define     SR_IER_ERLSI  0x04
-#define     SR_IER_EMS    0x08
-#define     SR_IER_ALL    0x0F
-#define   SER_DLM(x)   ((PUCHAR)(x)+1)
-#define   SER_IIR(x)   ((PUCHAR)(x)+2)
-#define   SER_FCR(x)   ((PUCHAR)(x)+2)
-#define     SR_FCR_ENABLE_FIFO 0x01
-#define     SR_FCR_CLEAR_RCVR  0x02
-#define     SR_FCR_CLEAR_XMIT  0x04
-#define   SER_LCR(x)   ((PUCHAR)(x)+3)
-#define     SR_LCR_CS5 0x00
-#define     SR_LCR_CS6 0x01
-#define     SR_LCR_CS7 0x02
-#define     SR_LCR_CS8 0x03
-#define     SR_LCR_ST1 0x00
-#define     SR_LCR_ST2 0x04
-#define     SR_LCR_PNO 0x00
-#define     SR_LCR_POD 0x08
-#define     SR_LCR_PEV 0x18
-#define     SR_LCR_PMK 0x28
-#define     SR_LCR_PSP 0x38
-#define     SR_LCR_BRK 0x40
-#define     SR_LCR_DLAB 0x80
-#define   SER_MCR(x)   ((PUCHAR)(x)+4)
-#define     SR_MCR_DTR 0x01
-#define     SR_MCR_RTS 0x02
-#define     SR_MCR_OUT1 0x04
-#define     SR_MCR_OUT2 0x08
-#define     SR_MCR_LOOP 0x10
-#define   SER_LSR(x)   ((PUCHAR)(x)+5)
-#define     SR_LSR_DR  0x01
-#define     SR_LSR_TBE 0x20
-#define   SER_MSR(x)   ((PUCHAR)(x)+6)
-#define     SR_MSR_CTS 0x10
-#define     SR_MSR_DSR 0x20
-#define   SER_SCR(x)   ((PUCHAR)(x)+7)
-
-
-/* STATIC VARIABLES *********************************************************/
-
-// static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 };
-
-/* The com port must only be initialized once! */
-// static BOOLEAN PortInitialized = FALSE;
-
-
 /* FUNCTIONS ****************************************************************/
-
-/* 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;
-
-#if 0 // Deactivated because never used in fact (was in KdPortInitialize but we use
KdPortInitializeEx)
-    /*
-     * Find the port if needed
-     */
-    SIZE_T i;
-
-    if (!PortInitialized)
-    {
-        DefaultPort.BaudRate = PortInformation->BaudRate;
-
-        if (PortInformation->ComPort == 0)
-        {
-            /*
-             * Start enumerating COM ports from the last one to the first one,
-             * and break when we find a valid port.
-             * If we reach the first element of the list, the invalid COM port,
-             * then it means that no valid port was found.
-             */
-            for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--)
-            {
-                if (CpDoesPortExist(UlongToPtr(BaseArray[i])))
-                {
-                    PortInformation->BaseAddress = DefaultPort.BaseAddress =
BaseArray[i];
-                    PortInformation->ComPort     = DefaultPort.ComPort     = i;
-                    break;
-                }
-            }
-            if (i == 0)
-            {
-                sprintf(buffer,
-                        "\nKernel Debugger: No COM port found!\n\n");
-                HalDisplayString(buffer);
-                return FALSE;
-            }
-        }
-
-        PortInitialized = TRUE;
-    }
-#endif
-
-    /*
-     * Initialize the port
-     */
-
-    if (PortInformation->BaudRate == 0)
-        PortInformation->BaudRate = DEFAULT_BAUD_RATE;
-
-    if (PortInformation->ComPort != 0)
-    {
-        if (!CpDoesPortExist(UlongToPtr(BaseArray[PortInformation->ComPort])))
-        {
-            sprintf(buffer,
-                    "\nKernel Debugger: Serial port not found!\n\n");
-            HalDisplayString(buffer);
-            return FALSE;
-        }
-
-        ComPortBase = BaseArray[PortInformation->ComPort];
-        PortInformation->BaseAddress = ComPortBase;
-    }
-    else
-    {
-        ComPortBase = PortInformation->BaseAddress;
-    }
-
-    if (ComPortBase == 0)
-        return FALSE;
-
-#ifndef NDEBUG
-    sprintf(buffer,
-            "\nSerial port COM%ld found at 0x%lx\n",
-            PortInformation->ComPort,
-            ComPortBase);
-    HalDisplayString(buffer);
-#endif /* NDEBUG */
-
-    /* set baud rate and data format (8N1) */
-
-    /*  turn on DTR and RTS  */
-    WRITE_PORT_UCHAR(SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS);
-
-    /* set DLAB */
-    lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)) | SR_LCR_DLAB;
-    WRITE_PORT_UCHAR(SER_LCR(ComPortBase), lcr);
-
-    /* set baud rate */
-    divisor = 115200 / PortInformation->BaudRate;
-    WRITE_PORT_UCHAR(SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff));
-    WRITE_PORT_UCHAR(SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff));
-
-    /* reset DLAB and set 8N1 format */
-    WRITE_PORT_UCHAR(SER_LCR(ComPortBase),
-                     SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO);
-
-    /* read junk out of the RBR */
-    lcr = READ_PORT_UCHAR(SER_RBR(ComPortBase));
-
-#ifndef NDEBUG
-    /* print message to blue screen */
-    sprintf(buffer,
-            "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n",
-            PortInformation->ComPort,
-            ComPortBase,
-            PortInformation->BaudRate);
-
-    HalDisplayString(buffer);
-#endif /* NDEBUG */
-
-#if 0
-    /* set global info */
-    KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
-#endif
-
-    return TRUE;
-}
-
-
-/* ReactOS-specific */
-BOOLEAN
-NTAPI
-KdPortGetByteEx(
-    IN PKD_PORT_INFORMATION PortInformation,
-    OUT PUCHAR ByteReceived)
-{
-    PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress;
-
-    if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR))
-    {
-        *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase));
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-/* ReactOS-specific */
-VOID
-NTAPI
-KdPortPutByteEx(
-    IN PKD_PORT_INFORMATION PortInformation,
-    IN UCHAR ByteToSend)
-{
-    PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress;
-
-    while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0)
-        ;
-
-    WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend);
-}
 
 /*
  * @unimplemented