From ba2377328775b10caa4c2091a8997eb8685c39b8 Mon Sep 17 00:00:00 2001
From: AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 3 Jul 2007 18:34:24 +0000
Subject: Removed IntelframeworkPkg contamination from MdeModulePkg modules.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3019 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/BaseMemoryTestPei/BaseMemoryTest.c   | 26 ++------------
 .../Universal/BaseMemoryTestPei/BaseMemoryTest.h   |  8 +++++
 .../Universal/BaseMemoryTestPei/BaseMemoryTest.inf | 42 +++-------------------
 3 files changed, 14 insertions(+), 62 deletions(-)

(limited to 'MdeModulePkg/Universal/BaseMemoryTestPei')

diff --git a/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.c b/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.c
index 7b207b919d..f1ab82d87a 100644
--- a/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.c
+++ b/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.c
@@ -19,22 +19,6 @@ Abstract:
 
 --*/
 
-//
-// The package level header files this module uses
-//
-#include <PiPei.h>
-#include <FrameworkPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Ppi/BaseMemoryTest.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/PeimEntryPoint.h>
-#include <Library/ReportStatusCodeLib.h>
-
 #include <BaseMemoryTest.h>
 
 static PEI_BASE_MEMORY_TEST_PPI mPeiBaseMemoryTestPpi = { BaseMemoryTest };
@@ -109,10 +93,7 @@ Returns:
   EFI_PHYSICAL_ADDRESS  TempAddress;
   UINT32                SpanSize;
 
-  REPORT_STATUS_CODE (
-    EFI_PROGRESS_CODE,
-    EFI_COMPUTING_UNIT_MEMORY + EFI_CU_MEMORY_PC_TEST
-    );
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE,  PcdGet32 (PcdStatusCodeValueMemoryTestStarted));
 
   TestPattern = TEST_PATTERN;
   SpanSize    = 0;
@@ -151,10 +132,7 @@ Returns:
   while (TempAddress < BeginAddress + MemoryLength) {
     if ((*(UINT32 *) (UINTN) TempAddress) != TestPattern) {
       *ErrorAddress = TempAddress;
-      REPORT_STATUS_CODE (
-        EFI_ERROR_CODE | EFI_ERROR_UNRECOVERED,
-        EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE
-        );
+      REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_UNRECOVERED, PcdGet32 (PcdStatusCodeValueUncorrectableMemoryError));
 
       return EFI_DEVICE_ERROR;
     }
diff --git a/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.h b/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.h
index 791a66c54c..ed6081af11 100644
--- a/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.h
+++ b/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.h
@@ -22,6 +22,14 @@ Abstract:
 #ifndef _PEI_BASE_MEMORY_TEST_H_
 #define _PEI_BASE_MEMORY_TEST_H_
 
+#include <PiPei.h>
+#include <Ppi/BaseMemoryTest.h>
+#include <Library/DebugLib.h>
+#include <Library/PeimEntryPoint.h>
+#include <Library/ReportStatusCodeLib.h>
+#include <Library/PcdLib.h>
+
+
 //
 // Some global define
 //
diff --git a/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf b/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
index 6010077de8..90d71e94ef 100644
--- a/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
+++ b/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
@@ -36,56 +36,22 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
 #
 
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
 [Sources.common]
   BaseMemoryTest.c
   BaseMemoryTest.h
 
-
-################################################################################
-#
-# Includes Section - list of Include locations that are required for
-#                    this module.
-#
-################################################################################
-
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-#                              this module.
-#
-################################################################################
-
 [Packages]
   MdePkg/MdePkg.dec
-  IntelFrameworkPkg/IntelFrameworkPkg.dec
-
-
-################################################################################
-#
-# Library Class Section - list of Library Classes that are required for
-#                         this module.
-#
-################################################################################
 
 [LibraryClasses]
   ReportStatusCodeLib
   PeimEntryPoint
   DebugLib
 
-
-################################################################################
-#
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module
-#                      uses or produces.
-#
-################################################################################
-
 [Ppis]
   gPeiBaseMemoryTestPpiGuid                     # PPI ALWAYS_PRODUCED
 
+[PcdsFixedAtBuild.common]
+  PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid
+  PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid
+
-- 
cgit v1.2.3