mirror of
https://github.com/reactos/reactos.git
synced 2024-06-25 23:41:35 +00:00
[NTOS:KD] Remove useless uses of _WINKD_
This commit is contained in:
parent
329b9fa2fb
commit
81b184741d
|
@ -188,6 +188,11 @@ KdDebuggerInitialize0(
|
||||||
/* Upcase it */
|
/* Upcase it */
|
||||||
_strupr(CommandLine);
|
_strupr(CommandLine);
|
||||||
|
|
||||||
|
#ifdef KDBG
|
||||||
|
/* Get the KDBG Settings */
|
||||||
|
KdbpGetCommandLineSettings(CommandLine);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Get the port and baud rate */
|
/* Get the port and baud rate */
|
||||||
Port = strstr(CommandLine, "DEBUGPORT");
|
Port = strstr(CommandLine, "DEBUGPORT");
|
||||||
BaudRate = strstr(CommandLine, "BAUDRATE");
|
BaudRate = strstr(CommandLine, "BAUDRATE");
|
||||||
|
|
|
@ -123,8 +123,6 @@ KdpCopyMemoryChunks(
|
||||||
return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL;
|
return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _WINKD_
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpQueryMemory(IN PDBGKD_MANIPULATE_STATE64 State,
|
KdpQueryMemory(IN PDBGKD_MANIPULATE_STATE64 State,
|
||||||
|
@ -1578,6 +1576,7 @@ SendPacket:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _WINKD_
|
||||||
VOID
|
VOID
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpReportLoadSymbolsStateChange(IN PSTRING PathName,
|
KdpReportLoadSymbolsStateChange(IN PSTRING PathName,
|
||||||
|
@ -1726,9 +1725,7 @@ KdpReportCommandStringStateChange(IN PSTRING NameString,
|
||||||
Context);
|
Context);
|
||||||
} while (Status == ContinueProcessorReselected);
|
} while (Status == ContinueProcessorReselected);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WINKD_
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
|
KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
|
@ -1858,7 +1855,6 @@ KdpSwitchProcessor(IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _WINKD_
|
|
||||||
LARGE_INTEGER
|
LARGE_INTEGER
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpQueryPerformanceCounter(IN PKTRAP_FRAME TrapFrame)
|
KdpQueryPerformanceCounter(IN PKTRAP_FRAME TrapFrame)
|
||||||
|
@ -1875,7 +1871,6 @@ KdpQueryPerformanceCounter(IN PKTRAP_FRAME TrapFrame)
|
||||||
/* Otherwise, do the call */
|
/* Otherwise, do the call */
|
||||||
return KeQueryPerformanceCounter(NULL);
|
return KeQueryPerformanceCounter(NULL);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
|
|
|
@ -88,11 +88,9 @@ VOID
|
||||||
NTAPI
|
NTAPI
|
||||||
KdUpdateDataBlock(VOID)
|
KdUpdateDataBlock(VOID)
|
||||||
{
|
{
|
||||||
#ifdef _WINKD_
|
|
||||||
/* Update the KeUserCallbackDispatcher pointer */
|
/* Update the KeUserCallbackDispatcher pointer */
|
||||||
KdDebuggerDataBlock.KeUserCallbackDispatcher =
|
KdDebuggerDataBlock.KeUserCallbackDispatcher =
|
||||||
(ULONG_PTR)KeUserCallbackDispatcher;
|
(ULONG_PTR)KeUserCallbackDispatcher;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
@ -250,7 +248,6 @@ KdInitSystem(IN ULONG BootPhase,
|
||||||
/* Enable KD */
|
/* Enable KD */
|
||||||
EnableKd = TRUE;
|
EnableKd = TRUE;
|
||||||
|
|
||||||
#ifdef _WINKD_
|
|
||||||
/* Check if there are any options */
|
/* Check if there are any options */
|
||||||
if (DebugLine[5] == '=')
|
if (DebugLine[5] == '=')
|
||||||
{
|
{
|
||||||
|
@ -332,16 +329,6 @@ KdInitSystem(IN ULONG BootPhase,
|
||||||
DebugOptionStart = DebugOptionEnd;
|
DebugOptionStart = DebugOptionEnd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
(VOID)DebugOptionStart;
|
|
||||||
(VOID)DebugOptionEnd;
|
|
||||||
(VOID)DebugOptionLength;
|
|
||||||
KdDebuggerNotPresent = FALSE;
|
|
||||||
#ifdef KDBG
|
|
||||||
/* Get the KDBG Settings */
|
|
||||||
KdbpGetCommandLineSettings(LoaderBlock->LoadOptions);
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -450,11 +437,9 @@ KdInitSystem(IN ULONG BootPhase,
|
||||||
|
|
||||||
/* Load symbols for image */
|
/* Load symbols for image */
|
||||||
RtlInitString(&ImageName, NameBuffer);
|
RtlInitString(&ImageName, NameBuffer);
|
||||||
#ifdef _WINKD_
|
|
||||||
DbgLoadImageSymbols(&ImageName,
|
DbgLoadImageSymbols(&ImageName,
|
||||||
LdrEntry->DllBase,
|
LdrEntry->DllBase,
|
||||||
(ULONG_PTR)PsGetCurrentProcessId());
|
(ULONG_PTR)PsGetCurrentProcessId());
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Go to the next entry */
|
/* Go to the next entry */
|
||||||
NextEntry = NextEntry->Flink;
|
NextEntry = NextEntry->Flink;
|
||||||
|
|
|
@ -74,7 +74,6 @@ BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
KdPollBreakIn(VOID)
|
KdPollBreakIn(VOID)
|
||||||
{
|
{
|
||||||
#ifdef _WINKD_
|
|
||||||
BOOLEAN DoBreak = FALSE, Enable;
|
BOOLEAN DoBreak = FALSE, Enable;
|
||||||
|
|
||||||
/* First make sure that KD is enabled */
|
/* First make sure that KD is enabled */
|
||||||
|
@ -119,7 +118,4 @@ KdPollBreakIn(VOID)
|
||||||
|
|
||||||
/* Tell the caller to do a break */
|
/* Tell the caller to do a break */
|
||||||
return DoBreak;
|
return DoBreak;
|
||||||
#else
|
|
||||||
return FALSE;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,6 +164,13 @@ list(APPEND SOURCE
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnproot.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnproot.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnputil.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/io/pnpmgr/pnputil.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/io/debug.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/io/debug.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdbreak.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdinit.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdtrap.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/apc.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/apc.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/balmgr.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/balmgr.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/bug.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/bug.c
|
||||||
|
@ -291,6 +298,7 @@ if(ARCH STREQUAL "i386")
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/i386/stack.S)
|
${REACTOS_SOURCE_DIR}/ntoskrnl/rtl/i386/stack.S)
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/i386/kdx86.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/abios.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/abios.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/cpu.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/cpu.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/context.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/context.c
|
||||||
|
@ -318,6 +326,7 @@ elseif(ARCH STREQUAL "amd64")
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/usercall_asm.S)
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/usercall_asm.S)
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/amd64/kdx64.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/context.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/context.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/cpu.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/cpu.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/except.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/except.c
|
||||||
|
@ -342,6 +351,7 @@ elseif(ARCH STREQUAL "arm")
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c
|
||||||
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/arm/kdarm.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/interrupt.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/interrupt.c
|
||||||
|
@ -397,32 +407,6 @@ if(NOT _WINKD_)
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/bochs.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/bochs.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/kdbg.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/kdbg.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c
|
${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c)
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdbreak.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdinit.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdtrap.c)
|
|
||||||
|
|
||||||
else() # _WINKD_
|
|
||||||
|
|
||||||
list(APPEND SOURCE
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdbreak.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdinit.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c
|
|
||||||
${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdtrap.c)
|
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/i386/kdx86.c)
|
|
||||||
elseif(ARCH STREQUAL "amd64")
|
|
||||||
list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/amd64/kdx64.c)
|
|
||||||
elseif(ARCH STREQUAL "arm")
|
|
||||||
list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/arm/kdarm.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in a new issue