Author: hbelusca
Date: Wed May 8 15:36:38 2013
New Revision: 58970
URL: http://svn.reactos.org/svn/reactos?rev=58970&view=rev
Log:
[KDROSDBG-NTOS]
Put the 3 helper COM functions into KDBG directly.
Added:
branches/kd++/ntoskrnl/kd/arm/
branches/kd++/ntoskrnl/kd/arm/kdbg.c
- copied, changed from r58964,
branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c
branches/kd++/ntoskrnl/kd/i386/kdbg.c
- copied, changed from r58964,
branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c
Removed:
branches/kd++/drivers/base/kdrosdbg/arm/
branches/kd++/drivers/base/kdrosdbg/i386/
Modified:
branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt
branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec
branches/kd++/ntoskrnl/CMakeLists.txt
Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/CMakeLists.txt?rev=58970&r1=58969&r2=58970&view=diff
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] (original)
+++ branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] Wed May 8
15:36:38 2013
@@ -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
Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/kdrosdbg.spec?rev=58970&r1=58969&r2=58970&view=diff
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] (original)
+++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] Wed May 8
15:36:38 2013
@@ -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)
Modified: branches/kd++/ntoskrnl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/CMakeLists.txt?rev=58970&r1=58969&r2=58970&view=diff
==============================================================================
--- branches/kd++/ntoskrnl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/kd++/ntoskrnl/CMakeLists.txt [iso-8859-1] Wed May 8
15:36:38 2013
@@ -363,6 +363,7 @@
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 @@
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 @@
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()
Copied: branches/kd++/ntoskrnl/kd/arm/kdbg.c (from r58964,
branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c)
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/kd/arm/kdbg.c?p2=branches/kd%2B%2B/ntoskrnl/kd/arm/kdbg.c&p1=branches/kd%2B%2B/drivers/base/kdrosdbg/arm/kdbg.c&r1=58964&r2=58970&rev=58970&view=diff
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] (original)
+++ branches/kd++/ntoskrnl/kd/arm/kdbg.c [iso-8859-1] Wed May 8
15:36:38 2013
@@ -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>
@@ -32,6 +24,13 @@
#define HACK 24000000
/* REACTOS FUNCTIONS
**********************************************************/
+
+NTSTATUS
+NTAPI
+KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
+{
+ return STATUS_NOT_IMPLEMENTED;
+}
BOOLEAN
NTAPI
Copied: branches/kd++/ntoskrnl/kd/i386/kdbg.c (from r58964,
branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c)
URL:
http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/kd/i386/kdbg.c?p2=branches/kd%2B%2B/ntoskrnl/kd/i386/kdbg.c&p1=branches/kd%2B%2B/drivers/base/kdrosdbg/i386/kdbg.c&r1=58964&r2=58970&rev=58970&view=diff
==============================================================================
--- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original)
+++ branches/kd++/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Wed May 8
15:36:38 2013
@@ -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>
@@ -45,6 +37,14 @@
/* REACTOS FUNCTIONS
**********************************************************/
+
+NTSTATUS
+NTAPI
+KdDebuggerInitialize1(
+ IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
+{
+ return STATUS_NOT_IMPLEMENTED;
+}
BOOLEAN
NTAPI
