From 4bd719527f6b5cb4cbec54ef6c745945a3919556 Mon Sep 17 00:00:00 2001
From: Dmitry Gorbachev <gorbachev@reactos.org>
Date: Mon, 23 Feb 2009 13:17:48 +0000
Subject: [PATCH] - Reenable ACPI, it works now. Patch by Cameron Gutman. Bug
 #3363. - But disable ACPIEnumerateDevices().

svn path=/trunk/; revision=39722
---
 reactos/boot/bootdata/packages/reactos.dff | 1 +
 reactos/drivers/bus/acpi/ospm/fdo.c        | 2 ++
 reactos/drivers/bus/acpi/ospm/osl.c        | 4 ++--
 reactos/ntoskrnl/io/pnpmgr/pnpmgr.c        | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 582102d3a7e..b95007eae58 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -560,6 +560,7 @@ media\inf\acpi.inf                                  6
 media\inf\cdrom.inf                                 6
 media\inf\display.inf                               6
 media\inf\font.inf                                  6
+media\inf\fdc.inf                                   6
 media\inf\hdc.inf                                   6
 media\inf\intl.inf                                  6
 media\inf\layout.inf                                6
diff --git a/reactos/drivers/bus/acpi/ospm/fdo.c b/reactos/drivers/bus/acpi/ospm/fdo.c
index 36d07dc80cc..5bf4ef74305 100644
--- a/reactos/drivers/bus/acpi/ospm/fdo.c
+++ b/reactos/drivers/bus/acpi/ospm/fdo.c
@@ -775,7 +775,9 @@ FdoStartDevice(
   KeInitializeSpinLock(&DeviceExtension->DeviceListLock);
   DeviceExtension->DeviceListCount = 0;
 
+#if 0
   ACPIEnumerateDevices(DeviceExtension);
+#endif
 
   ACPIInitializeInternalDrivers(DeviceExtension);
 
diff --git a/reactos/drivers/bus/acpi/ospm/osl.c b/reactos/drivers/bus/acpi/ospm/osl.c
index 6f711215a22..e07be93e574 100644
--- a/reactos/drivers/bus/acpi/ospm/osl.c
+++ b/reactos/drivers/bus/acpi/ospm/osl.c
@@ -635,7 +635,7 @@ acpi_os_wait_semaphore(
 
   DPRINT("Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout);
 
-  //ExAcquireFastMutex(Mutex);
+  ExAcquireFastMutex(Mutex);
 
   return AE_OK;
 }
@@ -654,7 +654,7 @@ acpi_os_signal_semaphore(
 
   DPRINT("Signaling semaphore[%p|%d]\n", handle, units);
 
-  //ExReleaseFastMutex(Mutex);
+  ExReleaseFastMutex(Mutex);
 
   return AE_OK;
 }
diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
index 6c4f579265c..5184f78dd5a 100644
--- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
@@ -13,7 +13,7 @@
 #define NDEBUG
 #include <debug.h>
 
-//#define ENABLE_ACPI
+#define ENABLE_ACPI
 
 /* GLOBALS *******************************************************************/