[reactos] 05/32: [NTOS:KD] Merge KdPollBreakIn() with kd64 version

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b18529de28549d41318812...

commit b18529de28549d41318812f8ad359dcc9dbabb9c
Author:     Hervé Poussineau [e-mail]
AuthorDate: Sat Mar 7 00:05:22 2020 +0100
Commit:     Hervé Poussineau [e-mail]
CommitDate: Mon Nov 16 08:55:02 2020 +0100

[NTOS:KD] Merge KdPollBreakIn() with kd64 version
---
 ntoskrnl/kd/kdmain.c   | 10 ----------
 ntoskrnl/kd64/kdlock.c |  4 ++++
 ntoskrnl/ntos.cmake    |  1 +
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c
index 5749cc8701d..118119a7b5c 100644
--- a/ntoskrnl/kd/kdmain.c
+++ b/ntoskrnl/kd/kdmain.c
@@ -391,16 +391,6 @@ KdEnableDebugger(VOID)
     return STATUS_SUCCESS;
 }

-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-KdPollBreakIn(VOID)
-{
-    return FALSE;
-}
-
 /*
  * @unimplemented
  */
diff --git a/ntoskrnl/kd64/kdlock.c b/ntoskrnl/kd64/kdlock.c
index 25e4cde3dc9..b75c4534aa0 100644
--- a/ntoskrnl/kd64/kdlock.c
+++ b/ntoskrnl/kd64/kdlock.c
@@ -74,6 +74,7 @@ BOOLEAN
 NTAPI
 KdPollBreakIn(VOID)
 {
+#ifdef _WINKD_
     BOOLEAN DoBreak = FALSE, Enable;

/* First make sure that KD is enabled */
@@ -118,4 +119,7 @@ KdPollBreakIn(VOID)

/* Tell the caller to do a break */
     return DoBreak;
+#else
+    return FALSE;
+#endif
 }
diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake
index 28f0cee71fd..a8a97038918 100644
--- a/ntoskrnl/ntos.cmake
+++ b/ntoskrnl/ntos.cmake
@@ -401,6 +401,7 @@ if(NOT _WINKD_)
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c)

else() # _WINKD_