[ros-diffs] [cgutman] 54265: [NTOSKRNL] - Fix handling of HAL returning a different address space than we thought

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sat Oct 29 12:18:25 2011
New Revision: 54265

URL: http://svn.reactos.org/svn/reactos?rev=54265&view=rev
Log:
[NTOSKRNL]
- Fix handling of HAL returning a different address space than we thought

Modified:
    trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c

Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c?rev=54265&r1=54264&r2=54265&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat Oct 29 12:18:25 2011
@@ -783,9 +783,12 @@
                 
                if (AddressSpace == 0)
                {
-                   /* This is actually a memory resource */
-                   DescriptorRaw->Type = CmResourceTypeMemory;
-                   DescriptorTranslated->Type = CmResourceTypeMemory;
+                   DPRINT1("Guessed incorrect address space: 1 -> 0\n");
+
+                   /* FIXME: I think all other CM_RESOURCE_PORT_XXX flags are 
+                    * invalid for this state but I'm not 100% sure */
+                   DescriptorRaw->Flags =
+                   DescriptorTranslated->Flags = CM_RESOURCE_PORT_MEMORY;
                }
                break;
             }
@@ -825,9 +828,10 @@
 
                if (AddressSpace != 0)
                {
-                   /* This is actually an I/O port resource */
-                   DescriptorRaw->Type = CmResourceTypePort;
-                   DescriptorTranslated->Type = CmResourceTypePort;
+                   DPRINT1("Guessed incorrect address space: 0 -> 1\n");
+
+                   /* This should never happen for memory space */
+                   ASSERT(FALSE);
                }
             }