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

diff --git a/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h b/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h
index c5868e067e0afdd5a81af6bad3fe5cd584a8c71a..21f100398b23da547e3f08a312cb73a76ac4b894 100644 (file)
--- a/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h
+++ b/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h
@@ -20,7 +20,7 @@
 #ifndef _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_\r
 #define _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_\r
 \r
 #ifndef _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_\r
 #define _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_\r
 \r

-#include <PiFirmwareFileSystem.h>\r
+#include <PiFirmwareFile.h>\r

 \r
 typedef UINT16                      EFI_FFS_FILE_TAIL;\r
 \r
 \r
 typedef UINT16                      EFI_FFS_FILE_TAIL;\r
 \r

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

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index 98a7bc00f1ad8de7fb2021d547d2f9867ca7c444..90f6c88100ccd7af1130c73140e852f4210a8483 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -59,6 +59,7 @@
 #\r
 ################################################################################\r
 [Guids.common]\r
 #\r
 ################################################################################\r
 [Guids.common]\r

+  gEfiStatusCodeDataTypeDebugGuid = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}\r

   gEfiMiscProducerGuid           = { 0x62512c92, 0x63c4, 0x4d80, { 0x82, 0xb1, 0xc1, 0xa4, 0xdc, 0x44, 0x80, 0xe5 }}\r
   gEfiMiscSubClassGuid           = { 0x772484B2, 0x7482, 0x4b91, { 0x9f, 0x9a, 0xad, 0x43, 0xf8, 0x1c, 0x58, 0x81 }}\r
   gEfiMemorySubClassGuid         = { 0x4E8F4EBB, 0x64B9, 0x4e05, { 0x9b, 0x18, 0x4c, 0xfe, 0x49, 0x23, 0x50, 0x97 }}\r
   gEfiMiscProducerGuid           = { 0x62512c92, 0x63c4, 0x4d80, { 0x82, 0xb1, 0xc1, 0xa4, 0xdc, 0x44, 0x80, 0xe5 }}\r
   gEfiMiscSubClassGuid           = { 0x772484B2, 0x7482, 0x4b91, { 0x9f, 0x9a, 0xad, 0x43, 0xf8, 0x1c, 0x58, 0x81 }}\r
   gEfiMemorySubClassGuid         = { 0x4E8F4EBB, 0x64B9, 0x4e05, { 0x9b, 0x18, 0x4c, 0xfe, 0x49, 0x23, 0x50, 0x97 }}\r


@@ -114,7 +115,7 @@
   gEfiSmmSwDispatchProtocolGuid  = { 0xe541b773, 0xdd11, 0x420c, { 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf }}\r
   gEfiSmmUsbDispatchProtocolGuid = { 0xa05b6ffd, 0x87af, 0x4e42, { 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3 }}\r
   gEfiSmmSxDispatchProtocolGuid  = { 0x14fc52be, 0x01dc, 0x426c, { 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8 }}\r
   gEfiSmmSwDispatchProtocolGuid  = { 0xe541b773, 0xdd11, 0x420c, { 0xb0, 0x26, 0xdf, 0x99, 0x36, 0x53, 0xf8, 0xbf }}\r
   gEfiSmmUsbDispatchProtocolGuid = { 0xa05b6ffd, 0x87af, 0x4e42, { 0x95, 0xc9, 0x62, 0x28, 0xb6, 0x3c, 0xf3, 0xf3 }}\r
   gEfiSmmSxDispatchProtocolGuid  = { 0x14fc52be, 0x01dc, 0x426c, { 0x91, 0xae, 0xa2, 0x3c, 0x3e, 0x22, 0x0a, 0xe8 }}\r

