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

IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h

@@ -20,7 +20,7 @@
 #ifndef _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_
 #define _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_
 
-#include <PiFirmwareFileSystem.h>
+#include <PiFirmwareFile.h>
 
 typedef UINT16                      EFI_FFS_FILE_TAIL;
 

IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h

@@ -0,0 +1,82 @@
+/** @file
+  GUID used to identify id for the caller who is initiating the Status Code.
+
+  Copyright (c) 2006, 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
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Module Name:  StatusCodeDataTypeId.h
+
+  @par Revision Reference:
+  GUIDs defined in Status Codes Specification 0.92
+
+**/
+
+#ifndef __STATUS_CODE_DATA_TYPE_ID_GUID_H__
+#define __STATUS_CODE_DATA_TYPE_ID_GUID_H__
+
+//
+// String Data Type defintion. This is part of Status Code Specification
+//
+#define EFI_STATUS_CODE_DATA_TYPE_STRING_GUID \
+  { 0x92D11080, 0x496F, 0x4D95, { 0xBE, 0x7E, 0x03, 0x74, 0x88, 0x38, 0x2B, 0x0A } }
+
+extern EFI_GUID gEfiStatusCodeDataTypeStringGuid;
+
+//
+// This GUID indicates that the format of the accompanying data depends
+// upon the Status Code Value, but follows this Specification
+//
+#define EFI_STATUS_CODE_SPECIFIC_DATA_GUID \
+  { 0x335984bd, 0xe805, 0x409a, { 0xb8, 0xf8, 0xd2, 0x7e, 0xce, 0x5f, 0xf7, 0xa6 } }
+
+extern EFI_GUID gEfiStatusCodeSpecificDataGuid;
+
+//
+// Debug Assert Data. This is part of Status Code Specification
+//
+#define EFI_STATUS_CODE_DATA_TYPE_ASSERT_GUID \
+ { 0xDA571595, 0x4D99, 0x487C, { 0x82, 0x7C, 0x26, 0x22, 0x67, 0x7D, 0x33, 0x07 } }
+
+
+extern EFI_GUID gEfiStatusCodeDataTypeAssertGuid;
+
+//
+// Exception Data type (CPU REGS)
+//
+#define EFI_STATUS_CODE_DATA_TYPE_EXCEPTION_HANDLER_GUID \
+  { 0x3BC2BD12, 0xAD2E, 0x11D5, { 0x87, 0xDD, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 } }
+
+extern EFI_GUID gEfiStatusCodeDataTypeExceptionHandlerGuid;
+
+//
+// Debug DataType defintions. User Defined Data Types.
+//
+#define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \
+  { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } }
+
+extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;
+
+//
+// Progress Code. User Defined Data Type Guid.
+//
+#define EFI_STATUS_CODE_DATA_TYPE_ERROR_GUID \
+  0xAB359CE3, 0x99B3, 0xAE18, { 0xC8, 0x9D, 0x95, 0xD3, 0xB0, 0x72, 0xE1, 0x9B } }
+
+extern EFI_GUID gEfiStatusCodeDataTypeErrorGuid;
+
+
+//
+// Progress Code. User Defined Data Type Guid.
+//
+#define EFI_STATUS_CODE_DATA_TYPE_PROGRESS_CODE_GUID \
+  { 0xA356AB39, 0x35C4, 0x35DA, { 0xB3, 0x7A, 0xF8, 0xEA, 0x9E, 0x8B, 0x36, 0xA3 } }
+
+extern EFI_GUID gEfiStatusCodeDataTypeProgressCodeGuid;
+
+#endif

IntelFrameworkPkg/IntelFrameworkPkg.dec

@@ -59,6 +59,7 @@
 #
 ################################################################################
 [Guids.common]
+  gEfiStatusCodeDataTypeDebugGuid = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}
   gEfiMiscProducerGuid           = { 0x62512c92, 0x63c4, 0x4d80, { 0x82, 0xb1, 0xc1, 0xa4, 0xdc, 0x44, 0x80, 0xe5 }}
   gEfiMiscSubClassGuid           = { 0x772484B2, 0x7482, 0x4b91, { 0x9f, 0x9a, 0xad, 0x43, 0xf8, 0x1c, 0x58, 0x81 }}
   gEfiMemorySubClassGuid         = { 0x4E8F4EBB, 0x64B9, 0x4e05, { 0x9b, 0x18, 0x4c, 0xfe, 0x49, 0x23, 0x50, 0x97 }}
