[ros-diffs] [cgutman] 53277: [ACPI] - OS layer fixes - Use our cache implementation

[cgutman at svn.reactos.org]

Author: cgutman
Date: Wed Aug 17 07:23:55 2011
New Revision: 53277

URL: http://svn.reactos.org/svn/reactos?rev=53277&view=rev
Log:
[ACPI]
- OS layer fixes
- Use our cache implementation

Modified:
    trunk/reactos/drivers/bus/acpi/CMakeLists.txt
    trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild
    trunk/reactos/drivers/bus/acpi/osl.c

Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeLists.txt?rev=53277&r1=53276&r2=53277&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Wed Aug 17 07:23:55 2011
@@ -121,7 +121,6 @@
     acpica/utilities/uttrack.c
     acpica/utilities/utxface.c)
 
-set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE")
 add_dependencies(acpica bugcodes)
 
 add_library(acpi SHARED

Modified: trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild?rev=53277&r1=53276&r2=53277&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild [iso-8859-1] Wed Aug 17 07:23:55 2011
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="acpica" type="staticlibrary" allowwarnings="true">
-	<define name="ACPI_USE_LOCAL_CACHE"/>
 	<include base="acpica">include</include>
 	<directory name="dispatcher">
 		<file>dsfield.c</file>

Modified: trunk/reactos/drivers/bus/acpi/osl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev=53277&r1=53276&r2=53277&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Wed Aug 17 07:23:55 2011
@@ -149,19 +149,6 @@
 
 #ifndef ACPI_USE_LOCAL_CACHE
 
-void*
-AcpiOsAcquireObjectHelper (
-    POOL_TYPE PoolType,
-    SIZE_T NumberOfBytes,
-    ULONG Tag)
-{
-    void* Alloc = ExAllocatePool(PoolType, NumberOfBytes);
-
-    /* acpica expects memory allocated from cache to be zeroed */
-    RtlZeroMemory(Alloc,NumberOfBytes);
-    return Alloc;
-}
-
 ACPI_STATUS
 AcpiOsCreateCache (
     char                    *CacheName,
@@ -173,7 +160,7 @@
         ExAllocatePool(NonPagedPool,sizeof(NPAGED_LOOKASIDE_LIST));
 
     ExInitializeNPagedLookasideList(Lookaside,
-        (PALLOCATE_FUNCTION)AcpiOsAcquireObjectHelper,// custom memory allocator
+        NULL,
         NULL,
         0,
         ObjectSize,
@@ -283,7 +270,7 @@
         Internal,
         0,
         InterruptNumber,
-        0,
+        InterruptNumber,
         &DIrql,
         &Affinity);