Modules clean up.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3242 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 7aff781e7be1ca3ed58a3026f4916fc94457dcbd..6d47bcfd0be4470cb782dc5b513683d587bfb24c 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -186,13 +186,13 @@
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r

-  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf\r
+  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r

   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf\r
 \r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf\r
 \r

-[Components.IA32]  \r
+[Components.IA32]\r

   $(WORKSPACE)/IntelFrameworkModulePkg/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.inf\r
 \r
   $(WORKSPACE)/IntelFrameworkModulePkg/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.inf\r
 \r

-[Components.X64]  \r
+[Components.X64]\r

   $(WORKSPACE)/IntelFrameworkModulePkg/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.inf\r
 \r
   $(WORKSPACE)/IntelFrameworkModulePkg/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.inf\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h
deleted file mode 100644 (file)
index e6af6a2..0000000
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, 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
-   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
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/FormCallbackFramework.h>\r
-#include <Protocol/HiiFramework.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/PrintLib.h>\r
-#include <Library/IfrSupportLibFramework.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/HiiLibFramework.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 74156430af49953cebddcf9a42aedf84053bfae7..6514aa70d409d5199dccf4b8208109cc75d5ceb8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1,28 +1,23 @@
 /*++\r
 /*++\r

-Copyright (c) 2006 - 2007, 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
+Copyright (c) 2006 - 2007, 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:\r
   DriverSample.c\r
 \r
 Abstract:\r
 \r
 \r
 Module Name:\r
   DriverSample.c\r
 \r
 Abstract:\r
 \r

-  This is an example of how a driver might export data to the HII protocol to be \r
+  This is an example of how a driver might export data to the HII protocol to be\r

   later utilized by the Setup Protocol\r
 \r
 --*/\r
 \r
   later utilized by the Setup Protocol\r
 \r
 --*/\r
 \r

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

 #include "DriverSample.h"\r
 \r
 #define DISPLAY_ONLY_MY_ITEM  0x0001\r
 #include "DriverSample.h"\r
 \r
 #define DISPLAY_ONLY_MY_ITEM  0x0001\r


@@ -33,7 +28,7 @@ Abstract:
   }\r
 \r
 EFI_GUID  mFormSetGuid    = FORMSET_GUID;\r
   }\r
 \r
 EFI_GUID  mFormSetGuid    = FORMSET_GUID;\r

-EFI_GUID  mStringPackGuid = STRING_PACK_GUID; \r
+EFI_GUID  mStringPackGuid = STRING_PACK_GUID;\r

 \r
 STATIC\r
 EFI_STATUS\r
 \r
 STATIC\r
 EFI_STATUS\r


@@ -50,7 +45,7 @@ Routine Description:
 \r
   This is the function that is called to provide results data to the driver.  This data\r
   consists of a unique key which is used to identify what data is either being passed back\r
 \r
   This is the function that is called to provide results data to the driver.  This data\r
   consists of a unique key which is used to identify what data is either being passed back\r

-  or being asked for. \r
+  or being asked for.\r

 \r
 Arguments:\r
 \r
 \r
 Arguments:\r
 \r


@@ -60,7 +55,7 @@ Arguments:
 \r
   Data -            A pointer to the data being sent to the original exporting driver.\r
 \r
 \r
   Data -            A pointer to the data being sent to the original exporting driver.\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -507,7 +502,7 @@ DriverSampleInit (
 \r
   CallbackInfo->CallbackHandle  = Handle;\r
 \r
 \r
   CallbackInfo->CallbackHandle  = Handle;\r
 \r

-  PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleStrings);\r
+  PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleDxeStrings);\r

   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
   FreePool (PackageList);\r
 \r
   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
   FreePool (PackageList);\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs
deleted file mode 100644 (file)
index 500e32e..0000000
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2007, 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:\r
-\r
-  DriverSample.dxs\r
-\r
-Abstract:\r
-\r
-  Dependency expression source file.\r
-\r
---*/\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-#include <DxeDepex.h>\r
-\r
-DEPENDENCY_START\r
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID\r
-DEPENDENCY_END\r

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
index ba3a50d9b279de64b03054c86286505a011e0a34..c02c24488d307621d5d492e5708cd5906041052e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -25,9 +25,27 @@ Revision History
 \r
 \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
+#include <Protocol/FormCallbackFramework.h>\r
+#include <Protocol/HiiFramework.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/IfrSupportLibFramework.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/HiiLibFramework.h>\r

 \r
 #include "NVDataStruc.h"\r
 \r
 \r
 #include "NVDataStruc.h"\r
 \r


@@ -43,7 +61,7 @@ extern UINT8  InventoryBin[];
 //\r
 // extern UINT8 InventoryStringsStr[];\r
 //\r
 //\r
 // extern UINT8 InventoryStringsStr[];\r
 //\r

-extern UINT8  DriverSampleStrings[];\r
+extern UINT8  DriverSampleDxeStrings[];\r

 \r
 #define SAMPLE_STRING               L"This is an error!"\r
 \r
 \r
 #define SAMPLE_STRING               L"This is an error!"\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf
deleted file mode 100644 (file)
index f9d45cd..0000000
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf
+++ /dev/null
@@ -1,108 +0,0 @@
-#/** @file\r
-# Component description file for DriverSample module.\r
-#\r
-# This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol.\r
-# Copyright (c) 2006 - 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
-#  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
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = DriverSample\r
-  FILE_GUID                      = FE3542FE-C1D3-4EF8-657C-8048606FF670\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = DriverSampleInit\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-\r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
-[Sources.common]\r
-  DriverSample.h\r
-  NVDataStruc.h\r
-  DriverSample.c\r
-  Vfr.vfr\r
-  VfrStrings.uni\r
-  Inventory.vfr\r
-  InventoryStrings.uni\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
-[LibraryClasses]\r
-  HiiLibFramework\r
-  MemoryAllocationLib\r
-  BaseMemoryLib\r
-  IfrSupportLibFramework\r
-  PrintLib\r
-  BaseLib\r
-  UefiDriverEntryPoint\r
-  DebugLib\r
-  UefiRuntimeServicesTableLib\r
-  UefiBootServicesTableLib\r
-\r
-\r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
-[Protocols]\r
-  gEfiFormCallbackProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
-\r
-################################################################################\r
-#\r
-# Dependency Expression Section - list of Dependency expressions that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
-[Depex]\r
-  gEfiSimpleTextOutProtocolGuid
\ No newline at end of file

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa
deleted file mode 100644 (file)
index 4c96b5e..0000000
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
-  <MsaHeader>\r
-    <ModuleName>DriverSample</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>FE3542FE-C1D3-4EF8-657C-8048606FF670</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Component description file for DriverSample module.</Abstract>\r
-    <Description>This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. </Description>\r
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
-    <License>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
-      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.</License>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>DriverSample</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
-      <Keyword>DebugLib</Keyword>\r
-      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiDriverEntryPoint</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">\r
-      <Keyword>PrintLib</Keyword>\r
-      <HelpText>Recommended libary Instance is BasePrintLib instance in MdePkg.</HelpText>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>EdkIfrSupportLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>MemoryAllocationLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>HiiLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>InventoryStrings.uni</Filename>\r
-    <Filename>Inventory.vfr</Filename>\r
-    <Filename>VfrStrings.uni</Filename>\r
-    <Filename>Vfr.vfr</Filename>\r
-    <Filename>DriverSample.c</Filename>\r
-    <Filename>NVDataStruc.h</Filename>\r
-    <Filename>DriverSample.h</Filename>\r
-    <Filename>DriverSample.dxs</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-    <Protocol Usage="ALWAYS_PRODUCED">\r
-      <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <HiiPackages>\r
-    <HiiPackage Usage="ALWAYS_PRODUCED">\r
-      <HiiCName>DriverSampleStrings</HiiCName>\r
-      <HelpText>EFI_HII_STRING type string package from UNI file.</HelpText>\r
-    </HiiPackage>\r
-    <HiiPackage Usage="ALWAYS_PRODUCED">\r
-      <HiiCName>InventoryBin</HiiCName>\r
-      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>\r
-    </HiiPackage>\r
-    <HiiPackage Usage="ALWAYS_PRODUCED">\r
-      <HiiCName>VfrBin</HiiCName>\r
-      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>\r
-    </HiiPackage>\r
-  </HiiPackages>\r
-  <Externs>\r
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
-    <Extern>\r
-      <ModuleEntryPoint>DriverSampleInit</ModuleEntryPoint>\r
-    </Extern>\r
-  </Externs>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
new file mode 100644 (file)
index 0000000..d160005
--- /dev/null
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -0,0 +1,106 @@
+#/** @file\r
+# Component description file for DriverSample module.\r
+#\r
+# This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol.\r
+# Copyright (c) 2006 - 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
+#  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
+#\r
+# Defines Section - statements that will be processed to create a Makefile.\r
+#\r
+################################################################################\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = DriverSampleDxe\r
+  FILE_GUID                      = FE3542FE-C1D3-4EF8-657C-8048606FF670\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = DriverSampleInit\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+\r
+################################################################################\r
+#\r
+# Sources Section - list of files that are required for the build to succeed.\r
+#\r
+################################################################################\r
+\r
+[Sources.common]\r
+  DriverSample.h\r
+  NVDataStruc.h\r
+  DriverSample.c\r
+  Vfr.vfr\r
+  VfrStrings.uni\r
+  Inventory.vfr\r
+  InventoryStrings.uni\r
+\r
+################################################################################\r
+#\r
+# Package Dependency Section - list of Package files that are required for\r
+#                              this module.\r
+#\r
+################################################################################\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
+\r
+\r
+################################################################################\r
+#\r
+# Library Class Section - list of Library Classes that are required for\r
+#                         this module.\r
+#\r
+################################################################################\r
+\r
+[LibraryClasses]\r
+  HiiLibFramework\r
+  MemoryAllocationLib\r
+  BaseMemoryLib\r
+  IfrSupportLibFramework\r
+  PrintLib\r
+  BaseLib\r
+  UefiDriverEntryPoint\r
+  DebugLib\r
+  UefiRuntimeServicesTableLib\r
+  UefiBootServicesTableLib\r
+\r
+\r
+\r
+################################################################################\r
+#\r
+# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
+#                           that this module uses or produces.\r
+#\r
+################################################################################\r
+\r
+[Protocols]\r
+  gEfiFormCallbackProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
+\r
+################################################################################\r
+#\r
+# Dependency Expression Section - list of Dependency expressions that are required for\r
+#                              this module.\r
+#\r
+################################################################################\r
+\r
+[Depex]\r
+  gEfiSimpleTextOutProtocolGuid
\ No newline at end of file

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa
new file mode 100644 (file)
index 0000000..4facd06
--- /dev/null
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+  <MsaHeader>\r
+    <ModuleName>DriverSampleDxe</ModuleName>\r
+    <ModuleType>DXE_DRIVER</ModuleType>\r
+    <GuidValue>FE3542FE-C1D3-4EF8-657C-8048606FF670</GuidValue>\r
+    <Version>1.0</Version>\r
+    <Abstract>Component description file for DriverSample module.</Abstract>\r
+    <Description>This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. </Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>\r
+    <License>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
+      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.</License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>DriverSampleDxe</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <LibraryClassDefinitions>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>UefiBootServicesTableLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>UefiRuntimeServicesTableLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
+      <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>UefiDriverEntryPoint</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3">\r
+      <Keyword>PrintLib</Keyword>\r
+      <HelpText>Recommended libary Instance is BasePrintLib instance in MdePkg.</HelpText>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>EdkIfrSupportLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseMemoryLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>MemoryAllocationLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>HiiLib</Keyword>\r
+    </LibraryClass>\r
+  </LibraryClassDefinitions>\r
+  <SourceFiles>\r
+    <Filename>InventoryStrings.uni</Filename>\r
+    <Filename>Inventory.vfr</Filename>\r
+    <Filename>VfrStrings.uni</Filename>\r
+    <Filename>Vfr.vfr</Filename>\r
+    <Filename>DriverSample.c</Filename>\r
+    <Filename>NVDataStruc.h</Filename>\r
+    <Filename>DriverSample.h</Filename>\r
+    <Filename>DriverSample.dxs</Filename>\r
+  </SourceFiles>\r
+  <PackageDependencies>\r
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
+  </PackageDependencies>\r
+  <Protocols>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiHiiProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
+      <ProtocolCName>gEfiFormCallbackProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+  </Protocols>\r
+  <HiiPackages>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>DriverSampleStrings</HiiCName>\r
+      <HelpText>EFI_HII_STRING type string package from UNI file.</HelpText>\r
+    </HiiPackage>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>InventoryBin</HiiCName>\r
+      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>\r
+    </HiiPackage>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>VfrBin</HiiCName>\r
+      <HelpText>EFI_HII_IFR type form package from VFR file.</HelpText>\r
+    </HiiPackage>\r
+  </HiiPackages>\r
+  <Externs>\r
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
+    <Extern>\r
+      <ModuleEntryPoint>DriverSampleInit</ModuleEntryPoint>\r
+    </Extern>\r
+  </Externs>\r
+</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/CommonHeader.h b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/CommonHeader.h
deleted file mode 100644 (file)
index f318a4d..0000000
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/CommonHeader.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, 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
-   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
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\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/GlobalVariable.h>\r
-#include <Protocol/FormCallbackFramework.h>\r
-#include <Protocol/HiiFramework.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/IfrSupportLibFramework.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Fonts.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Fonts.c
index 2c3980da633eb7c3b532ead383af2038b5c09d38..65a19e043a9704b3517f2c4cd24792005a94fcb8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Fonts.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Fonts.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+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
 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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -20,11 +20,6 @@ Abstract:
 --*/\r
 \r
 \r
 --*/\r
 \r
 \r

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

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