@@ -114,7 +115,7 @@
   gEfiSmmSwDispatchProtocolGuid  = { 0xe541b773, 0xdd11, 0x420c, { 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf }}
   gEfiSmmUsbDispatchProtocolGuid = { 0xa05b6ffd, 0x87af, 0x4e42, { 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3 }}
   gEfiSmmSxDispatchProtocolGuid  = { 0x14fc52be, 0x01dc, 0x426c, { 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8 }}
-  gEfiDataHubProtocolGuid = { 0xae80d021, 0x618e, 0x11d4, {0xbc, 0xd7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 }}
+  gEfiDataHubProtocolGuid        = { 0xAE80D021, 0x618E, 0x11D4, { 0xBC, 0xD7, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}
 
 
 

IntelFrameworkPkg/IntelFrameworkPkg.dsc

@@ -0,0 +1,69 @@
+#/** @file
+# Intel Framework Package Reference Implementations
+#
+# This FPD file is used for Package Level build.
+#
+# Copyright (c) 2007, 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
+#    http://opensource.org/licenses/bsd-license.php
+#
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#**/
+
+################################################################################
+#
+# Defines Section - statements that will be processed to create a Makefile.
+#
+################################################################################
+[Defines]
+  PLATFORM_NAME                  = MdeModuleAll
+  PLATFORM_GUID                  = E76EB141-6EDB-43f3-A455-EF24A79673DD
+  PLATFORM_VERSION               = 0.1
+  DSC_SPECIFICATION              = 0x00010005
+  OUTPUT_DIRECTORY               = $(WORKSPACE)/Build/MdeModule
+  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC
+  BUILD_TARGETS                  = DEBUG|RELEASE
+  SKUID_IDENTIFIER               = DEFAULT
+
+
+
+################################################################################
+#
+# Library Class section - list of all Library Classes needed by this Platform.
+#
+################################################################################
+
+################################################################################
+#
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform
+#
+################################################################################
+[PcdsFixedAtBuild.common]
+  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid|0x0f
+  PcdReportStatusCodePropertyMask|gEfiMdePkgTokenSpaceGuid|0x06
+  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid|0xAF
+  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid|0
+  PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid|320
+[PcdsPatchableInModule.common]
+  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000
+
+
+################################################################################
+#
+# Components Section - list of all EDK II Modules needed by this Platform
+#
+################################################################################
+
+
+[Components.Ia32]
+#  ${WORKSPACE}/IntelFrameworkPkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+  ${WORKSPACE}/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
+#  ${WORKSPACE}/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.inf
+  ${WORKSPACE}/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
+  ${WORKSPACE}/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+  ${WORKSPACE}/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

IntelFrameworkPkg/IntelFrameworkPkg.nspd

@@ -94,6 +94,11 @@
       <GuidValue>62512c92-63c4-4d80-82b1-c1a4dc4480e5</GuidValue>
       <HelpText>Misc Producer DataHub Record</HelpText>
     </Entry>
+    <Entry Name="StatusCodeDataTypeDebug">
+      <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>
+      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>
+      <HelpText/>
+    </Entry>
   </GuidDeclarations>
   <ProtocolDeclarations>
     <Entry Name="DataHub">

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.

IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c

@@ -23,6 +23,11 @@
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include "DxeCpuIoLibInternal.h"
 
 /**

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);
   }

IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c

@@ -12,6 +12,11 @@
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include "DxeCpuIoLibInternal.h"
 
 /**

IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c

@@ -12,16 +12,26 @@
 
 **/
 
-#include <Common/FrameworkDxeCis.h>
+//
+// The package level header files this module uses
+//
+#include <FrameworkDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Guid/StatusCodeDataTypeId.h>
+#include <Protocol/StatusCode.h>
+//
+// The Library classes this module consumes
+//
+#include <Library/ReportStatusCodeLib.h>
 #include <Library/DebugLib.h>
 #include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
-#include <Library/ReportStatusCodeLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
 
-#include <Protocol/StatusCode.h>
 
 /**
   Internal worker function that reports a status code through the Status Code Protocol

IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c

@@ -12,6 +12,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
 #include <FrameworkDxe.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/DebugLib.h>

IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c

@@ -15,9 +15,18 @@
 **/
 
 //
-// Include common header file for this module.
+// The package level header files this module uses
 //
-#include "CommonHeader.h"
+#include <PiDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+//
+// The Library classes this module consumes
+//
+#include <Library/FrameworkHiiLib.h>
+#include <Library/DebugLib.h>
+#include <Library/MemoryAllocationLib.h>
 
 /**
   This function allocates pool for an EFI_HII_PACKAGES structure

IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf

@@ -44,7 +44,6 @@
 
 [Sources.common]
   HiiLib.c
-  CommonHeader.h
 
 
 ################################################################################