From 53f93f7ec59b51d896a2573e74edad19cad115fb Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 28 Jun 2007 03:22:01 +0000
Subject: 1. fixed one bug in Common/FrameworkFirmwareFileSystem.h 2. add
 IntelFrameworkPkg.dsc 3. add Guid/StatusCodeDataTypeId.h and update
 IntelFrameworkPkg.dec and IntelFrameworkPkg.nspd 4. Port DxeIoLibCpuIo.inf,
 DxeReportStatusCodeLib.inf and DxeSmmDriverEntryPoint.inf

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2827 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h           | 15 +++++++++++++--
 IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c     |  5 +++++
 IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c           |  7 ++++++-
 IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c |  5 +++++
 4 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'IntelFrameworkPkg/Library/DxeIoLibCpuIo')

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
index ef3dc1041c..e0e54243b4 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
@@ -17,14 +17,25 @@
 #ifndef _DXE_CPUIO_LIB_INTERNAL_H_
 #define _DXE_CPUIO_LIB_INTERNAL_H_
 
+//
+// The package level header files this module uses
+//
 #include <FrameworkDxe.h>
+
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Protocol/CpuIo.h>
+#include <Protocol/PciRootBridgeIo.h>
+
+//
+// The Library classes this module consumes
+//
 #include <Library/IoLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
 
-#include <Protocol/PciRootBridgeIo.h>
-#include <Protocol/CpuIo.h>
 
 /**
   Reads registers in the EFI CPU I/O space.
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c
index 719fe13017..b47b889bd0 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c
@@ -23,6 +23,11 @@
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include "DxeCpuIoLibInternal.h"
 
 /**
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index 096f899be6..e124e39b6c 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -14,6 +14,11 @@
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include "DxeCpuIoLibInternal.h"
 
 //
@@ -146,7 +151,7 @@ MmioReadWorker (
   UINT64                            Data;
 
   if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo.Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);
+    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);
   } else {
     Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
   }
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
index d3f745c6a1..42d513d324 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
@@ -12,6 +12,11 @@
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include "DxeCpuIoLibInternal.h"
 
 /**
-- 
cgit v1.2.3