-  gEfiDataHubProtocolGuid = { 0xae80d021, 0x618e, 0x11d4, {0xbc, 0xd7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 }}\r
+  gEfiDataHubProtocolGuid        = { 0xAE80D021, 0x618E, 0x11D4, { 0xBC, 0xD7, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}\r

 \r
 \r
 \r
 \r
 \r
 \r

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dsc b/IntelFrameworkPkg/IntelFrameworkPkg.dsc
new file mode 100644 (file)
index 0000000..990edc7
--- /dev/null
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dsc
@@ -0,0 +1,69 @@
+#/** @file\r
+# Intel Framework Package Reference Implementations\r
+#\r
+# This FPD file is used for Package Level build.\r
+#\r
+# Copyright (c) 2007, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#    are licensed and made available under the terms and conditions of the BSD License\r
+#    which accompanies this distribution. The full text of the license may be found at\r
+#    http://opensource.org/licenses/bsd-license.php\r
+#\r
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#**/\r
+\r
+################################################################################\r
+#\r
+# Defines Section - statements that will be processed to create a Makefile.\r
+#\r
+################################################################################\r
+[Defines]\r
+  PLATFORM_NAME                  = MdeModuleAll\r
+  PLATFORM_GUID                  = E76EB141-6EDB-43f3-A455-EF24A79673DD\r
+  PLATFORM_VERSION               = 0.1\r
+  DSC_SPECIFICATION              = 0x00010005\r
+  OUTPUT_DIRECTORY               = $(WORKSPACE)/Build/MdeModule\r
+  SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC\r
+  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  SKUID_IDENTIFIER               = DEFAULT\r
+\r
+\r
+\r
+################################################################################\r
+#\r
+# Library Class section - list of all Library Classes needed by this Platform.\r
+#\r
+################################################################################\r
+\r
+################################################################################\r
+#\r
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform\r
+#\r
+################################################################################\r
+[PcdsFixedAtBuild.common]\r
+  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid|0x0f\r
+  PcdReportStatusCodePropertyMask|gEfiMdePkgTokenSpaceGuid|0x06\r
+  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid|0xAF\r
+  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid|0\r
+  PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid|320\r
+[PcdsPatchableInModule.common]\r
+  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000\r
+\r
+\r
+################################################################################\r
+#\r
+# Components Section - list of all EDK II Modules needed by this Platform\r
+#\r
+################################################################################\r
+\r
+\r
+[Components.Ia32]\r
+#  ${WORKSPACE}/IntelFrameworkPkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  ${WORKSPACE}/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf\r
+#  ${WORKSPACE}/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.inf\r
+  ${WORKSPACE}/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf\r
+  ${WORKSPACE}/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
+  ${WORKSPACE}/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.nspd b/IntelFrameworkPkg/IntelFrameworkPkg.nspd
index 1b7eece60ecf019a59a824cd0c87abd3747f9412..f3971248438d521b428740b870d398308d058c08 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.nspd
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.nspd
@@ -94,6 +94,11 @@
       <GuidValue>62512c92-63c4-4d80-82b1-c1a4dc4480e5</GuidValue>\r
       <HelpText>Misc Producer DataHub Record</HelpText>\r
     </Entry>\r
       <GuidValue>62512c92-63c4-4d80-82b1-c1a4dc4480e5</GuidValue>\r
       <HelpText>Misc Producer DataHub Record</HelpText>\r
     </Entry>\r

+    <Entry Name="StatusCodeDataTypeDebug">\r
+      <C_Name>gEfiStatusCodeDataTypeDebugGuid</C_Name>\r
+      <GuidValue>9A4E9246-D553-11D5-87E2-00062945C3B9</GuidValue>\r
+      <HelpText/>\r
+    </Entry>\r

   </GuidDeclarations>\r
   <ProtocolDeclarations>\r
     <Entry Name="DataHub">\r
   </GuidDeclarations>\r
   <ProtocolDeclarations>\r
     <Entry Name="DataHub">\r

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
index ef3dc1041c29233d3b5d55d4f0636b5db957eaef..e0e54243b4032b85e604c16c01b997f2d656b4cf 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h
@@ -17,14 +17,25 @@
 #ifndef _DXE_CPUIO_LIB_INTERNAL_H_\r
 #define _DXE_CPUIO_LIB_INTERNAL_H_\r
 \r
 #ifndef _DXE_CPUIO_LIB_INTERNAL_H_\r
 #define _DXE_CPUIO_LIB_INTERNAL_H_\r
 \r

+//\r
+// The package level header files this module uses\r
+//\r

 #include <FrameworkDxe.h>\r
 #include <FrameworkDxe.h>\r

+\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Protocol/CpuIo.h>\r
+#include <Protocol/PciRootBridgeIo.h>\r
+\r
+//\r
+// The Library classes this module consumes\r
+//\r

 #include <Library/IoLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
 \r
 #include <Library/IoLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
 \r

-#include <Protocol/PciRootBridgeIo.h>\r
-#include <Protocol/CpuIo.h>\r

 \r
 /**\r
   Reads registers in the EFI CPU I/O space.\r
 \r
 /**\r
   Reads registers in the EFI CPU I/O space.\r

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c
index 719fe1301784bd14ed120ed5ff2341f6a6c14f7c..b47b889bd0bd59bd97374a17290d260a24295d6e 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c
@@ -23,6 +23,11 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+//\r
+// Include common header file for this module.\r
+//\r
+#include "CommonHeader.h"\r
+\r

 #include "DxeCpuIoLibInternal.h"\r
 \r
 /**\r
 #include "DxeCpuIoLibInternal.h"\r
 \r
 /**\r

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index 096f899be6952810f5a2ae4075408e60e506ed7c..e124e39b6cae59ddfeaf9c75bcb4e2cc4a5e09da 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -14,6 +14,11 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+//\r
+// Include common header file for this module.\r
+//\r
+#include "CommonHeader.h"\r
+\r

 #include "DxeCpuIoLibInternal.h"\r
 \r
 //\r
 #include "DxeCpuIoLibInternal.h"\r
 \r
 //\r


@@ -146,7 +151,7 @@ MmioReadWorker (
   UINT64                            Data;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r
   UINT64                            Data;\r
 \r
   if (mPciRootBridgeIo != NULL) {\r

-    Status = mPciRootBridgeIo.Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);\r
+    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);\r

   } else {\r
     Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);\r
   }\r
   } else {\r
     Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);\r
   }\r

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
index d3f745c6a1e57df5cab6d40d805a8fe53f4d9c66..42d513d324e00026e72162cf3985bc43bd828637 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
@@ -12,6 +12,11 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+//\r
+// Include common header file for this module.\r
+//\r
+#include "CommonHeader.h"\r
+\r

 #include "DxeCpuIoLibInternal.h"\r
 \r
 /**\r
 #include "DxeCpuIoLibInternal.h"\r
 \r
 /**\r

diff --git a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index 270966a884e3fbee90ca50f26991358b62db86d3..e2f9d5fa476964709683c920c0dc913038225fb3 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -12,16 +12,26 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#include <Common/FrameworkDxeCis.h>\r
+//\r
+// The package level header files this module uses\r
+//\r
+#include <FrameworkDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Guid/StatusCodeDataTypeId.h>\r
+#include <Protocol/StatusCode.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/ReportStatusCodeLib.h>\r

 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r

-#include <Library/UefiRuntimeServicesTableLib.h>\r

 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/PcdLib.h>\r

-#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r

 \r
 \r

-#include <Protocol/StatusCode.h>\r

 \r
 /**\r
   Internal worker function that reports a status code through the Status Code Protocol\r
 \r
 /**\r
   Internal worker function that reports a status code through the Status Code Protocol\r

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index cf50f2395beb67ef13fde85ec8ac146f84e8422d..6cba691c463bfe777896fa6e446e4e4454a3d4ae 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
@@ -12,6 +12,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

+//\r
+// Include common header file for this module.\r
+//\r
+#include "CommonHeader.h"\r
+\r

 #include <FrameworkDxe.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <FrameworkDxe.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
index 3b0876cc3bf8bde61572f4dee3ea65f0f9608fc8..4315f38a32bdcfbec27eca55210e2d289919c65b 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
+++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
@@ -2,27 +2,36 @@
   HII Library implementation that uses DXE protocols and services.\r
 \r
   Copyright (c) 2006, Intel Corporation<BR>\r
   HII Library implementation that uses DXE protocols and services.\r
 \r
   Copyright (c) 2006, Intel Corporation<BR>\r

-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  All rights reserved. This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r

 \r
 \r

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
   Module Name:  HiiLib.c\r
 \r
 **/\r
 \r
 //\r
 \r
   Module Name:  HiiLib.c\r
 \r
 **/\r
 \r
 //\r

-// Include common header file for this module.\r
+// The package level header files this module uses\r

 //\r
 //\r

-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/FrameworkHiiLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r

 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGES structure\r
   with enough space for the variable argument list of package pointers.\r
 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGES structure\r
   with enough space for the variable argument list of package pointers.\r

-  The allocated structure is initialized using NumberOfPackages, Guid, \r
+  The allocated structure is initialized using NumberOfPackages, Guid,\r

   and the variable length argument list of package pointers.\r
 \r
   @param  NumberOfPackages The number of HII packages to prepare.\r
   and the variable length argument list of package pointers.\r
 \r
   @param  NumberOfPackages The number of HII packages to prepare.\r

diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
index b16a40c50f8d67b1a20fe4ff60a8468677fba347..2689226504bb714d736b22c8e6cda4d1ae78ab75 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
@@ -25,7 +25,7 @@
   FILE_GUID                      = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r


@@ -44,7 +44,6 @@
 \r
 [Sources.common]\r
   HiiLib.c\r
 \r
 [Sources.common]\r
   HiiLib.c\r

-  CommonHeader.h\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r


@@ -56,7 +55,7 @@
 \r
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r
 \r
 [Includes]\r
   $(WORKSPACE)/MdePkg/Include/Library\r

-  \r
+\r

 ################################################################################\r
 #\r
 # Package Dependency Section - list of Package files that are required for\r
 ################################################################################\r
 #\r
 # Package Dependency Section - list of Package files that are required for\r