- Reenable ACPI, it works now. Patch by Cameron Gutman. Bug #3363.

- But disable ACPIEnumerateDevices().

svn path=/trunk/; revision=39722
This commit is contained in:
Dmitry Gorbachev 2009-02-23 13:17:48 +00:00
parent 9b42ebfbcc
commit 4bd719527f
4 changed files with 6 additions and 3 deletions

View file

@ -560,6 +560,7 @@ media\inf\acpi.inf 6
media\inf\cdrom.inf 6 media\inf\cdrom.inf 6
media\inf\display.inf 6 media\inf\display.inf 6
media\inf\font.inf 6 media\inf\font.inf 6
media\inf\fdc.inf 6
media\inf\hdc.inf 6 media\inf\hdc.inf 6
media\inf\intl.inf 6 media\inf\intl.inf 6
media\inf\layout.inf 6 media\inf\layout.inf 6

View file

@ -775,7 +775,9 @@ FdoStartDevice(
KeInitializeSpinLock(&DeviceExtension->DeviceListLock); KeInitializeSpinLock(&DeviceExtension->DeviceListLock);
DeviceExtension->DeviceListCount = 0; DeviceExtension->DeviceListCount = 0;
#if 0
ACPIEnumerateDevices(DeviceExtension); ACPIEnumerateDevices(DeviceExtension);
#endif
ACPIInitializeInternalDrivers(DeviceExtension); ACPIInitializeInternalDrivers(DeviceExtension);

View file

@ -635,7 +635,7 @@ acpi_os_wait_semaphore(
DPRINT("Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout); DPRINT("Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout);
//ExAcquireFastMutex(Mutex); ExAcquireFastMutex(Mutex);
return AE_OK; return AE_OK;
} }
@ -654,7 +654,7 @@ acpi_os_signal_semaphore(
DPRINT("Signaling semaphore[%p|%d]\n", handle, units); DPRINT("Signaling semaphore[%p|%d]\n", handle, units);
//ExReleaseFastMutex(Mutex); ExReleaseFastMutex(Mutex);
return AE_OK; return AE_OK;
} }

View file

@ -13,7 +13,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
//#define ENABLE_ACPI #define ENABLE_ACPI
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/