[NTOSKRNL]

- Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer)

svn path=/trunk/; revision=46571
This commit is contained in:
Cameron Gutman 2010-03-29 16:56:42 +00:00
parent a2645d72f7
commit 4102dbabef

View file

@ -2166,11 +2166,6 @@ IopEnumerateDetectedDevices(
const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI");
UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0");
static ULONG DeviceIndexPci = 0;
#ifdef ENABLE_ACPI
const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS");
UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0");
static ULONG DeviceIndexAcpi = 0;
#endif
const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController");
UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0");
static ULONG DeviceIndexSerial = 0;
@ -2460,14 +2455,6 @@ IopEnumerateDetectedDevices(
DeviceIndex = DeviceIndexIsa++;
IsDeviceDesc = FALSE;
}
#ifdef ENABLE_ACPI
else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0)
{
pHardwareId = &HardwareIdAcpi;
DeviceIndex = DeviceIndexAcpi++;
IsDeviceDesc = FALSE;
}
#endif
else
{
DPRINT("Unknown device '%wZ'\n", &ValueName);