Skip to content

Commit 2d20935

Browse files
committed
[ACPI]
- OS layer fixes - Use our cache implementation svn path=/trunk/; revision=53277
1 parent ebcc8d5 commit 2d20935

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

reactos/drivers/bus/acpi/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ add_library(acpica
121121
acpica/utilities/uttrack.c
122122
acpica/utilities/utxface.c)
123123

124-
set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE")
125124
add_dependencies(acpica bugcodes)
126125

127126
add_library(acpi SHARED

reactos/drivers/bus/acpi/acpica/acpica.rbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
33
<module name="acpica" type="staticlibrary" allowwarnings="true">
4-
<define name="ACPI_USE_LOCAL_CACHE"/>
54
<include base="acpica">include</include>
65
<directory name="dispatcher">
76
<file>dsfield.c</file>

reactos/drivers/bus/acpi/osl.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,6 @@ AcpiOsFree(void *ptr)
149149

150150
#ifndef ACPI_USE_LOCAL_CACHE
151151

152-
void*
153-
AcpiOsAcquireObjectHelper (
154-
POOL_TYPE PoolType,
155-
SIZE_T NumberOfBytes,
156-
ULONG Tag)
157-
{
158-
void* Alloc = ExAllocatePool(PoolType, NumberOfBytes);
159-
160-
/* acpica expects memory allocated from cache to be zeroed */
161-
RtlZeroMemory(Alloc,NumberOfBytes);
162-
return Alloc;
163-
}
164-
165152
ACPI_STATUS
166153
AcpiOsCreateCache (
167154
char *CacheName,
@@ -173,7 +160,7 @@ AcpiOsCreateCache (
173160
ExAllocatePool(NonPagedPool,sizeof(NPAGED_LOOKASIDE_LIST));
174161

175162
ExInitializeNPagedLookasideList(Lookaside,
176-
(PALLOCATE_FUNCTION)AcpiOsAcquireObjectHelper,// custom memory allocator
163+
NULL,
177164
NULL,
178165
0,
179166
ObjectSize,
@@ -283,7 +270,7 @@ AcpiOsInstallInterruptHandler (
283270
Internal,
284271
0,
285272
InterruptNumber,
286-
0,
273+
InterruptNumber,
287274
&DIrql,
288275
&Affinity);
289276

0 commit comments

Comments
 (0)