From ccd55824e79865a04b1c872bda4af0f1de1f50be Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 25 Aug 2009 07:29:13 +0000
Subject: Integrate patch from Andrew Fish to make it run on OS X.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9194 6f19259b-4bc3-4df7-8a09-765794883524
---
 UnixPkg/CpuRuntimeDxe/Cpu.c   | 17 ++++++++++-------
 UnixPkg/CpuRuntimeDxe/Cpu.inf |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'UnixPkg/CpuRuntimeDxe')

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c
index dc25d4d812..a151aafc07 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.c
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2009, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -58,12 +58,15 @@ CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {
     4
   },
   {
-    CpuMemoryServiceRead,
-    CpuMemoryServiceWrite,
-    CpuIoServiceRead,
-    CpuIoServiceWrite
+    {
+      CpuMemoryServiceRead,
+      CpuMemoryServiceWrite
+    },
+    {
+      CpuIoServiceRead,
+      CpuIoServiceWrite
+    }
   },
-  0,
   TRUE
 };
 
@@ -430,7 +433,7 @@ Returns:
   //
   // Locate DataHub protocol.
   //
-  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);
+  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID **)&DataHub);
   if (EFI_ERROR (Status)) {
     return;
   }
diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.inf b/UnixPkg/CpuRuntimeDxe/Cpu.inf
index edab145b61..a0f66b6713 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.inf
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.inf
@@ -42,7 +42,7 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
   UnixPkg/UnixPkg.dec
-  MdePkg/MdePkg.dec
+  MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
 
@@ -70,4 +70,4 @@
 
 
 [Depex]
-  gEfiDataHubProtocolGuid
+  gEfiDataHubProtocolGuid
-- 
cgit v1.2.3