Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 11:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ACPI was intentionally disabled. Reverting 26870, thus unregressing VMWare video driver installation (since PCI bus is now again being enumerated).

Browse source 
svn path=/trunk/; revision=26882
This commit is contained in:
Aleksey Bragin 2007-05-25 07:46:48 +00:00
parent 03356a723c
commit 86ca0a4eba
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
View file

@ -2695,9 +2695,9 @@ IopEnumerateDetectedDevices(
const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS"); const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI BIOS");
UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0");
static ULONG DeviceIndexPci = 0; static ULONG DeviceIndexPci = 0;
const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); /*const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS");
UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0");
static ULONG DeviceIndexAcpi = 0; static ULONG DeviceIndexAcpi = 0;*/
const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController");
UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0");
static ULONG DeviceIndexSerial = 0; static ULONG DeviceIndexSerial = 0;
@ -2957,11 +2957,11 @@ IopEnumerateDetectedDevices(
pHardwareId = &HardwareIdPci; pHardwareId = &HardwareIdPci;
DeviceIndex = DeviceIndexPci++; DeviceIndex = DeviceIndexPci++;
} }
else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) /*else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0)
{ {
pHardwareId = &HardwareIdAcpi; pHardwareId = &HardwareIdAcpi;
DeviceIndex = DeviceIndexAcpi++; DeviceIndex = DeviceIndexAcpi++;
} }*/
else else
{ {
/* Unknown device */ /* Unknown device */
@ -3083,6 +3083,8 @@ cleanup:
static BOOLEAN INIT_FUNCTION static BOOLEAN INIT_FUNCTION
IopIsAcpiComputer(VOID) IopIsAcpiComputer(VOID)
{ {
return FALSE;
#if 0
UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter");
UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier");
UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS");
@ -3214,6 +3216,7 @@ cleanup:
if (hDeviceKey) if (hDeviceKey)
ZwClose(hDeviceKey); ZwClose(hDeviceKey);
return ret; return ret;
#endif
} }
static NTSTATUS INIT_FUNCTION static NTSTATUS INIT_FUNCTION