@@ -85,7 +80,7 @@ HiiGetGlyph (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  Translates a Unicode character into the corresponding font glyph.  \r
+  Translates a Unicode character into the corresponding font glyph.\r

   If the Source was pointing to a non-spacing character, the next Source[*Index]\r
   character will be parsed and OR'd to the GlyphBuffer until a spacing character\r
   is found in the Source.  Since non-spacing characters are considered to be the\r
   If the Source was pointing to a non-spacing character, the next Source[*Index]\r
   character will be parsed and OR'd to the GlyphBuffer until a spacing character\r
   is found in the Source.  Since non-spacing characters are considered to be the\r


@@ -98,7 +93,7 @@ Routine Description:
 \r
 Arguments:\r
 \r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -222,7 +217,7 @@ Returns:
       Attributes = GlobalData->NarrowGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;\r
     } else {\r
       for (Value = 0; Value != Count; Value++) {\r
       Attributes = GlobalData->NarrowGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;\r
     } else {\r
       for (Value = 0; Value != Count; Value++) {\r

-        *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] | \r
+        *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] |\r

                                                   GlobalData->WideGlyphs[Character].GlyphCol1[Value]);\r
         *GlyphBuffer[Location + Value + Count] = (UINT8) (*GlyphBuffer[Location + Value + Count] |\r
                                                           GlobalData->WideGlyphs[Character].GlyphCol2[Value]);\r
                                                   GlobalData->WideGlyphs[Character].GlyphCol1[Value]);\r
         *GlyphBuffer[Location + Value + Count] = (UINT8) (*GlyphBuffer[Location + Value + Count] |\r
                                                           GlobalData->WideGlyphs[Character].GlyphCol2[Value]);\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Forms.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Forms.c
index c9a8d9aaf490be449db9363693c725fad7fb35ab..ab39d8a84ed0b6c961ad36e6fdb41a8ed1f1b06c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Forms.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Forms.c
@@ -1,22 +1,17 @@
 /**@file\r
   This file contains the form processing code to the HII database.\r
 /**@file\r
   This file contains the form processing code to the HII database.\r

-  \r
+\r

 Copyright (c) 2006 - 2007 Intel Corporation. <BR>\r
 Copyright (c) 2006 - 2007 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
-                                                                                          \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
+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

-**/\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

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

 \r
 #include "HiiDatabase.h"\r
 \r
 \r
 #include "HiiDatabase.h"\r
 \r


