[ros-diffs] [dgorbachev] 39722: - Reenable ACPI, it works now. Patch by Cameron Gutman. Bug #3363. - But disable ACPIEnumerateDevices().

[dgorbachev at svn.reactos.org]

Author: dgorbachev
Date: Mon Feb 23 16:17:48 2009
New Revision: 39722

URL: http://svn.reactos.org/svn/reactos?rev=39722&view=rev
Log:
- Reenable ACPI, it works now. Patch by Cameron Gutman. Bug #3363.
- But disable ACPIEnumerateDevices().

Modified:
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/drivers/bus/acpi/ospm/fdo.c
    trunk/reactos/drivers/bus/acpi/ospm/osl.c
    trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reactos.dff?rev=39722&r1=39721&r2=39722&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Feb 23 16:17:48 2009
@@ -560,6 +560,7 @@
 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

Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/fdo.c?rev=39722&r1=39721&r2=39722&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] Mon Feb 23 16:17:48 2009
@@ -775,7 +775,9 @@
   KeInitializeSpinLock(&DeviceExtension->DeviceListLock);
   DeviceExtension->DeviceListCount = 0;
 
+#if 0
   ACPIEnumerateDevices(DeviceExtension);
+#endif
 
   ACPIInitializeInternalDrivers(DeviceExtension);
 

Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/osl.c?rev=39722&r1=39721&r2=39722&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/ospm/osl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/ospm/osl.c [iso-8859-1] Mon Feb 23 16:17:48 2009
@@ -635,7 +635,7 @@
 
   DPRINT("Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout);
 
-  //ExAcquireFastMutex(Mutex);
+  ExAcquireFastMutex(Mutex);
 
   return AE_OK;
 }
@@ -654,7 +654,7 @@
 
   DPRINT("Signaling semaphore[%p|%d]\n", handle, units);
 
-  //ExReleaseFastMutex(Mutex);
+  ExReleaseFastMutex(Mutex);
 
   return AE_OK;
 }

Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c?rev=39722&r1=39721&r2=39722&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Feb 23 16:17:48 2009
@@ -13,7 +13,7 @@
 #define NDEBUG
 #include <debug.h>
 
-//#define ENABLE_ACPI
+#define ENABLE_ACPI
 
 /* GLOBALS *******************************************************************/