Merge in wrappers with DBG setting as requested

Modified: trunk/reactos/config
Modified: trunk/reactos/ntoskrnl/Makefile
Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
Modified: trunk/reactos/ntoskrnl/kd/kdinit.c

--- trunk/reactos/config	2005-04-25 18:29:16 UTC (rev 14804)
+++ trunk/reactos/config	2005-04-25 18:31:20 UTC (rev 14805)
@@ -23,9 +23,9 @@

 
 #
 # 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

--- trunk/reactos/ntoskrnl/Makefile	2005-04-25 18:29:16 UTC (rev 14804)
+++ trunk/reactos/ntoskrnl/Makefile	2005-04-25 18:31:20 UTC (rev 14805)
@@ -332,8 +332,13 @@

 	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 = \

--- trunk/reactos/ntoskrnl/include/internal/kd.h	2005-04-25 18:29:16 UTC (rev 14804)
+++ trunk/reactos/ntoskrnl/include/internal/kd.h	2005-04-25 18:31:20 UTC (rev 14805)
@@ -12,10 +12,8 @@

 
 struct _KD_DISPATCH_TABLE;
 

-#ifdef GDB

+#ifdef DBG

 #include "kdgdb.h"

-#endif
-#ifdef BOCHS

 #include "kdbochs.h"
 #endif
 

--- trunk/reactos/ntoskrnl/kd/kdinit.c	2005-04-25 18:29:16 UTC (rev 14804)
+++ trunk/reactos/ntoskrnl/kd/kdinit.c	2005-04-25 18:31:20 UTC (rev 14805)
@@ -34,7 +34,7 @@

 {
     PCHAR p2 = Currentp2;
     

-#ifdef BOCHS

+#ifdef DBG

     /* Check for BOCHS Debugging */
     if (!_strnicmp(p2, "BOCHS", 5))
     {
@@ -43,9 +43,7 @@

         KdpDebugMode.Bochs = TRUE;
         WrapperInitRoutine = KdpBochsInit;
     }

-#endif

-#ifdef GDB

     /* Check for GDB Debugging */
     if (!_strnicmp(p2, "GDB", 3))
     {
@@ -62,9 +60,7 @@

         PortInfo.ComPort = DEFAULT_DEBUG_PORT;
         PortInfo.BaudRate = DEFAULT_DEBUG_BAUD_RATE;
     }

-#endif
-    
-#ifdef ICE

+

     /* Check for PICE Debugging */
     else if (!_strnicmp(p2, "PICE", 4))
     {