From fabd252d70b2352ef03866aa2e71ef2bc9c15318 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 29 Oct 2011 12:18:25 +0000 Subject: [PATCH] [NTOSKRNL] - Fix handling of HAL returning a different address space than we thought svn path=/trunk/; revision=54265 --- reactos/ntoskrnl/io/pnpmgr/pnpres.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpres.c b/reactos/ntoskrnl/io/pnpmgr/pnpres.c index 9caea1987ad..63150247839 100644 --- a/reactos/ntoskrnl/io/pnpmgr/pnpres.c +++ b/reactos/ntoskrnl/io/pnpmgr/pnpres.c @@ -783,9 +783,12 @@ IopTranslateDeviceResources( 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 @@ IopTranslateDeviceResources( 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); } }