Merge in wrappers with DBG setting as requested

svn path=/trunk/; revision=14805

reactos/config

@@ -23,9 +23,9 @@ KDBG := 0
 
 #
 # Whether to compile for debugging
+# Enabling this enables ASSERTS, GDB and Special Debug Routines
 #
 DBG := 0
-GDB := 1
 
 #
 # Whether to compile a multiprocessor or single processor version

reactos/ntoskrnl/Makefile

@@ -332,8 +332,13 @@ OBJECTS_KD = \
 	kd/kdinit.o \
 	kd/kdmain.o \
 	kd/kdio.o \
+    
+ifeq ($(DBG), 1)
+OBJECTS_KD := \
+	$(OBJECTS_KD) \
 	kd/wrappers/gdbstub.o \
 	kd/wrappers/bochs.o
+endif
 
 # User-Mode Debugging (Dbgk)
 OBJECTS_DBGK = \

reactos/ntoskrnl/include/internal/kd.h

@@ -12,10 +12,8 @@
 
 struct _KD_DISPATCH_TABLE;
 
-#ifdef GDB
+#ifdef DBG
 #include "kdgdb.h"
-#endif
-#ifdef BOCHS
 #include "kdbochs.h"
 #endif
 

reactos/ntoskrnl/kd/kdinit.c

@@ -34,7 +34,7 @@ KdpGetWrapperDebugMode(PCHAR Currentp2,
 {
     PCHAR p2 = Currentp2;
     
-#ifdef BOCHS
+#ifdef DBG
     /* Check for BOCHS Debugging */
     if (!_strnicmp(p2, "BOCHS", 5))
     {
@@ -43,9 +43,7 @@ KdpGetWrapperDebugMode(PCHAR Currentp2,
         KdpDebugMode.Bochs = TRUE;
         WrapperInitRoutine = KdpBochsInit;
     }
-#endif
 
-#ifdef GDB
     /* Check for GDB Debugging */
     if (!_strnicmp(p2, "GDB", 3))
     {
@@ -62,9 +60,7 @@ KdpGetWrapperDebugMode(PCHAR Currentp2,
         PortInfo.ComPort = DEFAULT_DEBUG_PORT;
         PortInfo.BaudRate = DEFAULT_DEBUG_BAUD_RATE;
     }
-#endif
 
-#ifdef ICE
     /* Check for PICE Debugging */
     else if (!_strnicmp(p2, "PICE", 4))
     {