From f659880bfa42ded20a00d3e371c998b42dcdd0fd Mon Sep 17 00:00:00 2001
From: AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 14 Jan 2010 03:25:08 +0000
Subject: Added support for L2 (4K) page tables and made the CPU driver change
 cachability attributes on request. Also got the DebugUncache infrastructure
 working for the first time. Looks like it works for the simple case. Checking
 in so we can get more eyes looking at the code.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9734 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../DebugUncachedMemoryAllocationLib.c                         |  4 ++--
 .../DebugUncachedMemoryAllocationLib.inf                       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ArmPkg/Library/DebugUncachedMemoryAllocationLib')

diff --git a/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c b/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
index b4c1c5f2e5..80e7c8c472 100644
--- a/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
+++ b/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
@@ -49,7 +49,7 @@ UncachedInternalAllocateAlignedPages (
   
   
 
-EFI_CPU_ARCH_PROTOCOL           *gCpu;
+EFI_CPU_ARCH_PROTOCOL           *gDebugUncachedCpu;
 VIRTUAL_UNCACHED_PAGES_PROTOCOL *gVirtualUncachedPages;
 
 //
@@ -641,7 +641,7 @@ DebugUncachedMemoryAllocationLibConstructor (
 {
   EFI_STATUS    Status;
   
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&gCpu);
+  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&gDebugUncachedCpu);
   ASSERT_EFI_ERROR(Status);
 
   Status = gBS->LocateProtocol (&gVirtualUncachedPagesProtocolGuid, NULL, (VOID **)&gVirtualUncachedPages);
diff --git a/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf b/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf
index 102ef78010..9cf29015d5 100644
--- a/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf
+++ b/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf
@@ -29,19 +29,19 @@
   MdePkg/MdePkg.dec
   ArmPkg/ArmPkg.dec
 
-[Protocols]
-  gEfiCpuArchProtocolGuid
 
 [LibraryClasses]
   BaseLib
-  UefiMemoryAllocationLib
+  MemoryAllocationLib
   ArmLib
 
+[Protocols]
+  gEfiCpuArchProtocolGuid
+  gVirtualUncachedPagesProtocolGuid
 
 [FixedPcd]
   gArmTokenSpaceGuid.PcdArmUncachedMemoryMask
   
   
 [Depex]
-  gEfiCpuArchProtocolGuid
-  gVirtualUncachedPagesProtocolGuid
\ No newline at end of file
+  gEfiCpuArchProtocolGuid AND gVirtualUncachedPagesProtocolGuid
\ No newline at end of file
-- 
cgit v1.2.3