@@ -27,24 +22,24 @@ Ascii2Unicode (
   IN  CHAR8          *AsciiStr\r
   )\r
 /*++\r
   IN  CHAR8          *AsciiStr\r
   )\r
 /*++\r

-  \r
+\r

   Routine Description:\r
 \r
     This function converts ASCII string to Unicode string.\r
   Routine Description:\r
 \r
     This function converts ASCII string to Unicode string.\r

-  \r
+\r

   Arguments:\r
 \r
     UnicodeStr     - NULL terminated Unicode output string.\r
     AsciieStr      - NULL terminated ASCII input string.\r
   Arguments:\r
 \r
     UnicodeStr     - NULL terminated Unicode output string.\r
     AsciieStr      - NULL terminated ASCII input string.\r

- \r
-  Returns: \r
+\r
+  Returns:\r

 \r
     Start of the Unicode ouput string.\r
 \r
     Start of the Unicode ouput string.\r

-    \r
+\r

 --*/\r
 \r
 {\r
 --*/\r
 \r
 {\r

-  CHAR16      *Str = UnicodeStr;  \r
+  CHAR16      *Str = UnicodeStr;\r

   while (TRUE) {\r
     *(UnicodeStr++) = (CHAR16) *AsciiStr;\r
     if (*(AsciiStr++) == '\0') {\r
   while (TRUE) {\r
     *(UnicodeStr++) = (CHAR16) *AsciiStr;\r
     if (*(AsciiStr++) == '\0') {\r


@@ -60,24 +55,24 @@ Unicode2Ascii (
   IN  CHAR16         *UnicodeStr\r
   )\r
 /*++\r
   IN  CHAR16         *UnicodeStr\r
   )\r
 /*++\r

-  \r
+\r

   Routine Description:\r
 \r
     This function converts Unicode string to ASCII string.\r
   Routine Description:\r
 \r
     This function converts Unicode string to ASCII string.\r

-  \r
+\r

   Arguments:\r
 \r
     AsciieStr      - NULL terminated ASCII output string.\r
     UnicodeStr     - NULL terminated Unicode input string.\r
   Arguments:\r
 \r
     AsciieStr      - NULL terminated ASCII output string.\r
     UnicodeStr     - NULL terminated Unicode input string.\r

- \r
-  Returns: \r
+\r
+  Returns:\r

 \r
     Start of the ASCII ouput string.\r
 \r
     Start of the ASCII ouput string.\r

-    \r
+\r

 --*/\r
 \r
 {\r
 --*/\r
 \r
 {\r

-  CHAR8      *Str = AsciiStr;  \r
+  CHAR8      *Str = AsciiStr;\r

   while (TRUE) {\r
     *(AsciiStr++) = (CHAR8) *UnicodeStr;\r
     if (*(UnicodeStr++) == '\0') {\r
   while (TRUE) {\r
     *(AsciiStr++) = (CHAR8) *UnicodeStr;\r
     if (*(UnicodeStr++) == '\0') {\r


@@ -96,10 +91,10 @@ ExtractDevicePathData (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -141,22 +136,22 @@ ExtractVariableData (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  This function extract the EFI_HII_VARIABLE_PACK portion from the \r
+  This function extract the EFI_HII_VARIABLE_PACK portion from the\r

   each of the EFI_HII_PACKAGE_INSTANCE in HII handle database.\r
   each of the EFI_HII_PACKAGE_INSTANCE in HII handle database.\r

-  \r
+\r

 Arguments:\r
 \r
   DataTable       - On input, this parameter point to the EFI_HII_DATA_TABLE structure\r
                     of the final data buffer for the EFI_HII_EXPORT interface. This function\r
                     update the NumberOfVariableData attribute.\r
   IfrData         - It points to a staring address of a EFI_HII_IFR_PACK structure.\r
 Arguments:\r
 \r
   DataTable       - On input, this parameter point to the EFI_HII_DATA_TABLE structure\r
                     of the final data buffer for the EFI_HII_EXPORT interface. This function\r
                     update the NumberOfVariableData attribute.\r
   IfrData         - It points to a staring address of a EFI_HII_IFR_PACK structure.\r

-  ExportBufferPtr - On input, it points the starting address of the data buffer to \r
+  ExportBufferPtr - On input, it points the starting address of the data buffer to\r

                     host the variable pack. On output, it is the starting address\r
                     of data buffer for the next extraction operation.\r
                     host the variable pack. On output, it is the starting address\r
                     of data buffer for the next extraction operation.\r

-Returns: \r
+Returns:\r

 \r
   VOID\r
 \r
   VOID\r

-  \r
+\r

 --*/\r
 {\r
   EFI_HII_VARIABLE_PACK       *VariableContents;\r
 --*/\r
 {\r
   EFI_HII_VARIABLE_PACK       *VariableContents;\r


@@ -356,13 +351,13 @@ HiiExportDatabase (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
-  This function allows a program to extract a form or form package that has \r
+\r
+  This function allows a program to extract a form or form package that has\r

   previously been registered with the EFI HII database.\r
 \r
 Arguments:\r
 \r
   previously been registered with the EFI HII database.\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -414,7 +409,7 @@ Returns:
     //\r
     // Extract Size of Export Package\r
     //\r
     //\r
     // Extract Size of Export Package\r
     //\r

-    SizeNeeded = SizeNeeded + PackageInstance->IfrSize \r
+    SizeNeeded = SizeNeeded + PackageInstance->IfrSize\r

                             + PackageInstance->StringSize\r
                             + sizeof (EFI_HII_DATA_TABLE)\r
                             + sizeof (EFI_HII_DEVICE_PATH_PACK);\r
                             + PackageInstance->StringSize\r
                             + sizeof (EFI_HII_DATA_TABLE)\r
                             + sizeof (EFI_HII_DEVICE_PATH_PACK);\r


@@ -696,35 +691,35 @@ HiiGetForms (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
-  This function allows a program to extract a form or form package that has \r
+\r
+  This function allows a program to extract a form or form package that has\r

   previously been registered with the EFI HII database.\r
 \r
 Arguments:\r
   This         - A pointer to the EFI_HII_PROTOCOL instance.\r
   previously been registered with the EFI HII database.\r
 \r
 Arguments:\r
   This         - A pointer to the EFI_HII_PROTOCOL instance.\r

-  \r
-  Handle       - Handle on which the form resides. Type EFI_HII_HANDLE is defined in \r
+\r
+  Handle       - Handle on which the form resides. Type EFI_HII_HANDLE is defined in\r

                  EFI_HII_PROTOCOL.NewPack() in the Packages section.\r
                  EFI_HII_PROTOCOL.NewPack() in the Packages section.\r

-            \r
+\r

   FormId       - The ID of the form to return. If the ID is zero, the entire form package is returned.\r
                  Type EFI_FORM_ID is defined in "Related Definitions" below.\r
   FormId       - The ID of the form to return. If the ID is zero, the entire form package is returned.\r
                  Type EFI_FORM_ID is defined in "Related Definitions" below.\r

-            \r
+\r

   BufferLength - On input, the length of the Buffer. On output, the length of the returned buffer, if\r
                  the length was sufficient and, if it was not, the length that is required to fit the\r
                  requested form(s).\r
   BufferLength - On input, the length of the Buffer. On output, the length of the returned buffer, if\r
                  the length was sufficient and, if it was not, the length that is required to fit the\r
                  requested form(s).\r

-                  \r
+\r

   Buffer       - The buffer designed to receive the form(s).\r
 \r
   Buffer       - The buffer designed to receive the form(s).\r
 \r

-Returns: \r
+Returns:\r

 \r
   EFI_SUCCESS           -  Buffer filled with the requested forms. BufferLength\r
                            was updated.\r
 \r
   EFI_SUCCESS           -  Buffer filled with the requested forms. BufferLength\r
                            was updated.\r

-                           \r
+\r

   EFI_INVALID_PARAMETER -  The handle is unknown.\r
   EFI_INVALID_PARAMETER -  The handle is unknown.\r

-  \r
+\r

   EFI_NOT_FOUND         -  A form on the requested handle cannot be found with the\r
                            requested FormId.\r
   EFI_NOT_FOUND         -  A form on the requested handle cannot be found with the\r
                            requested FormId.\r

-                           \r
+\r

   EFI_BUFFER_TOO_SMALL  - The buffer provided was not large enough to allow the form to be stored.\r
 \r
 --*/\r
   EFI_BUFFER_TOO_SMALL  - The buffer provided was not large enough to allow the form to be stored.\r
 \r
 --*/\r


@@ -824,7 +819,7 @@ Returns:
             *BufferLengthTemp = FormLength;\r
             return EFI_BUFFER_TOO_SMALL;\r
           }\r
             *BufferLengthTemp = FormLength;\r
             return EFI_BUFFER_TOO_SMALL;\r
           }\r

-          \r
+\r

           //\r
           // Rewind to start offset of the found Form\r
           //\r
           //\r
           // Rewind to start offset of the found Form\r
           //\r


@@ -857,21 +852,21 @@ HiiGetDefaultImageInitPack (
   IN     EFI_IFR_VARSTORE            *VarStore\r
   )\r
 /*++\r
   IN     EFI_IFR_VARSTORE            *VarStore\r
   )\r
 /*++\r

-    \r
+\r

   Routine Description:\r
 \r
     Initialize the EFI_HII_VARIABLE_PACK_LIST structure and\r
     prepare it ready to be used by HiiGetDefaultImagePopulateMap ().\r
   Routine Description:\r
 \r
     Initialize the EFI_HII_VARIABLE_PACK_LIST structure and\r
     prepare it ready to be used by HiiGetDefaultImagePopulateMap ().\r

-      \r
+\r

   Arguments:\r
 \r
     VariablePackItem     - Variable Package List.\r
     VarStore             - IFR variable storage.\r
   Arguments:\r
 \r
     VariablePackItem     - Variable Package List.\r
     VarStore             - IFR variable storage.\r

-   \r
-  Returns: \r
+\r
+  Returns:\r

 \r
     Return the pointer to the Map space.\r
 \r
     Return the pointer to the Map space.\r

-      \r
+\r

 --*/\r
 {\r
   CHAR16                *Name16;\r
 --*/\r
 {\r
   CHAR16                *Name16;\r


@@ -900,7 +895,7 @@ HiiGetDefaultImageInitPack (
   VariablePack->VariableId         = VarStore->VarId;\r
   CopyMem (&VariablePack->VariableGuid, &VarStore->Guid, sizeof (EFI_GUID));\r
   VariablePack->VariableNameLength = (UINT32) ((StrLen (Name16) + 1) * 2);\r
   VariablePack->VariableId         = VarStore->VarId;\r
   CopyMem (&VariablePack->VariableGuid, &VarStore->Guid, sizeof (EFI_GUID));\r
   VariablePack->VariableNameLength = (UINT32) ((StrLen (Name16) + 1) * 2);\r

-  VariablePack->Header.Length      = sizeof (*VariablePack) \r
+  VariablePack->Header.Length      = sizeof (*VariablePack)\r

                                               + VariablePack->VariableNameLength\r
                                               + VarStore->Size;\r
   //\r
                                               + VariablePack->VariableNameLength\r
                                               + VarStore->Size;\r
   //\r


@@ -914,28 +909,28 @@ HiiGetDefaultImageInitPack (
 STATIC\r
 VOID\r
 HiiGetDefaultImagePopulateMap (\r
 STATIC\r
 VOID\r
 HiiGetDefaultImagePopulateMap (\r

-  IN OUT UINT8                        *Map,  \r
+  IN OUT UINT8                        *Map,\r

   IN     EFI_IFR_OP_HEADER            *FormSet,\r
   IN     EFI_IFR_VARSTORE             *VarStore,\r
   IN     UINTN                        DefaultMask\r
   )\r
 /*++\r
   IN     EFI_IFR_OP_HEADER            *FormSet,\r
   IN     EFI_IFR_VARSTORE             *VarStore,\r
   IN     UINTN                        DefaultMask\r
   )\r
 /*++\r

-    \r
+\r

   Routine Description:\r
 \r
    Fill the Map with all the default values either from NV or Hii database.\r
   Routine Description:\r
 \r
    Fill the Map with all the default values either from NV or Hii database.\r

-      \r
+\r

   Arguments:\r
 \r
    Map         - Memory pointer to hold the default values.\r
    FormSet     - The starting EFI_IFR_OP_HEADER to begin retriving default values.\r
    VarStore    - IFR variable storage.\r
    DefaultMask - The mask used to get the default variable.\r
   Arguments:\r
 \r
    Map         - Memory pointer to hold the default values.\r
    FormSet     - The starting EFI_IFR_OP_HEADER to begin retriving default values.\r
    VarStore    - IFR variable storage.\r
    DefaultMask - The mask used to get the default variable.\r

-   \r
-  Returns: \r
+\r
+  Returns:\r

 \r
    VOID\r
 \r
    VOID\r

-      \r
+\r

 --*/\r
 {\r
   EFI_STATUS                     Status;\r
 --*/\r
 {\r
   EFI_STATUS                     Status;\r


@@ -950,7 +945,7 @@ HiiGetDefaultImagePopulateMap (
   EFI_IFR_NV_DATA                *IfrNvData;\r
   EFI_GUID                       Guid;\r
   CHAR16                         *Name16;\r
   EFI_IFR_NV_DATA                *IfrNvData;\r
   EFI_GUID                       Guid;\r
   CHAR16                         *Name16;\r

-  CHAR8                          *Name8;  \r
+  CHAR8                          *Name8;\r

   EFI_HANDLE                      CallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL     *FormCallbackProt;\r
 \r
   EFI_HANDLE                      CallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL     *FormCallbackProt;\r
 \r


@@ -993,7 +988,7 @@ HiiGetDefaultImagePopulateMap (
   }\r
   if (!EFI_ERROR (Status)) {\r
     //\r
   }\r
   if (!EFI_ERROR (Status)) {\r
     //\r

-    // Either Defaults/Manufacturing variable exists and appears to be valid. \r
+    // Either Defaults/Manufacturing variable exists and appears to be valid.\r

     // The map is read, exit w/ success now.\r
     //\r
     FreePool (Name16);\r
     // The map is read, exit w/ success now.\r
     //\r
     FreePool (Name16);\r


@@ -1002,10 +997,10 @@ HiiGetDefaultImagePopulateMap (
 \r
   //\r
   // First, prime the map with what already is in the NV.\r
 \r
   //\r
   // First, prime the map with what already is in the NV.\r

-  // This is needed to cover a situation where the IFR does not contain all the \r
+  // This is needed to cover a situation where the IFR does not contain all the\r

   // defaults; either deliberately not having appropriate IFR, or in case of IFR_STRING, there is no default.\r
   // defaults; either deliberately not having appropriate IFR, or in case of IFR_STRING, there is no default.\r

-  // Ignore status. Either it gets read or not. \r
-  //  \r
+  // Ignore status. Either it gets read or not.\r
+  //\r

   FormCallbackProt = NULL;\r
   CopyMem (&CallbackHandle, &((EFI_IFR_FORM_SET*) FormSet)->CallbackHandle, sizeof (CallbackHandle));\r
   if (CallbackHandle != NULL) {\r
   FormCallbackProt = NULL;\r
   CopyMem (&CallbackHandle, &((EFI_IFR_FORM_SET*) FormSet)->CallbackHandle, sizeof (CallbackHandle));\r
   if (CallbackHandle != NULL) {\r


@@ -1042,7 +1037,7 @@ HiiGetDefaultImagePopulateMap (
     }\r
   } else {\r
     //\r
     }\r
   } else {\r
     //\r

-    // No callback available for this formset, read straight from NV. Deliberately ignore the Status. \r
+    // No callback available for this formset, read straight from NV. Deliberately ignore the Status.\r

     // The buffer will only be written if variable exists nd has correct size.\r
     //\r
     Status = EfiLibHiiVariableRetrieveFromNv (\r
     // The buffer will only be written if variable exists nd has correct size.\r
     //\r
     Status = EfiLibHiiVariableRetrieveFromNv (\r


@@ -1056,8 +1051,8 @@ HiiGetDefaultImagePopulateMap (
   //\r
   // Iterate all IFR statements and for applicable, retrieve the default into the Map.\r
   //\r
   //\r
   // Iterate all IFR statements and for applicable, retrieve the default into the Map.\r
   //\r

-  for (IfrItem = FormSet, VarId = 0; \r
-       IfrItem->OpCode != EFI_IFR_END_FORM_SET_OP; \r
+  for (IfrItem = FormSet, VarId = 0;\r
+       IfrItem->OpCode != EFI_IFR_END_FORM_SET_OP;\r

        IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length)\r
       ) {\r
 \r
        IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length)\r
       ) {\r
 \r


@@ -1073,11 +1068,11 @@ HiiGetDefaultImagePopulateMap (
 \r
     //\r
     // Skip opcodes that reference other VarStore than that specific to current map.\r
 \r
     //\r
     // Skip opcodes that reference other VarStore than that specific to current map.\r

-    // \r
+    //\r

     if (VarId != VarStore->VarId) {\r
       continue;\r
     }\r
     if (VarId != VarStore->VarId) {\r
       continue;\r
     }\r

-    \r
+\r

     //\r
     // Extract the default value from this opcode if applicable, and apply it to the map.\r
     //\r
     //\r
     // Extract the default value from this opcode if applicable, and apply it to the map.\r
     //\r


@@ -1089,7 +1084,7 @@ HiiGetDefaultImagePopulateMap (
         //\r
         // Get to the first EFI_IFR_ONE_OF_OPTION_OP\r
         //\r
         //\r
         // Get to the first EFI_IFR_ONE_OF_OPTION_OP\r
         //\r

-        IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length); \r
+        IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8*) IfrItem + IfrItem->Length);\r

         ASSERT (EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode);\r
 \r
         OneOfOpt = (EFI_IFR_ONE_OF_OPTION *)IfrItem;\r
         ASSERT (EFI_IFR_ONE_OF_OPTION_OP == IfrItem->OpCode);\r
 \r
         OneOfOpt = (EFI_IFR_ONE_OF_OPTION *)IfrItem;\r


@@ -1126,7 +1121,7 @@ HiiGetDefaultImagePopulateMap (
 \r
       case EFI_IFR_CHECKBOX_OP:\r
         ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);\r
 \r
       case EFI_IFR_CHECKBOX_OP:\r
         ASSERT (IfrNvData->QuestionId + IfrNvData->StorageWidth <= VarStore->Size);\r

-        CheckBox = (EFI_IFR_CHECK_BOX *)IfrItem;        \r
+        CheckBox = (EFI_IFR_CHECK_BOX *)IfrItem;\r

         if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) {\r
           if (0 != (CheckBox->Flags & EFI_IFR_FLAG_MANUFACTURING)) {\r
             *(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE;\r
         if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) {\r
           if (0 != (CheckBox->Flags & EFI_IFR_FLAG_MANUFACTURING)) {\r
             *(UINT8 *) (Map + IfrNvData->QuestionId) = TRUE;\r


@@ -1168,25 +1163,25 @@ HiiGetDefaultImage (
   OUT    EFI_HII_VARIABLE_PACK_LIST  **VariablePackList\r
   )\r
 /*++\r
   OUT    EFI_HII_VARIABLE_PACK_LIST  **VariablePackList\r
   )\r
 /*++\r

-    \r
+\r

   Routine Description:\r
 \r
   Routine Description:\r
 \r

-  This function allows a program to extract the NV Image \r
+  This function allows a program to extract the NV Image\r

   that represents the default storage image\r
   that represents the default storage image\r

-      \r
+\r

   Arguments:\r
     This             - A pointer to the EFI_HII_PROTOCOL instance.\r
     Handle           - The HII handle from which will have default data retrieved.\r
     UINTN            - Mask used to retrieve the default image.\r
   Arguments:\r
     This             - A pointer to the EFI_HII_PROTOCOL instance.\r
     Handle           - The HII handle from which will have default data retrieved.\r
     UINTN            - Mask used to retrieve the default image.\r

-    VariablePackList - Callee allocated, tightly-packed, link list data \r
+    VariablePackList - Callee allocated, tightly-packed, link list data\r

                          structure that contain all default varaible packs\r
                          from the Hii Database.\r
                          structure that contain all default varaible packs\r
                          from the Hii Database.\r

-    \r
-  Returns: \r
+\r
+  Returns:\r

     EFI_NOT_FOUND         - If Hii database does not contain any default images.\r
     EFI_INVALID_PARAMETER - Invalid input parameter.\r
     EFI_SUCCESS           - Operation successful.\r
     EFI_NOT_FOUND         - If Hii database does not contain any default images.\r
     EFI_INVALID_PARAMETER - Invalid input parameter.\r
     EFI_SUCCESS           - Operation successful.\r

-      \r
+\r

 --*/\r
 {\r
   EFI_HII_HANDLE_DATABASE        *HandleDatabase;\r
 --*/\r
 {\r
   EFI_HII_HANDLE_DATABASE        *HandleDatabase;\r


@@ -1198,7 +1193,7 @@ HiiGetDefaultImage (
   UINTN                          SetupMapNameSize;\r
   UINTN                          SizeOfMaps;\r
   EFI_HII_VARIABLE_PACK_LIST     *PackList;\r
   UINTN                          SetupMapNameSize;\r
   UINTN                          SizeOfMaps;\r
   EFI_HII_VARIABLE_PACK_LIST     *PackList;\r

-  EFI_HII_VARIABLE_PACK_LIST     *PackListNext;  \r
+  EFI_HII_VARIABLE_PACK_LIST     *PackListNext;\r

   EFI_HII_VARIABLE_PACK_LIST     *PackListLast;\r
   UINT8                          *Map;\r
 \r
   EFI_HII_VARIABLE_PACK_LIST     *PackListLast;\r
   UINT8                          *Map;\r
 \r


@@ -1232,26 +1227,26 @@ HiiGetDefaultImage (
       //\r
       // Size of the map\r
       //\r
       //\r
       // Size of the map\r
       //\r

-      SizeOfMaps += VarStore->Size; \r
+      SizeOfMaps += VarStore->Size;\r

       //\r
       // add the size of the string, in Unicode\r
       //\r
       //\r
       // add the size of the string, in Unicode\r
       //\r

-      SizeOfMaps += (VarStore->Header.Length - sizeof (*VarStore)) * 2; \r
+      SizeOfMaps += (VarStore->Header.Length - sizeof (*VarStore)) * 2;\r

       //\r
       // Space for node\r
       //\r
       //\r
       // Space for node\r
       //\r

-      SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK);      \r
+      SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK);\r

       //\r
       //\r

-      // Space for linked list node \r
+      // Space for linked list node\r

       //\r
       //\r

-      SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST); \r
+      SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST);\r

     }\r
 \r
     IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);\r
   }\r
 \r
   //\r
     }\r
 \r
     IfrItem = (EFI_IFR_OP_HEADER *) ((UINT8 *) IfrItem + IfrItem->Length);\r
   }\r
 \r
   //\r

-  // If the FormSet OpCode has a non-zero NvDataSize. There is a default \r
+  // If the FormSet OpCode has a non-zero NvDataSize. There is a default\r

   // NvMap with ID=0, GUID that of the formset itself and "Setup" as name.\r
   //\r
   SetupMapNameSize = StrLen (SETUP_MAP_NAME) + 1;\r
   // NvMap with ID=0, GUID that of the formset itself and "Setup" as name.\r
   //\r
   SetupMapNameSize = StrLen (SETUP_MAP_NAME) + 1;\r


@@ -1269,33 +1264,33 @@ HiiGetDefaultImage (
     //\r
     // Size of the map\r
     //\r
     //\r
     // Size of the map\r
     //\r

-    SizeOfMaps += VarStoreDefault->Size; \r
+    SizeOfMaps += VarStoreDefault->Size;\r

     //\r
     // add the size of the string\r
     //\r
     //\r
     // add the size of the string\r
     //\r

-    SizeOfMaps += sizeof (SETUP_MAP_NAME); \r
+    SizeOfMaps += sizeof (SETUP_MAP_NAME);\r

     //\r
     // Space for node\r
     //\r
     //\r
     // Space for node\r
     //\r

-    SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK);      \r
+    SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK);\r

     //\r
     //\r

-    // Space for linked list node \r
+    // Space for linked list node\r

     //\r
     //\r

-    SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST); \r
+    SizeOfMaps += sizeof (EFI_HII_VARIABLE_PACK_LIST);\r

   }\r
 \r
   if (0 == SizeOfMaps) {\r
     //\r
     // The IFR does not have any explicit or default map(s).\r
     //\r
   }\r
 \r
   if (0 == SizeOfMaps) {\r
     //\r
     // The IFR does not have any explicit or default map(s).\r
     //\r

-    return EFI_NOT_FOUND; \r
+    return EFI_NOT_FOUND;\r

   }\r
 \r
   //\r
   // Allocate the return buffer\r
   //\r
   PackList = AllocateZeroPool (SizeOfMaps);\r
   }\r
 \r
   //\r
   // Allocate the return buffer\r
   //\r
   PackList = AllocateZeroPool (SizeOfMaps);\r

-  ASSERT (NULL != PackList); \r
+  ASSERT (NULL != PackList);\r

 \r
   PackListNext = PackList;\r
   PackListLast = PackList;\r
 \r
   PackListNext = PackList;\r
   PackListLast = PackList;\r


@@ -1337,7 +1332,7 @@ HiiGetDefaultImage (
 \r
   PackListLast->NextVariablePack = NULL;\r
   *VariablePackList = PackList;\r
 \r
   PackListLast->NextVariablePack = NULL;\r
   *VariablePackList = PackList;\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -1354,7 +1349,7 @@ HiiUpdateForm (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  This function allows the caller to update a form that has \r
+  This function allows the caller to update a form that has\r

   previously been registered with the EFI HII database.\r
 \r
 Arguments:\r
   previously been registered with the EFI HII database.\r
 \r
 Arguments:\r


@@ -1363,7 +1358,7 @@ Arguments:
   AddData    - If TRUE, add data.  If FALSE, remove data\r
   Data       - If adding data, this is the pointer to the data to add\r
 \r
   AddData    - If TRUE, add data.  If FALSE, remove data\r
   Data       - If adding data, this is the pointer to the data to add\r
 \r

-Returns: \r
+Returns:\r

   EFI_SUCCESS - Update success.\r
   Other       - Update fail.\r
 \r
   EFI_SUCCESS - Update success.\r
   Other       - Update fail.\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
index cac37e58caa2e9d181b80bc11c1ee6c0b29c9b5b..f72a787240f7c8de47e7526c810605b86542a0dd 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006 - 2007, 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
+Copyright (c) 2006 - 2007, 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
 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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "HiiDatabase.h"\r
 \r
 EFI_STATUS\r
 #include "HiiDatabase.h"\r
 \r
 EFI_STATUS\r


@@ -36,11 +31,11 @@ InitializeHiiDatabase (
 \r
 Routine Description:\r
   Initialize HII Database\r
 \r
 Routine Description:\r
   Initialize HII Database\r

-  \r
+\r

 Arguments:\r
   (Standard EFI Image entry - EFI_IMAGE_ENTRY_POINT)\r
 \r
 Arguments:\r
   (Standard EFI Image entry - EFI_IMAGE_ENTRY_POINT)\r
 \r

-Returns: \r
+Returns:\r

   EFI_SUCCESS - Setup loaded.\r
   other       - Setup Error\r
 \r
   EFI_SUCCESS - Setup loaded.\r
   other       - Setup Error\r
 \r


@@ -152,10 +147,10 @@ HiiFindHandles (
 \r
 Routine Description:\r
   Determines the handles that are currently active in the database.\r
 \r
 Routine Description:\r
   Determines the handles that are currently active in the database.\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -221,12 +216,12 @@ HiiGetPrimaryLanguages (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
+\r

   This function allows a program to determine what the primary languages that are supported on a given handle.\r
 \r
 Arguments:\r
 \r
   This function allows a program to determine what the primary languages that are supported on a given handle.\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -319,13 +314,13 @@ HiiGetSecondaryLanguages (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
-  This function allows a program to determine which secondary languages are supported \r
+\r
+  This function allows a program to determine which secondary languages are supported\r

   on a given handle for a given primary language.\r
 \r
   Arguments:\r
 \r
   on a given handle for a given primary language.\r
 \r
   Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.dxs b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.dxs
deleted file mode 100644 (file)
index 3e1fa13..0000000
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.dxs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*++\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:\r
-\r
-  HiiDatabase.dxs\r
-\r
-Abstract:\r
-\r
-  Dependency expression source file.\r
-  \r
---*/\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-#include <DxeDepex.h>\r
-\r
-DEPENDENCY_START\r
-  TRUE\r
-DEPENDENCY_END\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
index adfc31c0c8503ae3e2a33defa8b105e6119227e2..b35dc17a74d589dd05932b88a8fe0863c814670b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -15,7 +15,7 @@ Module Name:
 \r
 Abstract:\r
 \r
 \r
 Abstract:\r
 \r

-  This file contains global defines and prototype definitions \r
+  This file contains global defines and prototype definitions\r

   for the HII database.\r
 \r
 --*/\r
   for the HII database.\r
 \r
 --*/\r


@@ -24,9 +24,26 @@ Abstract:
 #define _HIIDATABASE_H\r
 \r
 //\r
 #define _HIIDATABASE_H\r
 \r
 //\r

-// Include common header file for this module.\r
+// The package level header files this module uses\r
+//\r
+#include <PiDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Guid/GlobalVariable.h>\r
+#include <Protocol/FormCallbackFramework.h>\r
+#include <Protocol/HiiFramework.h>\r
+//\r
+// The Library classes this module consumes\r

 //\r
 //\r

-#include "CommonHeader.h"\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/IfrSupportLibFramework.h>\r

 \r
 //\r
 // HII Database Global data\r
 \r
 //\r
 // HII Database Global data\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
index 3d46b871884a0f346fc20b8f7971f3b32d7ade75..f082caa7dfd62691fc694a51845e586437f92dad 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
@@ -50,7 +50,6 @@
   Forms.c\r
   HiiDatabase.h\r
   HiiDatabase.c\r
   Forms.c\r
   HiiDatabase.h\r
   HiiDatabase.c\r

-  CommonHeader.h\r

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

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Keyboard.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Keyboard.c
index be91d401290dd73b032196ec865d98fa0064e352..a790f6e49590af07c8a85e7c9c52d1760f603347 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Keyboard.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Keyboard.c
@@ -1,12 +1,12 @@
 /*++\r
 \r
 /*++\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
+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:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
 Module Name:\r


@@ -20,11 +20,6 @@ Abstract:
 --*/\r
 \r
 \r
 --*/\r
 \r
 \r

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

 #include "HiiDatabase.h"\r
 \r
 EFI_STATUS\r
 #include "HiiDatabase.h"\r
 \r
 EFI_STATUS\r


@@ -37,10 +32,10 @@ HiiGetKeyboardLayout (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
index 91f5a3a3dbf29fd1a6a47be86ae3f2d2deb6822a..3ddaf4ee71bb3bdc8004e1c83998412626f09b06 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006 - 2007, 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
+Copyright (c) 2006 - 2007, 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
 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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -20,11 +20,6 @@ Abstract:
 --*/\r
 \r
 \r
 --*/\r
 \r
 \r

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

 #include "HiiDatabase.h"\r
 \r
 EFI_STATUS\r
 #include "HiiDatabase.h"\r
 \r
 EFI_STATUS\r


@@ -37,10 +32,10 @@ GetPackSize (
 \r
 Routine Description:\r
   Determines the passed in Pack's size and returns the value.\r
 \r
 Routine Description:\r
   Determines the passed in Pack's size and returns the value.\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -111,10 +106,10 @@ ValidatePack (
 \r
 Routine Description:\r
   Verifies that the package instance is using the correct handle for string operations.\r
 \r
 Routine Description:\r
   Verifies that the package instance is using the correct handle for string operations.\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -227,14 +222,14 @@ HiiNewPack (
 Routine Description:\r
 \r
   Extracts the various packs from a package list.\r
 Routine Description:\r
 \r
   Extracts the various packs from a package list.\r

-  \r
+\r

 Arguments:\r
 \r
   This      - Pointer of HII protocol.\r
   Packages  - Pointer of HII packages.\r
   Handle    - Handle value to be returned.\r
 \r
 Arguments:\r
 \r
   This      - Pointer of HII protocol.\r
   Packages  - Pointer of HII packages.\r
   Handle    - Handle value to be returned.\r
 \r

-Returns: \r
+Returns:\r

 \r
   EFI_SUCCESS           - Pacakges has added to HII database successfully.\r
   EFI_INVALID_PARAMETER - Invalid parameter.\r
 \r
   EFI_SUCCESS           - Pacakges has added to HII database successfully.\r
   EFI_INVALID_PARAMETER - Invalid parameter.\r


@@ -610,10 +605,10 @@ HiiRemovePack (
 \r
 Routine Description:\r
   Removes the various packs from a Handle\r
 \r
 Routine Description:\r
   Removes the various packs from a Handle\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Strings.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Strings.c
index a8b04c088445c1ddf699430312be9c064b924194..5928f1b33087aaae9c9661139eabeced88c775be 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Strings.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Strings.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006 - 2007, 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
+Copyright (c) 2006 - 2007, 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
 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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -20,11 +20,6 @@ Abstract:
 --*/\r
 \r
 \r
 --*/\r
 \r
 \r

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

 #include "HiiDatabase.h"\r
 \r
 STATIC\r
 #include "HiiDatabase.h"\r
 \r
 STATIC\r


@@ -56,10 +51,10 @@ HiiTestString (
 \r
 Routine Description:\r
   Test if all of the characters in a string have corresponding font characters.\r
 \r
 Routine Description:\r
   Test if all of the characters in a string have corresponding font characters.\r

-  \r
+\r

 Arguments:\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -75,7 +70,7 @@ Returns:
   HiiData     = EFI_HII_DATA_FROM_THIS (This);\r
   GlobalData  = HiiData->GlobalData;\r
 \r
   HiiData     = EFI_HII_DATA_FROM_THIS (This);\r
   GlobalData  = HiiData->GlobalData;\r
 \r

-  \r
+\r

   //\r
   // Rewind through the string looking for a glyph width identifier\r
   // If no width identifier exists, we assume string has narrow width identifier\r
   //\r
   // Rewind through the string looking for a glyph width identifier\r
   // If no width identifier exists, we assume string has narrow width identifier\r


@@ -155,18 +150,18 @@ Routine Description:
   We will make a buffer the size of the package + EfiStrSize of the new string.  We will\r
   copy the string package that first gets changed and the following language packages until\r
   we encounter the NULL string package.  All this time we will ensure that the offsets have\r
   We will make a buffer the size of the package + EfiStrSize of the new string.  We will\r
   copy the string package that first gets changed and the following language packages until\r
   we encounter the NULL string package.  All this time we will ensure that the offsets have\r

-  been adjusted.  \r
+  been adjusted.\r

 \r
 Arguments:\r
 \r
 Arguments:\r

-  \r
+\r

   This         -  Pointer to the HII protocol.\r
   Language     -  Pointer to buffer which contains the language code of this NewString.\r
   Handle       -  Handle of the package instance to be processed.\r
   Reference    -  The token number for the string. If 0, new string token to be returned through this parameter.\r
   This         -  Pointer to the HII protocol.\r
   Language     -  Pointer to buffer which contains the language code of this NewString.\r
   Handle       -  Handle of the package instance to be processed.\r
   Reference    -  The token number for the string. If 0, new string token to be returned through this parameter.\r

-  NewString    -  Buffer pointer for the new string. \r
+  NewString    -  Buffer pointer for the new string.\r

   ResetStrings -  Indicate if we are resetting a string.\r
   ResetStrings -  Indicate if we are resetting a string.\r

-  \r
-Returns: \r
+\r
+Returns:\r

 \r
   EFI_SUCCESS            - The string has been added or reset to Hii database.\r
   EFI_INVALID_PARAMETER  - Some parameter passed in is invalid.\r
 \r
   EFI_SUCCESS            - The string has been added or reset to Hii database.\r
   EFI_INVALID_PARAMETER  - Some parameter passed in is invalid.\r


@@ -661,11 +656,11 @@ Routine Description:
   We will make a buffer the size of the package + StrSize of the new string.  We will\r
   copy the string package that first gets changed and the following language packages until\r
   we encounter the NULL string package.  All this time we will ensure that the offsets have\r
   We will make a buffer the size of the package + StrSize of the new string.  We will\r
   copy the string package that first gets changed and the following language packages until\r
   we encounter the NULL string package.  All this time we will ensure that the offsets have\r

-  been adjusted.  \r
+  been adjusted.\r

 \r
 Arguments:\r
 \r
 Arguments:\r

-  \r
-Returns: \r
+\r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -730,12 +725,12 @@ HiiResetStrings (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
+\r

     This function removes any new strings that were added after the initial string export for this handle.\r
 \r
 Arguments:\r
 \r
     This function removes any new strings that were added after the initial string export for this handle.\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r


@@ -787,7 +782,7 @@ HiiGetString (
 /*++\r
 \r
 Routine Description:\r
 /*++\r
 \r
 Routine Description:\r

-  \r
+\r

   This function extracts a string from a package already registered with the EFI HII database.\r
 \r
 Arguments:\r
   This function extracts a string from a package already registered with the EFI HII database.\r
 \r
 Arguments:\r


@@ -795,7 +790,7 @@ Arguments:
   Handle          - The HII handle on which the string resides.\r
   Token           - The string token assigned to the string.\r
   Raw             - If TRUE, the string is returned unedited in the internal storage format described\r
   Handle          - The HII handle on which the string resides.\r
   Token           - The string token assigned to the string.\r
   Raw             - If TRUE, the string is returned unedited in the internal storage format described\r

-                    above. If false, the string returned is edited by replacing <cr> with <space> \r
+                    above. If false, the string returned is edited by replacing <cr> with <space>\r

                     and by removing special characters such as the <wide> prefix.\r
   LanguageString  - Pointer to a NULL-terminated string containing a single ISO 639-2 language\r
                     identifier, indicating the language to print. If the LanguageString is empty (starts\r
                     and by removing special characters such as the <wide> prefix.\r
   LanguageString  - Pointer to a NULL-terminated string containing a single ISO 639-2 language\r
                     identifier, indicating the language to print. If the LanguageString is empty (starts\r


@@ -805,11 +800,11 @@ Arguments:
   StringBuffer    - The buffer designed to receive the characters in the string. Type EFI_STRING is\r
                     defined in String.\r
 \r
   StringBuffer    - The buffer designed to receive the characters in the string. Type EFI_STRING is\r
                     defined in String.\r
 \r

-Returns: \r
+Returns:\r

   EFI_INVALID_PARAMETER - If input parameter is invalid.\r
   EFI_BUFFER_TOO_SMALL  - If the *BufferLength is too small.\r
   EFI_SUCCESS           - Operation is successful.\r
   EFI_INVALID_PARAMETER - If input parameter is invalid.\r
   EFI_BUFFER_TOO_SMALL  - If the *BufferLength is too small.\r
   EFI_SUCCESS           - Operation is successful.\r

-  \r
+\r

 --*/\r
 {\r
   EFI_HII_PACKAGE_INSTANCE  *PackageInstance;\r
 --*/\r
 {\r
   EFI_HII_PACKAGE_INSTANCE  *PackageInstance;\r


@@ -930,11 +925,11 @@ LangNotFound:
     //\r
     // Back to the start of package.\r
     //\r
     //\r
     // Back to the start of package.\r
     //\r

-    StringPack = (VOID*)(((UINT8*)StringPack) - Length); \r
+    StringPack = (VOID*)(((UINT8*)StringPack) - Length);\r

     //\r
     // Terminating zero sub-pack.\r
     //\r
     //\r
     // Terminating zero sub-pack.\r
     //\r

-    Length += sizeof (EFI_HII_STRING_PACK); \r
+    Length += sizeof (EFI_HII_STRING_PACK);\r

 \r
     //\r
     // If trying to get the entire string package and have insufficient space.  Return error.\r
 \r
     //\r
     // If trying to get the entire string package and have insufficient space.  Return error.\r


@@ -1009,11 +1004,11 @@ LangNotFound:
           // Skip "Narraw, Wide, NoBreak"\r
           //\r
           if (CompareMem (Local, &Narrow,  2) &&\r
           // Skip "Narraw, Wide, NoBreak"\r
           //\r
           if (CompareMem (Local, &Narrow,  2) &&\r

-              CompareMem (Local, &Wide,    2) && \r
-              CompareMem (Local, &NoBreak, 2)) {          \r
-            CopyMem (&StringBuffer[Count++], Local, 2);          \r
-          }        \r
-        } \r
+              CompareMem (Local, &Wide,    2) &&\r
+              CompareMem (Local, &NoBreak, 2)) {\r
+            CopyMem (&StringBuffer[Count++], Local, 2);\r
+          }\r
+        }\r

         //\r
         // Add "NULL" at the end.\r
         //\r
         //\r
         // Add "NULL" at the end.\r
         //\r


@@ -1051,13 +1046,13 @@ HiiGetLine (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  This function allows a program to extract a part of a string of not more than a given width.  \r
-  With repeated calls, this allows a calling program to extract "lines" of text that fit inside \r
+  This function allows a program to extract a part of a string of not more than a given width.\r
+  With repeated calls, this allows a calling program to extract "lines" of text that fit inside\r

   columns.  The effort of measuring the fit of strings inside columns is localized to this call.\r
 \r
 Arguments:\r
 \r
   columns.  The effort of measuring the fit of strings inside columns is localized to this call.\r
 \r
 Arguments:\r
 \r

-Returns: \r
+Returns:\r

 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
index b0af07ecbee41895156180283bc1f279cdfd2498..f5450b436d957b0f1272626b853b2bb4a30525d4 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
@@ -20,10 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 \r
 #include "Setup.h"\r
 #include "Ui.h"\r
 \r
 #include "Setup.h"\r
 #include "Ui.h"\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h
index 2ad2aa9c17ea2ebd178c533eba2c54ae6305222a..d47838f6438976bac7edcb0136150bc9daab0cd3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+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
 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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -23,11 +23,6 @@ Revision History
 #ifndef _COLORS_H\r
 #define _COLORS_H\r
 \r
 #ifndef _COLORS_H\r
 #define _COLORS_H\r
 \r

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

 //\r
 // Screen Color Settings\r
 //\r
 //\r
 // Screen Color Settings\r
 //\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/CommonHeader.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/CommonHeader.h
deleted file mode 100644 (file)
index 56934c5..0000000
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/CommonHeader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, 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
-   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
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/FormCallbackFramework.h>\r
-#include <Protocol/FormBrowserFramework.h>\r
-#include <Protocol/HiiFramework.h>\r
-#include <Protocol/Print.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/PrintLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/HiiLibFramework.h>\r
-#include <Library/GraphicsLib.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 4c2189c4767809aa2b08a4a34cbe010e2858603e..85e1a0cf984fc5b16b760fafd05182d35930c57d 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "Setup.h"\r
 #include "Ui.h"\r
 #include "Colors.h"\r
 #include "Setup.h"\r
 #include "Ui.h"\r
 #include "Colors.h"\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
index be5ba57ef7243b43351761c4dc52f6895902d796..6bbe810ee2c184fab2138c70b8e53c72eaa9c5ff 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -19,11 +19,6 @@ Revision History:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "Setup.h"\r
 #include "Ui.h"\r
 #include "Colors.h"\r
 #include "Setup.h"\r
 #include "Ui.h"\r
 #include "Colors.h"\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c
index 57520664198950175fefcdd93032880ae2ac0352..9e08f969931d70b71dddc86a507a3d1bcd7584dc 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c
@@ -32,11 +32,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "Print.h"\r
 \r
 STATIC\r
 #include "Print.h"\r
 \r
 STATIC\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h
index 8ce993b765c1a03ebfeaeffdb455bbc65d8884d3..76f8977f56f9c7110ded927a43099ea5d93509f3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h
@@ -1,12 +1,12 @@
 /*++\r
 \r
 /*++\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
+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:\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
 Module Name:\r


@@ -22,11 +22,6 @@ Abstract:
 #ifndef _PRINT_H_\r
 #define _PRINT_H_\r
 \r
 #ifndef _PRINT_H_\r
 #define _PRINT_H_\r
 \r

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

 #include "Setup.h"\r
 \r
 #define LEFT_JUSTIFY  0x01\r
 #include "Setup.h"\r
 \r
 #define LEFT_JUSTIFY  0x01\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index fd6addf51889bd0b999cde7129be7b0978f1a41f..a2dc8083460a2b6ef6521608aaeddf7fe8be1948 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -12,11 +12,6 @@ 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 "Setup.h"\r
 #include "Ui.h"\r
 \r
 #include "Setup.h"\r
 #include "Ui.h"\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
index 58698c82cde595688a6f555e93e709fc86452e9d..e2f4634cf1a276e55f6069bd811f6db92f59bcb8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -12,10 +12,6 @@ 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 "Setup.h"\r
 #include "Ui.h"\r
 \r
 #include "Setup.h"\r
 #include "Ui.h"\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
index 6cfcf68c3a2f020d02b465d5e27ef04bba0aaabc..cca053b03bd186e6589800a3bd1461d7cf1fc669 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -24,9 +24,30 @@ Revision History
 #define _SETUP_H\r
 \r
 //\r
 #define _SETUP_H\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
+#include <Protocol/FormCallbackFramework.h>\r
+#include <Protocol/FormBrowserFramework.h>\r
+#include <Protocol/HiiFramework.h>\r
+#include <Protocol/Print.h>\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/HiiLibFramework.h>\r
+#include <Library/GraphicsLib.h>\r
+\r

 \r
 //\r
 // This is the generated header file which includes whatever needs to be exported (strings + IFR)\r
 \r
 //\r
 // This is the generated header file which includes whatever needs to be exported (strings + IFR)\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
index e1828b8a87e6f5815ae0cbcb84bd74dd8382e7ab..5399873090baaacb90592a32814478b96c3490ef 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
@@ -57,8 +57,6 @@
   Setup.h\r
   Setup.c\r
   SetupBrowserStr.uni\r
   Setup.h\r
   Setup.c\r
   SetupBrowserStr.uni\r

-  CommonHeader.h\r
-\r

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


@@ -68,10 +66,9 @@
 ################################################################################\r
 \r
 [Packages]\r
 ################################################################################\r
 \r
 [Packages]\r

-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r

   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r

-\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r

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

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
index 8a514a000adf5f609d3f62c9b6127f06deb57349..127b55026266cad8db3f6550a048ee57caab187f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -12,10 +12,6 @@ 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 "Setup.h"\r
 #include "Ui.h"\r
 \r
 #include "Setup.h"\r
 #include "Ui.h"\r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
index 78a51d08c83fc4e37b6838bf1a00fc376ea0f031..784e04b135be7928d70a071290eb7ade0a19c4db 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+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:\r
 \r
 \r
 Module Name:\r
 \r


@@ -24,10 +24,6 @@ Revision History
 #ifndef _UI_H\r
 #define _UI_H\r
 \r
 #ifndef _UI_H\r
 #define _UI_H\r
 \r

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

 \r
 //\r
 // Globals\r
 \r
 //\r
 // Globals\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 288e3988051b190bc5c42a35c14ca2544b244f81..9762313e6ef38c02fc6ff936b307d8a6c87b882b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+  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
 --*/\r
 \r
 \r
 --*/\r
 \r


@@ -46,7 +46,7 @@
 #include <Library/OemHookStatusCodeLib.h>\r
 \r
 //\r
 #include <Library/OemHookStatusCodeLib.h>\r
 \r
 //\r

-// Data hub worker definition \r
+// Data hub worker definition\r

 //\r
 #define MAX_NUMBER_DATAHUB_RECORDS                1000\r
 #define DATAHUB_BYTES_PER_RECORD                  EFI_STATUS_CODE_DATA_MAX_SIZE\r
 //\r
 #define MAX_NUMBER_DATAHUB_RECORDS                1000\r
 #define DATAHUB_BYTES_PER_RECORD                  EFI_STATUS_CODE_DATA_MAX_SIZE\r


@@ -56,8 +56,8 @@
 //\r
 // Address type of pointer.\r
 // The point type always equal to PHYSICAL_MODE on IA32/X64/EBC architecture\r
 //\r
 // Address type of pointer.\r
 // The point type always equal to PHYSICAL_MODE on IA32/X64/EBC architecture\r

-// Otherwise, VIRTUAL_MODE/PHYSICAL_MODE would be used on Ipf architecture, \r
-// \r
+// Otherwise, VIRTUAL_MODE/PHYSICAL_MODE would be used on Ipf architecture,\r
+//\r

 typedef enum {\r
   PHYSICAL_MODE,\r
   VIRTUAL_MODE\r
 typedef enum {\r
   PHYSICAL_MODE,\r
   VIRTUAL_MODE\r


@@ -72,8 +72,8 @@ typedef struct {
 \r
 \r
 //\r
 \r
 \r
 //\r

-// Runtime memory status code worker definition \r
-// \r
+// Runtime memory status code worker definition\r
+//\r

 typedef struct {\r
   UINT32   RecordIndex;\r
   UINT32   NumberOfRecords;\r
 typedef struct {\r
   UINT32   RecordIndex;\r
   UINT32   NumberOfRecords;\r


@@ -83,22 +83,22 @@ typedef struct {
 \r
 typedef struct {\r
   //\r
 \r
 typedef struct {\r
   //\r

-  // Report operation nest status. \r
+  // Report operation nest status.\r

   // If it is set, then the report operation has nested.\r
   // If it is set, then the report operation has nested.\r

-  // \r
+  //\r

   UINT32                            StatusCodeNestStatus;\r
   //\r
   // Runtime status code management header, the records buffer is following it.\r
   UINT32                            StatusCodeNestStatus;\r
   //\r
   // Runtime status code management header, the records buffer is following it.\r

-  // \r
+  //\r

   RUNTIME_MEMORY_STATUSCODE_HEADER  *RtMemoryStatusCodeTable[2];\r
 } DXE_STATUS_CODE_CONTROLLER;\r
 \r
 \r
 /**\r
   RUNTIME_MEMORY_STATUSCODE_HEADER  *RtMemoryStatusCodeTable[2];\r
 } DXE_STATUS_CODE_CONTROLLER;\r
 \r
 \r
 /**\r

-  \r
-  Dispatch initialization request to sub status code devices based on \r
+\r
+  Dispatch initialization request to sub status code devices based on\r

   customized feature flags.\r
   customized feature flags.\r

- \r
+\r

 **/\r
 VOID\r
 InitializationDispatcherWorker (\r
 **/\r
 VOID\r
 InitializationDispatcherWorker (\r


@@ -108,7 +108,7 @@ InitializationDispatcherWorker (
 \r
 /**\r
   Initialize serial status code worker.\r
 \r
 /**\r
   Initialize serial status code worker.\r

- \r
+\r

   @return  The function always return EFI_SUCCESS\r
 \r
 **/\r
   @return  The function always return EFI_SUCCESS\r
 \r
 **/\r


@@ -120,29 +120,29 @@ EfiSerialStatusCodeInitializeWorker (
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r
+                        This parameter allows the status code driver to apply different rules to different callers.\r

                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r
                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r

- \r
+\r

   @retval EFI_SUCCESS         Success to report status code to serial I/O.\r
   @retval EFI_DEVICE_ERROR    EFI serial device can not work after ExitBootService() is called .\r
 \r
   @retval EFI_SUCCESS         Success to report status code to serial I/O.\r
   @retval EFI_DEVICE_ERROR    EFI serial device can not work after ExitBootService() is called .\r
 \r


@@ -158,7 +158,7 @@ SerialStatusCodeReportWorker (
 \r
 /**\r
   Initialize runtime memory status code.\r
 \r
 /**\r
   Initialize runtime memory status code.\r

- \r
+\r

   @return  The function always return EFI_SUCCESS\r
 \r
 **/\r
   @return  The function always return EFI_SUCCESS\r
 \r
 **/\r


@@ -168,26 +168,26 @@ RtMemoryStatusCodeInitializeWorker (
   );\r
 \r
 /**\r
   );\r
 \r
 /**\r

-  Report status code into runtime memory. If the runtime pool is full, roll back to the \r
+  Report status code into runtime memory. If the runtime pool is full, roll back to the\r

   first record and overwrite it.\r
   first record and overwrite it.\r

- \r
-  @param  RtMemoryStatusCodeTable      \r
+\r
+  @param  RtMemoryStatusCodeTable\r

                         Point to Runtime memory table header.\r
 \r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
                         Point to Runtime memory table header.\r
 \r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r

- \r
+\r

   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r
   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r


@@ -202,7 +202,7 @@ RtMemoryStatusCodeReportWorker (
 /**\r
   Initialize data hubstatus code.\r
   Create a data hub listener.\r
 /**\r
   Initialize data hubstatus code.\r
   Create a data hub listener.\r

- \r
+\r

   @return  The function always return EFI_SUCCESS\r
 \r
 **/\r
   @return  The function always return EFI_SUCCESS\r
 \r
 **/\r


@@ -214,29 +214,29 @@ DataHubStatusCodeInitializeWorker (
 \r
 /**\r
   Report status code into DataHub.\r
 \r
 /**\r
   Report status code into DataHub.\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r
+                        This parameter allows the status code driver to apply different rules to different callers.\r

                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r
                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r

- \r
+\r

   @retval EFI_OUT_OF_RESOURCES   Can not acquire record buffer.\r
   @retval EFI_DEVICE_ERROR       EFI serial device can not work after ExitBootService() is called .\r
   @retval EFI_SUCCESS            Success to cache status code and signal log data event.\r
   @retval EFI_OUT_OF_RESOURCES   Can not acquire record buffer.\r
   @retval EFI_DEVICE_ERROR       EFI serial device can not work after ExitBootService() is called .\r
   @retval EFI_SUCCESS            Success to cache status code and signal log data event.\r


@@ -274,7 +274,7 @@ DxeStatusCodeDriverEntry (
 \r
 //\r
 // declaration of DXE status code controller.\r
 \r
 //\r
 // declaration of DXE status code controller.\r

-// \r
+//\r

 extern DXE_STATUS_CODE_CONTROLLER gDxeStatusCode;\r
 \r
 #endif\r
 extern DXE_STATUS_CODE_CONTROLLER gDxeStatusCode;\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
index 7ada24d727aa7d0fe6a3dd549688433345e349c7..f504e586fa0d841b6ab9d635c95fd697c9a46e99 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
@@ -30,7 +30,7 @@
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r

-  ENTRY_POINT                    = InitializeDxeStatusCode\r
+  ENTRY_POINT                    = DxeStatusCodeDriverEntry\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -52,7 +52,6 @@
   DataHubStatusCodeWorker.c\r
   DxeStatusCode.c\r
   DxeStatusCode.h\r
   DataHubStatusCodeWorker.c\r
   DxeStatusCode.c\r
   DxeStatusCode.h\r

-  EntryPoint.c\r

 \r
 [Sources.Ia32]\r
   DxeStatusCodeCommon.c\r
 \r
 [Sources.Ia32]\r
   DxeStatusCodeCommon.c\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
index 5740d6f78a6047ad127a21d0f25dea00dbb6c0a9..eecf38db585e5e6bc34382b0e9e86809052af714 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
@@ -1,48 +1,52 @@
 /** @file\r
   Status code driver for IA32/X64/EBC architecture.\r
 \r
 /** @file\r
   Status code driver for IA32/X64/EBC architecture.\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
+  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
 **/\r
 \r
 #include "DxeStatusCode.h"\r
 \r
 \r
 **/\r
 \r
 #include "DxeStatusCode.h"\r
 \r

+//\r
+// Event for Exit Boot Services Callback\r
+//\r
+STATIC EFI_EVENT mExitBootServicesEvent = NULL;\r

 \r
 /**\r
 \r
 /**\r

-  Report status code to all supported device. \r
+  Report status code to all supported device.\r

   Calls into the workers which dispatches the platform specific\r
   Calls into the workers which dispatches the platform specific\r

-  listeners. \r
+  listeners.\r

 \r
 \r

-  @param  Type          Indicates the type of status code being reported.  \r
+  @param  Type          Indicates the type of status code being reported.\r

                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity.  \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This includes information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing.  \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance \r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance\r

                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r

                         This parameter allows the status code driver to apply different rules to different callers.\r
                         This parameter allows the status code driver to apply different rules to different callers.\r

-  @param  Data          This optional parameter may be used to pass additional data.  \r
-                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
-                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
+  @param  Data          This optional parameter may be used to pass additional data.\r
+                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.\r
+                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and\r

                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r
 \r
 **/\r
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 ReportDispatcher (\r
   IN EFI_STATUS_CODE_TYPE     Type,\r
 EFIAPI\r
 ReportDispatcher (\r
   IN EFI_STATUS_CODE_TYPE     Type,\r


@@ -61,12 +65,12 @@ EFI_STATUS_CODE_PROTOCOL  mEfiStatusCodeProtocol  = {
 };\r
 \r
 //\r
 };\r
 \r
 //\r

-// Delaration of DXE status code controller \r
+// Delaration of DXE status code controller\r

 //\r
 DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {\r
   //\r
 //\r
 DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {\r
   //\r

-  // Initialize nest status as non nested. \r
-  // \r
+  // Initialize nest status as non nested.\r
+  //\r

   0,\r
   {NULL, NULL}\r
 };\r
   0,\r
   {NULL, NULL}\r
 };\r


@@ -74,7 +78,7 @@ DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {
 /**\r
 \r
   Install the ReportStatusCode runtime service.\r
 /**\r
 \r
   Install the ReportStatusCode runtime service.\r

- \r
+\r

   @param ImageHandle     Image handle of the loaded driver\r
   @param SystemTable     Pointer to the System Table\r
 \r
   @param ImageHandle     Image handle of the loaded driver\r
   @param SystemTable     Pointer to the System Table\r
 \r


@@ -107,37 +111,46 @@ DxeStatusCodeDriverEntry (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

+  Status = gBS->CreateEvent (\r
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  TPL_NOTIFY,\r
+                  VirtualAddressChangeCallBack,\r
+                  NULL,\r
+                  &mExitBootServicesEvent\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r

   return Status;\r
 }\r
 \r
 /**\r
   return Status;\r
 }\r
 \r
 /**\r

-  Report status code to all supported device. \r
+  Report status code to all supported device.\r

   Calls into the workers which dispatches the platform specific\r
   Calls into the workers which dispatches the platform specific\r

-  listeners. \r
+  listeners.\r

 \r
 \r

-  @param  CodeType      Indicates the type of status code being reported.  \r
+  @param  CodeType      Indicates the type of status code being reported.\r

                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity.  \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This includes information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing.  \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance \r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance\r

                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r

                         This parameter allows the status code driver to apply different rules to different callers.\r
                         This parameter allows the status code driver to apply different rules to different callers.\r

-  @param  Data          This optional parameter may be used to pass additional data.  \r
-                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
-                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
+  @param  Data          This optional parameter may be used to pass additional data.\r
+                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.\r
+                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and\r

                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r
 \r
 **/\r
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r
 \r
 **/\r

-EFI_STATUS \r
+EFI_STATUS\r

 EFIAPI\r
 ReportDispatcher (\r
   IN EFI_STATUS_CODE_TYPE     CodeType,\r
 EFIAPI\r
 ReportDispatcher (\r
   IN EFI_STATUS_CODE_TYPE     CodeType,\r


@@ -201,7 +214,7 @@ ReportDispatcher (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Virtual address change notification call back. It converts global pointer \r
+  Virtual address change notification call back. It converts global pointer\r

   to virtual address.\r
 \r
   @param  Event         Event whose notification function is being invoked.\r
   to virtual address.\r
 \r
   @param  Event         Event whose notification function is being invoked.\r


@@ -220,7 +233,7 @@ VirtualAddressChangeCallBack (
   // Convert memory status code table to virtual address;\r
   //\r
   EfiConvertPointer (\r
   // Convert memory status code table to virtual address;\r
   //\r
   EfiConvertPointer (\r

-    0, \r
+    0,\r

     (VOID **) &gDxeStatusCode.RtMemoryStatusCodeTable[PHYSICAL_MODE]\r
     );\r
 }\r
     (VOID **) &gDxeStatusCode.RtMemoryStatusCodeTable[PHYSICAL_MODE]\r
     );\r
 }\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/EntryPoint.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/EntryPoint.c
deleted file mode 100644 (file)
index 61722f8..0000000
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/EntryPoint.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point\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
-**/\r
-\r
-#include "DxeStatusCode.h"\r
-\r
-//\r
-// Event for Exit Boot Services Callback\r
-//\r
-STATIC EFI_EVENT mExitBootServicesEvent = NULL;\r
-\r
-/**\r
-  The user Entry Point for module DxeStatusCode. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-\r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeDxeStatusCode(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
-                  TPL_NOTIFY,\r
-                  VirtualAddressChangeCallBack,\r
-                  NULL,\r
-                  &mExitBootServicesEvent\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Call the original Entry Point\r
-  //\r
-  Status = DxeStatusCodeDriverEntry (ImageHandle, SystemTable);\r
-\r
-  return Status;\r
-}\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/CommonHeader.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/CommonHeader.h
deleted file mode 100644 (file)
index 2521548..0000000
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/CommonHeader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\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
-   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
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <FrameworkPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Guid/MemoryStatusCodeRecord.h>\r
-#include <Guid/StatusCodeDataTypeId.h>\r
-#include <Ppi/StatusCode.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PrintLib.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
-#include <Library/SerialPortLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/PeiServicesLib.h>\r
-#include <Library/OemHookStatusCodeLib.h>\r
-#include <Library/PeimEntryPoint.h>\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
index 195e3e2183304d58f6de3452ad01e528d4f3e10c..23b5130c7dd73f36b0d6803bf29cd285b1a1a948 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c
@@ -1,32 +1,27 @@
 /** @file\r
   Memory status code worker in PEI.\r
 \r
 /** @file\r
   Memory status code worker in PEI.\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
+  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:  MemoryStatusCodeWorker.c\r
 \r
 **/\r
 \r
 \r
   Module Name:  MemoryStatusCodeWorker.c\r
 \r
 **/\r
 \r

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

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

-  Create one memory status code GUID'ed HOB, use PacketIndex \r
+  Create one memory status code GUID'ed HOB, use PacketIndex\r

   to identify the packet.\r
 \r
   to identify the packet.\r
 \r

-  @param   PacketIndex    Index of records packet. \r
- \r
+  @param   PacketIndex    Index of records packet.\r
+\r

   @return                 Always return pointer of memory status code packet.\r
 \r
 **/\r
   @return                 Always return pointer of memory status code packet.\r
 \r
 **/\r


@@ -43,8 +38,8 @@ CreateMemoryStatusCodePacket (
   //\r
   PacketHeader =\r
     (MEMORY_STATUSCODE_PACKET_HEADER *) BuildGuidHob (\r
   //\r
   PacketHeader =\r
     (MEMORY_STATUSCODE_PACKET_HEADER *) BuildGuidHob (\r

-                                          &gMemoryStatusCodeRecordGuid, \r
-                                          PcdGet16 (PcdStatusCodeMemorySize) * \r
+                                          &gMemoryStatusCodeRecordGuid,\r
+                                          PcdGet16 (PcdStatusCodeMemorySize) *\r

                                           1024 +\r
                                           sizeof (MEMORY_STATUSCODE_PACKET_HEADER)\r
                                           );\r
                                           1024 +\r
                                           sizeof (MEMORY_STATUSCODE_PACKET_HEADER)\r
                                           );\r


@@ -61,9 +56,9 @@ CreateMemoryStatusCodePacket (
 \r
 /**\r
   Initialize memory status code.\r
 \r
 /**\r
   Initialize memory status code.\r

-  Create one GUID'ed HOB with PCD defined size. If create required size \r
+  Create one GUID'ed HOB with PCD defined size. If create required size\r

   GUID'ed HOB failed, then ASSERT().\r
   GUID'ed HOB failed, then ASSERT().\r

- \r
+\r

   @return           The function always return EFI_SUCCESS\r
 \r
 **/\r
   @return           The function always return EFI_SUCCESS\r
 \r
 **/\r


@@ -83,21 +78,21 @@ MemoryStatusCodeInitializeWorker (
 \r
 /**\r
   Report status code into GUID'ed HOB..\r
 \r
 /**\r
   Report status code into GUID'ed HOB..\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r

- \r
+\r

   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r
   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r


@@ -140,11 +135,11 @@ MemoryStatusCodeReportWorker (
 \r
   if (NULL == Record) {\r
     //\r
 \r
   if (NULL == Record) {\r
     //\r

-    // In order to save status code , create new packet. \r
+    // In order to save status code , create new packet.\r

     //\r
     PacketHeader = CreateMemoryStatusCodePacket (PacketIndex);\r
 \r
     //\r
     PacketHeader = CreateMemoryStatusCodePacket (PacketIndex);\r
 \r

-    Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1); \r
+    Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1);\r

     Record = &Record[PacketHeader->RecordIndex++];\r
   }\r
 \r
     Record = &Record[PacketHeader->RecordIndex++];\r
   }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 0a697cc211b28b1c0d13014641b18cc44aa761d7..7c0fdc6077c382d5ff5c5b8016df149832fc6891 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -2,28 +2,23 @@
 /** @file\r
   Generic PeiStatusCode Module.\r
 \r
 /** @file\r
   Generic PeiStatusCode Module.\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
+  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:  PeiStatusCode.c\r
 \r
 **/\r
 \r
 \r
   Module Name:  PeiStatusCode.c\r
 \r
 **/\r
 \r

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

 #include "PeiStatusCode.h"\r
 \r
 STATIC\r
 #include "PeiStatusCode.h"\r
 \r
 STATIC\r

-EFI_PEI_PROGRESS_CODE_PPI     mStatusCodePpi           = { \r
+EFI_PEI_PROGRESS_CODE_PPI     mStatusCodePpi           = {\r

   ReportDispatcher\r
   };\r
 \r
   ReportDispatcher\r
   };\r
 \r


@@ -36,27 +31,27 @@ EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {
 \r
 /**\r
   Report status code to all supported device.\r
 \r
 /**\r
   Report status code to all supported device.\r

-  \r
-  \r
+\r
+\r

   @param  PeiServices\r
 \r
   @param  PeiServices\r
 \r

-  @param  CodeType      Indicates the type of status code being reported.  \r
+  @param  CodeType      Indicates the type of status code being reported.\r

                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity.  \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This includes information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing.  \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance \r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance\r

                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r

                         This parameter allows the status code driver to apply different rules to different callers.\r
                         This parameter allows the status code driver to apply different rules to different callers.\r

-  @param  Data          This optional parameter may be used to pass additional data.  \r
-                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
-                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
+  @param  Data          This optional parameter may be used to pass additional data.\r
+                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.\r
+                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and\r

                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r


@@ -103,12 +98,12 @@ ReportDispatcher (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Initialize PEI status codes and publish the status code \r
+  Initialize PEI status codes and publish the status code\r

   PPI.\r
 \r
   @param   FfsHeader       FV this PEIM was loaded from.\r
   @param   PeiServices     General purpose services available to every PEIM.\r
   PPI.\r
 \r
   @param   FfsHeader       FV this PEIM was loaded from.\r
   @param   PeiServices     General purpose services available to every PEIM.\r

- \r
+\r

   @return                  The function always returns success.\r
 \r
 **/\r
   @return                  The function always returns success.\r
 \r
 **/\r


@@ -140,12 +135,12 @@ PeiStatusCodeDriverEntry (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Install PeiStatusCodePpi. \r
+  // Install PeiStatusCodePpi.\r

   // PeiServices use this Ppi to output status code.\r
   // use library\r
   Status = PeiServicesInstallPpi (&mStatusCodePpiDescriptor);\r
   ASSERT_EFI_ERROR (Status);\r
   // PeiServices use this Ppi to output status code.\r
   // use library\r
   Status = PeiServicesInstallPpi (&mStatusCodePpiDescriptor);\r
   ASSERT_EFI_ERROR (Status);\r

-  \r
+\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
index c8c004d6cd1ed49a355e6e5eb74791d5fef9c51e..48675056e1bdd793de59bc3fd4cbd6cf852c3dbf 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
@@ -2,14 +2,14 @@
 /** @file\r
   Heade file of status code PEIM\r
 \r
 /** @file\r
   Heade file of status code PEIM\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
+  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:  PeiStatusCode.h\r
 \r
 \r
   Module Name:  PeiStatusCode.h\r
 \r


@@ -20,35 +20,55 @@
 \r
 \r
 //\r
 \r
 \r
 //\r

-// Include common header file for this module.\r
+// The package level header files this module uses\r
+//\r
+#include <FrameworkPei.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Guid/MemoryStatusCodeRecord.h>\r
+#include <Guid/StatusCodeDataTypeId.h>\r
+#include <Ppi/StatusCode.h>\r
+//\r
+// The Library classes this module consumes\r

 //\r
 //\r

-#include "CommonHeader.h"\r
+#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/SerialPortLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/PeiServicesLib.h>\r
+#include <Library/OemHookStatusCodeLib.h>\r
+#include <Library/PeimEntryPoint.h>\r

 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r
+                        This parameter allows the status code driver to apply different rules to different callers.\r

                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r
                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r

- \r
+\r

   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r
   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r


@@ -64,9 +84,9 @@ SerialStatusCodeReportWorker (
 \r
 /**\r
   Initialize memory status code.\r
 \r
 /**\r
   Initialize memory status code.\r

-  Create one GUID'ed HOB with PCD defined size. If create required size \r
+  Create one GUID'ed HOB with PCD defined size. If create required size\r

   GUID'ed HOB failed, then ASSERT().\r
   GUID'ed HOB failed, then ASSERT().\r

- \r
+\r

   @return           The function always return EFI_SUCCESS\r
 \r
 **/\r
   @return           The function always return EFI_SUCCESS\r
 \r
 **/\r


@@ -77,21 +97,21 @@ MemoryStatusCodeInitializeWorker (
 \r
 /**\r
   Report status code into GUID'ed HOB.\r
 \r
 /**\r
   Report status code into GUID'ed HOB.\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r

- \r
+\r

   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r
   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r


@@ -104,27 +124,27 @@ MemoryStatusCodeReportWorker (
 \r
 /**\r
   Report status code to all supported device.\r
 \r
 /**\r
   Report status code to all supported device.\r

-  \r
-  \r
+\r
+\r

   @param  PeiServices\r
 \r
   @param  PeiServices\r
 \r

-  @param  Type          Indicates the type of status code being reported.  \r
+  @param  Type          Indicates the type of status code being reported.\r

                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
                         The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity.  \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This includes information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing.  \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance \r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance\r

                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
                         information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r

                         This parameter allows the status code driver to apply different rules to different callers.\r
                         This parameter allows the status code driver to apply different rules to different callers.\r

-  @param  Data          This optional parameter may be used to pass additional data.  \r
-                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
-                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
+  @param  Data          This optional parameter may be used to pass additional data.\r
+                        Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.\r
+                        The contents of this data type may have additional GUID-specific data.  The standard GUIDs and\r

                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
 \r
   @return               Always return EFI_SUCCESS.\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
index b27d1cbb33cb148f4bc8d52b9272f6f009feab7f..fd247138f80dbad33308dc6463832b151cb3a5d0 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
@@ -47,7 +47,6 @@
   MemoryStausCodeWorker.c\r
   SerialStatusCodeWorker.c\r
   PeiStatusCode.h\r
   MemoryStausCodeWorker.c\r
   SerialStatusCodeWorker.c\r
   PeiStatusCode.h\r

-  CommonHeader.h\r

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

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index 2efc23ceacb8f30adc73d9897a4a2cb4738ddc91..9f84b01391a7a22e18f1a93a5c7750ed768e3d84 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
@@ -2,51 +2,46 @@
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r
 /** @file\r
   Serial I/O status code reporting worker.\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
+  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:  SerialStatusCodeWorker.c\r
 \r
 **/\r
 \r
 \r
   Module Name:  SerialStatusCodeWorker.c\r
 \r
 **/\r
 \r

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

 #include "PeiStatusCode.h"\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
 #include "PeiStatusCode.h"\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r

- \r
+\r

   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
   @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r

- \r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This included information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity. \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. \r
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
+\r
+  @param  Value         Describes the current status of a hardware or software entity.\r
+                        This included information about the class and subclass that is used to classify the entity\r
+                        as well as an operation.  For progress codes, the operation is the current activity.\r
+                        For error codes, it is the exception.  For debug codes, it is not defined at this time.\r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.\r

                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r

- \r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing. \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, \r
+\r
+  @param  Instance      The enumeration of a hardware or software entity within the system.\r
+                        A system may contain multiple entities that match a class/subclass pairing.\r
+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable,\r

                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r
                         not meaningful, or not relevant.  Valid instance numbers start with 1.\r
 \r
 \r

-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers. \r
+  @param  CallerId      This optional parameter may be used to identify the caller.\r
+                        This parameter allows the status code driver to apply different rules to different callers.\r

                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r
                         Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.\r
 \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r

- \r
+\r

   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r
   @return               The function always return EFI_SUCCESS.\r
 \r
 **/\r


@@ -90,12 +85,12 @@ SerialStatusCodeReportWorker (
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiVSPrint (\r
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiVSPrint (\r

-                  Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
-                  Format, \r
+                  Buffer,\r
+                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  Format,\r

                   Marker\r
                   );\r
                   Marker\r
                   );\r

-  } else if (Data != NULL && \r
+  } else if (Data != NULL &&\r

              CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid) &&\r
              (CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE) {\r
     //\r
              CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid) &&\r
              (CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE) {\r
     //\r


@@ -111,18 +106,18 @@ SerialStatusCodeReportWorker (
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
-                  "ERROR: C%x:V%x I%x", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  "ERROR: C%x:V%x I%x",\r
+                  CodeType,\r
+                  Value,\r

                   Instance\r
                   );\r
 \r
     //\r
     // Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.\r
     //\r
                   Instance\r
                   );\r
 \r
     //\r
     // Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.\r
     //\r

-    \r
+\r

     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount - 1],\r
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount - 1],\r


@@ -148,19 +143,19 @@ SerialStatusCodeReportWorker (
                    );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {\r
     CharCount = AsciiSPrint (\r
                    );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
-                  "PROGRESS CODE: V%x I%x\n\r", \r
-                  Value, \r
+                  Buffer,\r
+                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  "PROGRESS CODE: V%x I%x\n\r",\r
+                  Value,\r

                   Instance\r
                   );\r
   } else {\r
     CharCount = AsciiSPrint (\r
                   Instance\r
                   );\r
   } else {\r
     CharCount = AsciiSPrint (\r

-                  Buffer, \r
-                  EFI_STATUS_CODE_DATA_MAX_SIZE, \r
-                  "Undefined: C%x:V%x I%x\n\r", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  EFI_STATUS_CODE_DATA_MAX_SIZE,\r
+                  "Undefined: C%x:V%x I%x\n\r",\r
+                  CodeType,\r
+                  Value,\r

                   Instance\r
                   );\r
   }\r
                   Instance\r
                   );\r
   }\r