{NTOSKRNL]

[reactos.git] / reactos / ntoskrnl / kd / kdmain.c

diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c
index ac1f0bc..3c74017 100644 (file)
--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@@ -56,10 +56,6 @@ KdpServiceDispatcher(ULONG Service,
         {
             switch ((ULONG_PTR)Buffer1)
             {
-                case ManualBugCheck:
-                    KeBugCheck(MANUALLY_INITIATED_CRASH);
-                    break;
-
                 case DumpAllThreads:
                     PspDumpThreads(TRUE);
                     break;
@@ -68,10 +64,6 @@ KdpServiceDispatcher(ULONG Service,
                     PspDumpThreads(FALSE);
                     break;
 
-                case EnterDebugger:
-                    DbgBreakPoint();
-                    break;
-
                 case KdSpare3:
                     MmDumpArmPfnDatabase(FALSE);
                     break;
@@ -105,9 +97,19 @@ KdpServiceDispatcher(ULONG Service,
             KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length);
             break;
         }
-#endif
+
+#if KDBG
+        /* Register KDBG CLI callback */
+        case 'RbdK':
+        {
+            Result = KdbRegisterCliCallback(Buffer1, Buffer1Length);
+            break;
+        }
+#endif /* KDBG */
+#endif /* DBG */
         default:
-            HalDisplayString ("Invalid debug service call!\n");
+            DPRINT1("Invalid debug service call!\n");
+            HalDisplayString("Invalid debug service call!\r\n");
             break;
     }
 
@@ -187,13 +189,8 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame,
     /* Check if this is an assertion failure */
     if (ExceptionRecord->ExceptionCode == STATUS_ASSERTION_FAILURE)
     {
-        /* Warn about it */
-        DbgPrint("\n!!! Assertion Failure at Address 0x%p !!!\n\n",
-                 (PVOID)Context->Eip);
-
-        /* Bump EIP to the instruction following the int 2C and return */
+        /* Bump EIP to the instruction following the int 2C */
         Context->Eip += 2;
-        return TRUE;
     }
 #endif