[ros-diffs] [ion] 25987: - Wrap some KDBG-specific initialization in _WINKD_ guard. - Remove KdpDetectConflicts since our serial driver correctly uses KdComPortInUse for this (and kdcom fills it out).

Author: ion
Date: Sun Mar  4 23:28:18 2007
New Revision: 25987

URL: http://svn.reactos.org/svn/reactos?rev=25987&view=rev
Log:
- Wrap some KDBG-specific initialization in _WINKD_ guard.
- Remove KdpDetectConflicts since our serial driver correctly uses KdComPortInUse for this
(and kdcom fills it out).

Modified:
    trunk/reactos/ntoskrnl/io/iomgr/iomgr.c
    trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c
    trunk/reactos/ntoskrnl/kd/kdio.c

Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Mar  4 23:28:18 2007
@@ -517,11 +517,13 @@
     /* Mark the system boot partition */
     if (!IopMarkBootPartition(LoaderBlock)) return FALSE;
 
+#ifndef _WINKD_
     /* Read KDB Data */
     KdbInit();
 
     /* I/O is now setup for disk access, so phase 3 */
     KdInitSystem(3, LoaderBlock);
+#endif
 
     /* Load services for devices found by PnP manager */
     IopInitializePnpServices(IopRootDeviceNode, FALSE);

Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo…
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Sun Mar  4 23:28:18 2007
@@ -89,16 +89,6 @@
 
   *ConflictDetected = FALSE;
 
-  /* FIXME: Manually indicate conflicts with KD Ports */
-  if (DriverList)
-  {
-      if (KdpDetectConflicts(DriverList))
-      {
-        *ConflictDetected = TRUE;
-        return STATUS_CONFLICTING_ADDRESSES;
-      }
-  }
-
   if (PopSystemPowerDeviceNode != NULL && DriverListSize > 0)
   {
     /* We hope legacy devices will be enumerated by ACPI */

Modified: trunk/reactos/ntoskrnl/kd/kdio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=259…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/kdio.c (original)
+++ trunk/reactos/ntoskrnl/kd/kdio.c Sun Mar  4 23:28:18 2007
@@ -239,43 +239,6 @@
 
 /* GENERAL FUNCTIONS *********************************************************/
 
-BOOLEAN
-STDCALL
-KdpDetectConflicts(PCM_RESOURCE_LIST DriverList)
-{
-    ULONG ComPortBase = 0;
-    ULONG i;
-    PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor;
-
-    /* Select the COM Port Base */
-    switch (KdpPort)
-    {
-        case 1: ComPortBase = 0x3f8; break;
-        case 2: ComPortBase = 0x2f8; break;
-        case 3: ComPortBase = 0x3e8; break;
-        case 4: ComPortBase = 0x2e8; break;
-    }
-
-    /* search for this port address in DriverList */
-    for (i = 0; i < DriverList->List[0].PartialResourceList.Count; i++)
-    {
-        ResourceDescriptor =
&DriverList->List[0].PartialResourceList.PartialDescriptors[i];
-        if (ResourceDescriptor->Type == CmResourceTypePort)
-        {
-            if ((ResourceDescriptor->u.Port.Start.u.LowPart <= ComPortBase)
&&
-                (ResourceDescriptor->u.Port.Start.u.LowPart +
-                 ResourceDescriptor->u.Port.Length > ComPortBase))
-            {
-                /* Conflict found */
-                return TRUE;
-            }
-        }
-    }
-
-    /* No Conflicts */
-    return FALSE;
-}
-
 ULONG
 STDCALL
 KdpPrintString(LPSTR String,