Replace some CopyMem() for GUID copy with CopyGuid().

Replace some gBS->FreePool() with FreePool().
Add EFIAPI modifier.
Removed inconsistent OPTIONAL modifier.
Coding style issue fix.

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

diff --git a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
index 538a473f6862e3219df70f2931f9d78d17512ad6..042dae441bccaf1556f6b244c8869a8f172d1f26 100644 (file)
--- a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
@@ -36,9 +36,9 @@
 \r
   @param  NumberOfPackages  The number of HII packages to prepare.\r
   @param  Guid              Package GUID.\r
-  @Param  ...               The variable argument list of package pointers.\r
+  @param  ...               The variable argument list of package pointers.\r
 \r
-  @return The allocated and initialized packages.\r
+  @return                   The allocated and initialized packages.\r
 **/\r
 EFI_HII_PACKAGES *\r
 EFIAPI\r

diff --git a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
index ca380ee9c6eb99a7450991604398c554aa7d905c..6eab8f61bfc5e454abff1252a6d73dffdd20dfd7 100644 (file)
--- a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
@@ -39,11 +39,12 @@ typedef struct {
   language variable, then use default setting that 'eng' as current\r
   language setting.\r
   \r
-  @param Lang Pointer of system language\r
+  @param  Lang       Pointer of system language\r
   \r
-  @return whether sucess to get setting from variable\r
+  @return            whether success to get setting from variable\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 GetCurrentLanguage (\r
   OUT     CHAR16              *Lang\r
   );\r
@@ -60,6 +61,7 @@ GetCurrentLanguage (
   @retval EFI_SUCCESS          String successfully added to the incoming buffer\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 AddString (\r
   IN      VOID                *StringBuffer,\r
   IN      CHAR16              *Language,\r
@@ -77,6 +79,7 @@ AddString (
   @retval EFI_SUCCESS             Op-code data successfully inserted\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 AddOpCode (\r
   IN      VOID                *FormBuffer,\r
   IN OUT  VOID                *OpCodeData\r
@@ -99,6 +102,7 @@ AddOpCode (
   @retval EFI_SUCCESS              Formset successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateFormSet (\r
   IN      CHAR16              *FormSetTitle,\r
   IN      EFI_GUID            *Guid,\r
@@ -122,6 +126,7 @@ CreateFormSet (
   @retval EFI_SUCCESS      Form successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateForm (\r
   IN      CHAR16              *FormTitle,\r
   IN      UINT16              FormId,\r
@@ -142,6 +147,7 @@ CreateForm (
   @retval EFI_SUCCESS      Subtitle successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateSubTitle (\r
   IN      CHAR16              *SubTitle,\r
   IN OUT  VOID                *FormBuffer,\r
@@ -164,6 +170,7 @@ CreateSubTitle (
   @retval EFI_SUCCESS      Text successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateText (\r
   IN      CHAR16              *String,\r
   IN      CHAR16              *String2,\r
@@ -185,6 +192,7 @@ CreateText (
   @retval EFI_SUCCESS      Hyperlink successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateGoto (\r
   IN      UINT16              FormId,\r
   IN      CHAR16              *Prompt,\r
@@ -209,6 +217,7 @@ CreateGoto (
   @retval EFI_SUCCESS      One-Of box successfully created.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOneOf (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -236,6 +245,7 @@ CreateOneOf (
   @retval EFI_SUCCESS      Ordered list successfully created.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOrderedList (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               MaxEntries,\r
@@ -262,6 +272,7 @@ CreateOrderedList (
   @retval EFI_SUCCESS       Check box successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateCheckBox (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -292,6 +303,7 @@ CreateCheckBox (
   @retval EFI_SUCCESS      Numeric is successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateNumeric (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -323,6 +335,7 @@ CreateNumeric (
   @retval EFI_SUCCESS      String successfully created.  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateString (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -350,6 +363,7 @@ CreateString (
   @retval EFI_SUCCESS           Successfully extract data from Hii database.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ExtractDataFromHiiHandle (\r
   IN      FRAMEWORK_EFI_HII_HANDLE   HiiHandle,\r
   IN OUT  UINT16              *ImageLength,\r
@@ -368,7 +382,8 @@ ExtractDataFromHiiHandle (
 \r
   @return                  Handle to the HII pack previously registered by the memory driver.\r
 **/\r
-FRAMEWORK_EFI_HII_HANDLE \r
+FRAMEWORK_EFI_HII_HANDLE\r
+EFIAPI\r
 FindHiiHandle (\r
   IN OUT EFI_HII_PROTOCOL    **HiiProtocol, OPTIONAL\r
   IN     EFI_GUID            *Guid\r
@@ -386,6 +401,7 @@ FindHiiHandle (
   @retval EFI_SUCCESS      Subtitle created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateSubTitleOpCode (\r
   IN      STRING_REF          StringToken,\r
   IN OUT  VOID                *FormBuffer\r
@@ -408,6 +424,7 @@ CreateSubTitleOpCode (
   @retval EFI_SUCCESS      Text created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateTextOpCode (\r
   IN      STRING_REF          StringToken,\r
   IN      STRING_REF          StringTokenTwo,\r
@@ -434,6 +451,7 @@ CreateTextOpCode (
   @retval EFI_SUCCESS      Hyperlink created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateGotoOpCode (\r
   IN      UINT16              FormId,\r
   IN      STRING_REF          StringToken,\r
@@ -465,6 +483,7 @@ CreateGotoOpCode (
   @retval EFI_DEVICE_ERROR DataWidth > 2\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOneOfOpCode (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -495,6 +514,7 @@ CreateOneOfOpCode (
   @retval EFI_SUCCESS      Ordered list created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOrderedListOpCode (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               MaxEntries,\r
@@ -523,6 +543,7 @@ CreateOrderedListOpCode (
   @retval EFI_DEVICE_ERROR DataWidth > 1\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateCheckBoxOpCode (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -556,6 +577,7 @@ CreateCheckBoxOpCode (
   @retval EFI_DEVICE_ERROR  DataWidth > 2\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateNumericOpCode (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -589,6 +611,7 @@ CreateNumericOpCode (
   @retval EFI_SUCCESS      String created to be a form.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateStringOpCode (\r
   IN      UINT16              QuestionId,\r
   IN      UINT8               DataWidth,\r
@@ -615,6 +638,7 @@ CreateStringOpCode (
   @retval EFI_SUCCESS           Data successfully validated\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ValidateDataFromHiiHandle (\r
   IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,\r
   OUT     BOOLEAN             *Results\r
@@ -631,6 +655,7 @@ ValidateDataFromHiiHandle (
   @retval EFI_SUCCESS      Banner created to be a form.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateBannerOpCode (\r
   IN      UINT16              Title,\r
   IN      UINT16              LineNumber,\r
@@ -649,6 +674,7 @@ CreateBannerOpCode (
   @param Size              Size of the variable/map in bytes\r
 **/\r
 VOID\r
+EFIAPI\r
 EfiLibHiiVariablePackGetMap (\r
   IN    EFI_HII_VARIABLE_PACK *Pack,  \r
   OUT   CHAR16                **Name,  OPTIONAL\r
@@ -666,6 +692,7 @@ EfiLibHiiVariablePackGetMap (
   @return                  The number of map count.\r
 **/\r
 UINTN\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapCnt (\r
   IN    EFI_HII_VARIABLE_PACK_LIST   *List\r
   );\r
@@ -696,6 +723,7 @@ typedef VOID (EFI_LIB_HII_VARIABLE_PACK_LIST_CALLBACK) (
   @param Callback          Routine to be called for each iterated variable.\r
 **/\r
 VOID\r
+EFIAPI\r
 EfiLibHiiVariablePackListForEachVar (\r
   IN    EFI_HII_VARIABLE_PACK_LIST               *List,\r
   IN    EFI_LIB_HII_VARIABLE_PACK_LIST_CALLBACK  *Callback\r
@@ -717,6 +745,7 @@ EfiLibHiiVariablePackListForEachVar (
   @return EFI_NOT_FOUND    Variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapByIdx (\r
   IN    UINTN                         Idx,  \r
   IN    EFI_HII_VARIABLE_PACK_LIST    *List,  \r
@@ -742,6 +771,7 @@ EfiLibHiiVariablePackListGetMapByIdx (
   @retval EFI_NOT_FOUND    Variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapById (\r
   IN    UINT16                        Id,  \r
   IN    EFI_HII_VARIABLE_PACK_LIST    *List,\r
@@ -765,6 +795,7 @@ EfiLibHiiVariablePackListGetMapById (
   @retval EFI_NOT_FOUND    variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMap (\r
   IN    EFI_HII_VARIABLE_PACK_LIST   *List,\r
   IN    CHAR16                       *Name,\r
@@ -789,6 +820,7 @@ EfiLibHiiVariablePackListGetMap (
   @retval EFI_LOAD_ERROR   The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableRetrieveFromNv (\r
   IN  CHAR16                     *Name,\r
   IN  EFI_GUID                   *Guid,\r
@@ -805,8 +837,8 @@ EfiLibHiiVariableRetrieveFromNv (
 \r
   @param Suffix            Suffix the Name should end with.\r
   @param Name              Name of the variable to retrieve.\r
-  @Param Guid              Guid of the variable to retrieve.\r
-  @Param Size              Parameters of the variable to retrieve.\r
+  @param Guid              Guid of the variable to retrieve.\r
+  @param Size              Parameters of the variable to retrieve.\r
   @param Var               Variable will be retrieved into this buffer.\r
                            Caller is responsible for providing storage of exactly Size size in bytes.\r
 \r
@@ -816,6 +848,7 @@ EfiLibHiiVariableRetrieveFromNv (
   @retval EFI_LOAD_ERROR        The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableOverrideIfSuffix (\r
   IN  CHAR16                 *Suffix,\r
   IN  CHAR16                 *Name,\r
@@ -843,6 +876,7 @@ EfiLibHiiVariableOverrideIfSuffix (
   @retval EFI_LOAD_ERROR   The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableOverrideBySuffix (\r
   IN  CHAR16                 *Suffix,\r
   IN  CHAR16                 *Name,\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index a71038db0d58d4735c1bbbd2619c6317caf95bd8..1b22774367303ec025203d34581c01977cb62ce7 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -86,12 +86,15 @@ typedef UINT16                    FRAMEWORK_EFI_HII_HANDLE;
 \r
 //\r
 // The following types are currently defined:\r
-// EFI_FROM_ID has been defined in UEFI spec.\r
+// EFI_FORM_ID has been defined in UEFI spec.\r
 //\r
 typedef UINT16  EFI_FORM_LABEL;\r
 \r
 #pragma pack(1)\r
 \r
+//\r
+// The header found at the start of each package.\r
+//\r
 typedef struct {\r
   UINT32  Length;\r
   UINT16  Type;\r

diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
index 64b64c6ac365a3c21b21288ca58875aeaeb81ab8..9dc886d5cf9e3e62f8e9bf700c90e3bb011a0078 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
+++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
@@ -32,25 +32,25 @@ EFI_HII_PROTOCOL *mHii = NULL;
   instance.\r
   If protocol of gEfiHiiProtocolGuid is not installed, then ASSERT().\r
   \r
-  @param  ImageHandle  The image handle of driver module who use this library \r
-                       instance.\r
+  @param  ImageHandle  The image handle of driver module who use this library instance.\r
   @param  SystemTable  Pointer to the EFI System Table.\r
+  \r
   @retval EFI_SUCCESS  library constuctor always success.\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 FrameworkHiiLibConstructor (\r
-  IN     EFI_HANDLE                      ImageHandle,\r
-  IN     EFI_SYSTEM_TABLE                *SystemTable\r
+  IN     EFI_HANDLE                 ImageHandle,\r
+  IN     EFI_SYSTEM_TABLE           *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS                        Status;\r
   \r
   Status = gBS->LocateProtocol (\r
-      &gEfiHiiProtocolGuid,\r
-      NULL,\r
-      (VOID **) &mHii\r
-    );\r
+                 &gEfiHiiProtocolGuid,\r
+                 NULL,\r
+                 (VOID **) &mHii\r
+                 );\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mHii != NULL);\r
 \r
@@ -67,22 +67,22 @@ FrameworkHiiLibConstructor (
   @param Guid              Given GUID of a HII package list.\r
   @param Marker            Package's content list.\r
   \r
-  @return pointer to new created HII package list.\r
+  @return                  pointer to new created HII package list.\r
 **/\r
 EFI_HII_PACKAGES *\r
 InternalPreparePackages (\r
-  IN     UINTN                           NumberOfPackages,\r
-  IN     CONST EFI_GUID                  *Guid OPTIONAL,\r
-  IN     VA_LIST                         Marker\r
+  IN     UINTN                      NumberOfPackages,\r
+  IN     CONST EFI_GUID             *Guid OPTIONAL,\r
+  IN     VA_LIST                    Marker\r
   )\r
 {\r
-  EFI_HII_PACKAGES  *HiiPackages;\r
-  VOID              **Package;\r
-  UINTN             Index;\r
+  EFI_HII_PACKAGES                  *HiiPackages;\r
+  VOID                              **Package;\r
+  UINTN                             Index;\r
 \r
   ASSERT (NumberOfPackages > 0);\r
 \r
-  HiiPackages                   = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
+  HiiPackages = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
   ASSERT (HiiPackages != NULL);\r
 \r
   HiiPackages->GuidId           = (EFI_GUID *) Guid;\r
@@ -95,7 +95,6 @@ InternalPreparePackages (
   }\r
 \r
   return HiiPackages;\r
-\r
 }\r
 \r
 /**\r
@@ -106,22 +105,21 @@ InternalPreparePackages (
 \r
   @param  NumberOfPackages  The number of HII packages to prepare.\r
   @param  Guid              Package GUID.\r
-  @Param  ...               The variable argument list of package pointers.\r
+  @param  ...               The variable argument list of package pointers.\r
 \r
-  @return The allocated and initialized packages.\r
+  @return                   The allocated and initialized packages.\r
 **/\r
 EFI_HII_PACKAGES *\r
 EFIAPI\r
 PreparePackages (\r
-  IN     UINTN                           NumberOfPackages,\r
-  IN     CONST EFI_GUID                  *Guid OPTIONAL,\r
+  IN     UINTN                      NumberOfPackages,\r
+  IN     CONST EFI_GUID             *Guid OPTIONAL,\r
   ...\r
   )\r
 {\r
-  VA_LIST           Args;\r
+  VA_LIST                           Args;\r
 \r
   VA_START (Args, Guid);\r
-\r
   return InternalPreparePackages (NumberOfPackages, Guid, Args);\r
 }\r
 \r
@@ -135,35 +133,33 @@ PreparePackages (
   Then, EFI_HII_PACKAGE_LIST will be register to the default System HII Database. The\r
   Handle to the newly registered Package List is returned throught HiiHandle.\r
 \r
-  @param  NumberOfPackages         The number of HII packages to register.\r
-  @param  GuidId                   Package List GUID ID.\r
-  @param  DriverHandle             The pointer of driver handle\r
-  @param  HiiHandle                The ID used to retrieve the Package List later.\r
-  @param  ...                      The variable argument list describing all HII Package.\r
+  @param  NumberOfPackages    The number of HII packages to register.\r
+  @param  GuidId              Package List GUID ID.\r
+  @param  DriverHandle        The pointer of driver handle\r
+  @param  HiiHandle           The ID used to retrieve the Package List later.\r
+  @param  ...                 The variable argument list describing all HII Package.\r
 \r
-  @return\r
-  The allocated and initialized packages.\r
+  @return                     The allocated and initialized packages.\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 HiiLibAddPackages (\r
-  IN     UINTN                           NumberOfPackages,\r
-  IN     CONST EFI_GUID                  *GuidId,\r
-  IN     EFI_HANDLE                      DriverHandle, OPTIONAL\r
-     OUT EFI_HII_HANDLE                  *HiiHandle, OPTIONAL\r
+  IN     UINTN                      NumberOfPackages,\r
+  IN     CONST EFI_GUID             *GuidId,\r
+  IN     EFI_HANDLE                 DriverHandle, OPTIONAL\r
+     OUT EFI_HII_HANDLE             *HiiHandle, \r
   ...\r
   )\r
 {\r
-  VA_LIST                   Args;\r
-  EFI_HII_PACKAGES          *FrameworkHiiPacages;\r
-  FRAMEWORK_EFI_HII_HANDLE  FrameworkHiiHandle;\r
-  EFI_STATUS                Status;\r
-\r
+  VA_LIST                           Args;\r
+  EFI_HII_PACKAGES                  *FrameworkHiiPacages;\r
+  FRAMEWORK_EFI_HII_HANDLE          FrameworkHiiHandle;\r
+  EFI_STATUS                        Status;\r
 \r
   VA_START (Args, HiiHandle);\r
-  FrameworkHiiPacages = InternalPreparePackages (NumberOfPackages, GuidId, Args);\r
 \r
-  Status      = mHii->NewPack (mHii, FrameworkHiiPacages, &FrameworkHiiHandle);\r
+  FrameworkHiiPacages = InternalPreparePackages (NumberOfPackages, GuidId, Args);\r
+  Status = mHii->NewPack (mHii, FrameworkHiiPacages, &FrameworkHiiHandle);\r
   if (HiiHandle != NULL) {\r
     if (EFI_ERROR (Status)) {\r
       *HiiHandle = NULL;\r
@@ -183,24 +179,22 @@ HiiLibAddPackages (
   If HiiHandle is NULL, then ASSERT.\r
   If HiiHandle is not a valid EFI_HII_HANDLE in the default HII database, then ASSERT.\r
 \r
-  @param  HiiHandle              The handle that was previously registered to the data base that is requested for removal.\r
-                                 List later.\r
+  @param  HiiHandle      The handle that was previously registered to the data base that is requested for removal.\r
 \r
-  @return  VOID\r
+  @return VOID\r
 **/\r
 VOID\r
 EFIAPI\r
 HiiLibRemovePackages (\r
-  IN     EFI_HII_HANDLE                  HiiHandle\r
+  IN     EFI_HII_HANDLE             HiiHandle\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS                        Status;\r
   \r
   Status = mHii->RemovePack (mHii, (FRAMEWORK_EFI_HII_HANDLE) (UINTN) HiiHandle);\r
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
-\r
 /**\r
   This function adds the string into String Package of each language.\r
 \r
@@ -220,22 +214,22 @@ HiiLibRemovePackages (
 EFI_STATUS\r
 EFIAPI\r
 HiiLibNewString (\r
-  IN     EFI_HII_HANDLE                  PackageList,\r
-     OUT EFI_STRING_ID                   *StringId,\r
-  IN     CONST EFI_STRING                String\r
+  IN     EFI_HII_HANDLE             PackageList,\r
+     OUT EFI_STRING_ID              *StringId,\r
+  IN     CONST EFI_STRING           String\r
   )\r
 {\r
-  FRAMEWORK_EFI_HII_HANDLE  FrameworkHiiHandle;\r
-  EFI_STATUS                Status;\r
+  FRAMEWORK_EFI_HII_HANDLE          FrameworkHiiHandle;\r
+  EFI_STATUS                        Status;\r
 \r
   FrameworkHiiHandle = (FRAMEWORK_EFI_HII_HANDLE) (UINTN) PackageList;\r
   Status = mHii->NewString (\r
-            mHii,\r
-            NULL,\r
-            FrameworkHiiHandle,\r
-            StringId,\r
-            String\r
-          );\r
+                   mHii,\r
+                   NULL,\r
+                   FrameworkHiiHandle,\r
+                   StringId,\r
+                   String\r
+                   );\r
 \r
   return Status;\r
 }\r
@@ -254,14 +248,13 @@ HiiLibNewString (
 \r
   @retval EFI_SUCCESS            Operation is successful.\r
   @retval EFI_OUT_OF_RESOURCES   There is not enought memory in the system.\r
-\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 HiiLibGetStringFromToken (\r
-  IN     EFI_GUID                        *ProducerGuid,\r
-  IN     EFI_STRING_ID                   StringId,\r
-     OUT EFI_STRING                      *String\r
+  IN     EFI_GUID                   *ProducerGuid,\r
+  IN     EFI_STRING_ID              StringId,\r
+     OUT EFI_STRING                 *String\r
   )\r
 {\r
   return EFI_SUCCESS;  \r
@@ -287,9 +280,9 @@ HiiLibGetStringFromToken (
 EFI_STATUS\r
 EFIAPI\r
 HiiLibGetStringFromHandle (\r
-  IN     EFI_HII_HANDLE                  PackageList,\r
-  IN     EFI_STRING_ID                   StringId,\r
-     OUT EFI_STRING                      *String\r
+  IN     EFI_HII_HANDLE             PackageList,\r
+  IN     EFI_STRING_ID              StringId,\r
+     OUT EFI_STRING                 *String\r
   )\r
 {\r
   return EFI_SUCCESS;\r
@@ -302,13 +295,14 @@ HiiLibGetStringFromHandle (
   The implement set DriverHandle to NULL simpliy to let \r
   handle manager create a default new handle.\r
   \r
-  @param[out] DriverHandle the pointer of driver handle\r
-  @return always successful.\r
+  @param  DriverHandle   The pointer of driver handle\r
+  \r
+  @return                Always success.\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 HiiLibCreateHiiDriverHandle (\r
-  OUT EFI_HANDLE                         *DriverHandle\r
+  OUT EFI_HANDLE                    *DriverHandle\r
   )\r
 {\r
   //\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
index 9140fc6a25747d527c49e2829a29ad86bf67f2b4..dd29f3319acb69043d340506faf2184c2d54bce0 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
@@ -26,6 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @return              whether sucess to get setting from variable\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 GetCurrentLanguage (\r
   OUT  CHAR16                       *Lang\r
   )\r
@@ -39,7 +40,6 @@ GetCurrentLanguage (
   // Getting the system language and placing it into our Global Data\r
   //\r
   Size = sizeof (Language);\r
-\r
   Status = gRT->GetVariable (\r
                   (CHAR16 *) L"Lang",\r
                   &gEfiGlobalVariableGuid,\r
@@ -47,7 +47,6 @@ GetCurrentLanguage (
                   &Size,\r
                   Language\r
                   );\r
-\r
   if (EFI_ERROR (Status)) {\r
     AsciiStrCpy (Language, "eng");\r
   }\r
@@ -80,6 +79,7 @@ GetCurrentLanguage (
   @retval EFI_SUCCESS          String successfully added to the incoming buffer\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 AddString (\r
   IN      VOID                      *StringBuffer,\r
   IN      CHAR16                    *Language,\r
@@ -146,8 +146,8 @@ AddString (
       //\r
       // Add a new stringpointer in the new buffer since we are adding a string.  Null terminate it\r
       //\r
-      PackDestination[Index] = (UINT16)(PackDestination[Index-1] +\r
-                                        StrSize((CHAR16 *)((CHAR8 *)(StringPack) + PackSource[Index-1])));\r
+      PackDestination[Index] = (UINT16)(PackDestination[Index - 1] +\r
+                                        StrSize((CHAR16 *)((CHAR8 *)(StringPack) + PackSource[Index - 1])));\r
       PackDestination[Index + 1] = (UINT16) 0;\r
 \r
       //\r
@@ -274,7 +274,7 @@ AddString (
   //\r
   // Free the newly created buffer since we don't need it anymore\r
   //\r
-  gBS->FreePool (NewBuffer);\r
+  FreePool (NewBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -288,6 +288,7 @@ AddString (
   @retval EFI_SUCCESS           Op-code data successfully inserted  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 AddOpCode (\r
   IN      VOID                      *FormBuffer,\r
   IN OUT  VOID                      *OpCodeData\r
@@ -307,12 +308,11 @@ AddOpCode (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Source      = (UINT8 *) FormBuffer;\r
-  Destination = (UINT8 *) NewBuffer;\r
-\r
   //\r
   // Copy the IFR Package header to the new buffer\r
   //\r
+  Source      = (UINT8 *) FormBuffer;\r
+  Destination = (UINT8 *) NewBuffer;\r
   CopyMem (Destination, Source, sizeof (EFI_HII_PACK_HEADER));\r
 \r
   //\r
@@ -326,7 +326,7 @@ AddOpCode (
   //\r
   for (; ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->OpCode != FRAMEWORK_EFI_IFR_END_FORM_OP;) {\r
     //\r
-    // If the this opcode is an end_form_set we better be creating and endform\r
+    // If the opcode is an end_form_set we better be creating and endform\r
     // Nonetheless, we will add data before the end_form_set.  This also provides\r
     // for interesting behavior in the code we will run, but has no bad side-effects\r
     // since we will possibly do a 0 byte copy in this particular end-case.\r
@@ -351,8 +351,8 @@ AddOpCode (
   // Prior to the end_form is where we insert the new op-code data\r
   //\r
   CopyMem (Destination, OpCodeData, ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
-  Destination       = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
-\r
+  \r
+  Destination = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
   NewBuffer->Length = (UINT32) (NewBuffer->Length + (UINT32) (((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length));\r
 \r
   //\r
@@ -361,14 +361,10 @@ AddOpCode (
   CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r
 \r
   //\r
-  // Adjust Source/Destination to next op-code location\r
+  // Copy end-formset data to new buffer\r
   //\r
   Destination = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r
   Source      = Source + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r
-\r
-  //\r
-  // Copy end-formset data to new buffer\r
-  //\r
   CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r
 \r
   //\r
@@ -380,7 +376,7 @@ AddOpCode (
   //\r
   // Free the newly created buffer since we don't need it anymore\r
   //\r
-  gBS->FreePool (NewBuffer);\r
+  FreePool (NewBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -392,6 +388,7 @@ AddOpCode (
   @return        the statue of locating HII protocol\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 GetHiiInterface (\r
   OUT  EFI_HII_PROTOCOL             **Hii\r
   )\r
@@ -424,6 +421,7 @@ GetHiiInterface (
   @retval EFI_SUCCESS           Successfully extract data from Hii database.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ExtractDataFromHiiHandle (\r
   IN      FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
   IN OUT  UINT16                    *ImageLength,\r
@@ -463,7 +461,7 @@ ExtractDataFromHiiHandle (
   //\r
   Status = Hii->GetForms (Hii, HiiHandle, 0, &DataLength, RawData);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (RawData);\r
+    FreePool (RawData);\r
 \r
     //\r
     // Allocate space for retrieval of IFR data\r
@@ -493,7 +491,7 @@ ExtractDataFromHiiHandle (
       //\r
       // Copy the GUID information from this handle\r
       //\r
-      CopyMem (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+      CopyGuid (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
       break;\r
 \r
     case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
@@ -523,7 +521,7 @@ ExtractDataFromHiiHandle (
   // Return an error if buffer is too small\r
   //\r
   if (SizeOfNvStore > *ImageLength) {\r
-    gBS->FreePool (OldData);\r
+    FreePool (OldData);\r
     *ImageLength = (UINT16) SizeOfNvStore;\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
@@ -570,7 +568,7 @@ ExtractDataFromHiiHandle (
   //\r
   // Free our temporary repository of form data\r
   //\r
-  gBS->FreePool (OldData);\r
+  FreePool (OldData);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -586,7 +584,8 @@ ExtractDataFromHiiHandle (
 \r
   @return             Handle to the HII pack previously registered by the memory driver.\r
 **/\r
-FRAMEWORK_EFI_HII_HANDLE \r
+FRAMEWORK_EFI_HII_HANDLE\r
+EFIAPI\r
 FindHiiHandle (\r
   IN OUT  EFI_HII_PROTOCOL          **HiiProtocol, OPTIONAL\r
   IN      EFI_GUID                  *Guid\r
@@ -646,7 +645,7 @@ FindHiiHandle (
   //\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-    gBS->FreePool (HiiHandleBuffer);\r
+    FreePool (HiiHandleBuffer);\r
 \r
     HiiHandleBuffer = AllocatePool (HiiHandleBufferLength);\r
     ASSERT (HiiHandleBuffer != NULL);\r
@@ -679,7 +678,7 @@ FindHiiHandle (
   }\r
 \r
 lbl_exit:\r
-  gBS->FreePool (HiiHandleBuffer);\r
+  FreePool (HiiHandleBuffer);\r
   return HiiHandle;\r
 }\r
 \r
@@ -697,6 +696,7 @@ lbl_exit:
   @retval EFI_SUCCESS            Data successfully validated\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ValidateDataFromHiiHandle (\r
   IN      FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
      OUT  BOOLEAN                   *Results\r
@@ -739,7 +739,7 @@ ValidateDataFromHiiHandle (
   //\r
   Status = Hii->GetForms (Hii, HiiHandle, 0, &RawDataLength, RawData);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (RawData);\r
+    FreePool (RawData);\r
 \r
     //\r
     // Allocate space for retrieval of IFR data\r
@@ -764,10 +764,9 @@ ValidateDataFromHiiHandle (
 \r
   for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
     if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
-      CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+      CopyGuid (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
       break;\r
     }\r
-\r
     Index = RawData[Index + 1] + Index;\r
   }\r
 \r
@@ -829,7 +828,7 @@ ValidateDataFromHiiHandle (
       //\r
       // Free the buffer that was allocated that was too small\r
       //\r
-      gBS->FreePool (VariableData);\r
+      FreePool (VariableData);\r
 \r
       VariableData = AllocatePool (SizeOfNvStore);\r
       if (VariableData == NULL) {\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
index bed424186aeec98de9f27f7ffa5d9a847c60071c..acdd3c44191ff043ad413f36815e1797df3738f4 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IfrSupportLibInternal.h"\r
 \r
 /**\r
-  Create a formset\r
+  Create a formset.\r
   \r
   The form package is a collection of forms that are intended to describe the pages that will be\r
   displayed to the user.\r
@@ -31,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_SUCCESS          Formset successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateFormSet (\r
   IN      CHAR16                    *FormSetTitle,\r
   IN      EFI_GUID                  *Guid,\r
@@ -61,20 +62,15 @@ CreateFormSet (
   //\r
   StringBuffer = AllocateZeroPool (DEFAULT_STRING_BUFFER_SIZE);\r
   if (StringBuffer == NULL) {\r
-    gBS->FreePool (FormBuffer);\r
+    FreePool (FormBuffer);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add FormSetTitle to the StringBuffer, get FormSetTitle's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add the FormSetTitle to the string buffer and get the StringToken\r
-  //\r
   Status = AddString (*StringBuffer, CurrentLanguage, FormSetTitle, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -93,28 +89,26 @@ CreateFormSet (
   FormSet.FormSetTitle  = StringToken;\r
   FormSet.Class         = Class;\r
   FormSet.SubClass      = SubClass;\r
-  CopyMem (&FormSet.Guid, Guid, sizeof (EFI_GUID));\r
-\r
+  CopyGuid (&FormSet.Guid, Guid);\r
+  \r
   //\r
   // Initialize the end formset data\r
   //\r
   EndFormSet.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);\r
   EndFormSet.Header.OpCode  = FRAMEWORK_EFI_IFR_END_FORM_SET_OP;\r
 \r
-  Destination               = (UINT8 *) *FormBuffer;\r
-\r
   //\r
   // Copy the formset/endformset data to the form buffer\r
   //\r
+  Destination = (UINT8 *) *FormBuffer;\r
   CopyMem (Destination, &IfrPack, sizeof (EFI_HII_PACK_HEADER));\r
 \r
   Destination = Destination + sizeof (EFI_HII_PACK_HEADER);\r
-\r
   CopyMem (Destination, &FormSet, sizeof (FRAMEWORK_EFI_IFR_FORM_SET));\r
 \r
   Destination = Destination + sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\r
-\r
   CopyMem (Destination, &EndFormSet, sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET));\r
+  \r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -132,6 +126,7 @@ CreateFormSet (
   @retval EFI_SUCCESS      Form successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateForm (\r
   IN      CHAR16                    *FormTitle,\r
   IN      UINT16                    FormId,\r
@@ -146,12 +141,10 @@ CreateForm (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add FormTitle to the StringBuffer, get FormTitle's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
   Status = AddString (StringBuffer, CurrentLanguage, FormTitle, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -161,8 +154,7 @@ CreateForm (
   Form.FormId         = FormId;\r
   Form.FormTitle      = StringToken;\r
 \r
-  Status              = AddOpCode (FormBuffer, &Form);\r
-\r
+  Status = AddOpCode (FormBuffer, &Form);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -171,12 +163,12 @@ CreateForm (
   EndForm.Header.Length = sizeof (FRAMEWORK_EFI_IFR_END_FORM);\r
 \r
   Status                = AddOpCode (FormBuffer, &EndForm);\r
-\r
+  \r
   return Status;\r
 }\r
 \r
 /**\r
-  Create a SubTitle\r
+  Create a SubTitle.\r
   \r
   Subtitle strings are intended to be used by authors to separate sections of questions into semantic\r
   groups.\r
@@ -188,6 +180,7 @@ CreateForm (
   @retval EFI_SUCCESS      Subtitle successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateSubTitle (\r
   IN      CHAR16                    *SubTitle,\r
   IN OUT  VOID                      *FormBuffer,\r
@@ -200,12 +193,10 @@ CreateSubTitle (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add SubTitle to the StringBuffer, get SubTitle's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
   Status = AddString (StringBuffer, CurrentLanguage, SubTitle, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -220,7 +211,7 @@ CreateSubTitle (
 }\r
 \r
 /**\r
-  Create a line of text\r
+  Create a line of text.\r
   Unlike HTML, text is simply another tag. \r
   This tag type enables IFR to be more easily localized.\r
   \r
@@ -235,6 +226,7 @@ CreateSubTitle (
   @retval EFI_SUCCESS     Text successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateText (\r
   IN      CHAR16                    *String,\r
   IN      CHAR16                    *String2,\r
@@ -251,15 +243,10 @@ CreateText (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add first string to the StringBuffer, get first string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, String, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -272,13 +259,11 @@ CreateText (
   // Add second string, get first string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, String2, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Text.TextTwo  = StringToken;\r
-\r
   Text.Flags    = (UINT8) (Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r
   Text.Key      = Key;\r
 \r
@@ -286,7 +271,6 @@ CreateText (
   // Add second string, get first string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, String3, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -309,6 +293,7 @@ CreateText (
   @retval EFI_SUCCESS    Hyperlink successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateGoto (\r
   IN      UINT16                    FormId,\r
   IN      CHAR16                    *Prompt,\r
@@ -322,12 +307,10 @@ CreateGoto (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -359,6 +342,7 @@ CreateGoto (
   @retval EFI_SUCCESS       One-Of box successfully created.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOneOf (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -386,15 +370,10 @@ CreateOneOf (
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -406,18 +385,16 @@ CreateOneOf (
   OneOf.Prompt        = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   OneOf.Help  = StringToken;\r
 \r
-  Status      = AddOpCode (FormBuffer, &OneOf);\r
-\r
+  Status = AddOpCode (FormBuffer, &OneOf);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -427,17 +404,16 @@ CreateOneOf (
     OneOfOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r
 \r
     //\r
-    // Add string and get token back\r
+    // Add OptionString string to the StringBuffer, get OptionString string's token\r
     //\r
-    Status              = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
+    Status = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
 \r
     OneOfOption.Option  = StringToken;\r
     OneOfOption.Value   = OptionsList[Index].Value;\r
     OneOfOption.Flags   = (UINT8) (OptionsList[Index].Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r
     OneOfOption.Key     = OptionsList[Index].Key;\r
 \r
-    Status              = AddOpCode (FormBuffer, &OneOfOption);\r
-\r
+    Status = AddOpCode (FormBuffer, &OneOfOption);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -446,8 +422,7 @@ CreateOneOf (
   EndOneOf.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF);\r
   EndOneOf.Header.OpCode  = FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
 \r
-  Status                  = AddOpCode (FormBuffer, &EndOneOf);\r
-\r
+  Status = AddOpCode (FormBuffer, &EndOneOf);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -471,6 +446,7 @@ CreateOneOf (
   @retval EFI_SUCCESS     Ordered list successfully created.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOrderedList (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     MaxEntries,\r
@@ -491,15 +467,10 @@ CreateOrderedList (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -511,18 +482,16 @@ CreateOrderedList (
   OrderedList.Prompt        = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   OrderedList.Help  = StringToken;\r
 \r
-  Status            = AddOpCode (FormBuffer, &OrderedList);\r
-\r
+  Status = AddOpCode (FormBuffer, &OrderedList);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -532,17 +501,16 @@ CreateOrderedList (
     OrderedListOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r
 \r
     //\r
-    // Add string and get token back\r
+    // Add OptionString string to the StringBuffer, get OptionString string's token\r
     //\r
-    Status                    = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
+    Status = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
 \r
     OrderedListOption.Option  = StringToken;\r
     OrderedListOption.Value   = OptionsList[Index].Value;\r
     OrderedListOption.Flags   = (UINT8) (OptionsList[Index].Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r
     OrderedListOption.Key     = OptionsList[Index].Key;\r
 \r
-    Status                    = AddOpCode (FormBuffer, &OrderedListOption);\r
-\r
+    Status = AddOpCode (FormBuffer, &OrderedListOption);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -571,6 +539,7 @@ CreateOrderedList (
   @retval EFI_SUCCESS       Check box successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateCheckBox (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -594,15 +563,10 @@ CreateCheckBox (
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -614,10 +578,9 @@ CreateCheckBox (
   CheckBox.Prompt         = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -631,7 +594,7 @@ CreateCheckBox (
 }\r
 \r
 /**\r
-  Create a numeric\r
+  Create a numeric.\r
   \r
   @param  QuestionId        Question ID of the numeric\r
   @param  DataWidth         DataWidth of the numeric\r
@@ -650,6 +613,7 @@ CreateCheckBox (
   @retval EFI_SUCCESS       Numeric is successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateNumeric (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -678,15 +642,10 @@ CreateNumeric (
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -698,10 +657,9 @@ CreateNumeric (
   Numeric.Prompt        = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -736,6 +694,7 @@ CreateNumeric (
   @retval EFI_SUCCESS    String successfully created.  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateString (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -755,15 +714,10 @@ CreateString (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -775,10 +729,9 @@ CreateString (
   String.Prompt         = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
index c85aba3a4ca28ce1eab57494b489e45ba9d2aed2..0ab63e9126f283e111157f82f1eba219ffeebe9c 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
@@ -27,6 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_SUCCESS      Subtitle created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateSubTitleOpCode (\r
   IN      STRING_REF                StringToken,\r
   IN OUT  VOID                      *FormBuffer\r
@@ -39,6 +40,7 @@ CreateSubTitleOpCode (
   Subtitle.SubTitle       = StringToken;\r
 \r
   CopyMem (FormBuffer, &Subtitle, sizeof (FRAMEWORK_EFI_IFR_SUBTITLE));\r
+  \r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -59,6 +61,7 @@ CreateSubTitleOpCode (
   @retval EFI_SUCCESS        Text created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateTextOpCode (\r
   IN      STRING_REF                StringToken,\r
   IN      STRING_REF                StringTokenTwo,\r
@@ -101,6 +104,7 @@ CreateTextOpCode (
   @retval EFI_SUCCESS     Hyperlink created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateGotoOpCode (\r
   IN      UINT16                    FormId,\r
   IN      STRING_REF                StringToken,\r
@@ -147,6 +151,7 @@ CreateGotoOpCode (
   @retval EFI_DEVICE_ERROR  DataWidth > 2\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOneOfOpCode (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -226,6 +231,7 @@ CreateOneOfOpCode (
   @retval EFI_SUCCESS     Ordered list created to be a form\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOrderedListOpCode (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     MaxEntries,\r
@@ -296,6 +302,7 @@ CreateOrderedListOpCode (
   @retval EFI_DEVICE_ERROR  DataWidth > 1\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateCheckBoxOpCode (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -352,6 +359,7 @@ CreateCheckBoxOpCode (
   @retval EFI_DEVICE_ERROR  DataWidth > 2\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateNumericOpCode (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -412,6 +420,7 @@ CreateNumericOpCode (
   @retval EFI_SUCCESS      String created to be a form.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateStringOpCode (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -453,6 +462,7 @@ CreateStringOpCode (
   @retval EFI_SUCCESS  Banner created to be a form.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateBannerOpCode (\r
   IN      UINT16                    Title,\r
   IN      UINT16                    LineNumber,\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
index 533332b5a5ffb51c27a099bc527ef0acd4d54a3a..44b53571d4bf22d2442f902f2c25cf72263aa454 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
@@ -25,6 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  Size              Size of the variable/map in bytes\r
 **/\r
 VOID\r
+EFIAPI\r
 EfiLibHiiVariablePackGetMap (\r
   IN      EFI_HII_VARIABLE_PACK     *Pack,  \r
      OUT  CHAR16                    **Name, OPTIONAL\r
@@ -64,6 +65,7 @@ EfiLibHiiVariablePackGetMap (
   @return                   The number of map count.\r
 **/\r
 UINTN\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapCnt (\r
   IN  EFI_HII_VARIABLE_PACK_LIST    *List\r
   )\r
@@ -86,6 +88,7 @@ EfiLibHiiVariablePackListGetMapCnt (
   @param  Callback          Routine to be called for each iterated variable.\r
 **/\r
 VOID\r
+EFIAPI\r
 EfiLibHiiVariablePackListForEachVar (\r
   IN  EFI_HII_VARIABLE_PACK_LIST               *List,\r
   IN  EFI_LIB_HII_VARIABLE_PACK_LIST_CALLBACK  *Callback\r
@@ -123,6 +126,7 @@ EfiLibHiiVariablePackListForEachVar (
   @return EFI_NOT_FOUND  Variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapByIdx (\r
   IN      UINTN                      Idx,  \r
   IN      EFI_HII_VARIABLE_PACK_LIST *List,  \r
@@ -156,8 +160,10 @@ EfiLibHiiVariablePackListGetMapByIdx (
       if (NULL != Id) {\r
         *Id   = MapId;\r
       }\r
-        \r
-      return EFI_SUCCESS; // Map found\r
+      //\r
+      // Map found\r
+      //\r
+      return EFI_SUCCESS;\r
     }\r
     List = List->NextVariablePack;\r
   }\r
@@ -182,6 +188,7 @@ EfiLibHiiVariablePackListGetMapByIdx (
   @retval EFI_NOT_FOUND  Variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapById (\r
   IN      UINT16                     Id,  \r
   IN      EFI_HII_VARIABLE_PACK_LIST *List,\r
@@ -235,6 +242,7 @@ EfiLibHiiVariablePackListGetMapById (
   @retval EFI_NOT_FOUND  variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMap (\r
   IN      EFI_HII_VARIABLE_PACK_LIST *List,\r
   IN      CHAR16                     *Name,\r
@@ -282,6 +290,7 @@ EfiLibHiiVariablePackListGetMap (
   @retval EFI_LOAD_ERROR  The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableRetrieveFromNv (\r
   IN      CHAR16                    *Name,\r
   IN      EFI_GUID                  *Guid,\r
@@ -334,8 +343,8 @@ EfiLibHiiVariableRetrieveFromNv (
 \r
   @param  Suffix            Suffix the Name should end with.\r
   @param  Name              Name of the variable to retrieve.\r
-  @Param  Guid              Guid of the variable to retrieve.\r
-  @Param  Size              Parameters of the variable to retrieve.\r
+  @param  Guid              Guid of the variable to retrieve.\r
+  @param  Size              Parameters of the variable to retrieve.\r
   @param  Var               Variable will be retrieved into this buffer.\r
                             Caller is responsible for providing storage of exactly Size size in bytes.\r
 \r
@@ -345,6 +354,7 @@ EfiLibHiiVariableRetrieveFromNv (
   @retval EFI_LOAD_ERROR        The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableOverrideIfSuffix (\r
   IN      CHAR16                    *Suffix,\r
   IN      CHAR16                    *Name,\r
@@ -386,6 +396,7 @@ EfiLibHiiVariableOverrideIfSuffix (
   @retval EFI_LOAD_ERROR  The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableOverrideBySuffix (\r
   IN      CHAR16                    *Suffix,\r
   IN      CHAR16                    *Name,\r
@@ -410,7 +421,7 @@ EfiLibHiiVariableOverrideBySuffix (
   StrCat (NameSuffixed, Suffix);\r
   \r
   Status = EfiLibHiiVariableRetrieveFromNv (NameSuffixed, Guid, Size, &Var);\r
-  gBS->FreePool (NameSuffixed);\r
+  FreePool (NameSuffixed);\r
   \r
   return Status;\r
 }\r

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
index fd223f42f33e2594c6c79b8bfef3c48714d8dcd0..1a59374ef59fbbee3fc1f35823a0acf040000abd 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/Console.c
@@ -12,9 +12,6 @@
 \r
 **/\r
 \r
-\r
-\r
-\r
 #include "UefiLibInternal.h"\r
 \r
 typedef struct {\r
@@ -199,30 +196,29 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UNICODE_WIDTH_ENTRY mUnicodeWidthTable[] = {
   @retval 0             The width if UnicodeChar could not be determined.\r
   @retval 1             UnicodeChar is a narrow glyph.\r
   @retval 2             UnicodeChar is a wide glyph.\r
-\r
 **/\r
 UINTN\r
 EFIAPI\r
 GetGlyphWidth (\r
-  IN CHAR16  UnicodeChar\r
+  IN CHAR16                         UnicodeChar\r
   )\r
 {\r
-  UINTN                     Index;\r
-  UINTN                     Low;\r
-  UINTN                     High;\r
-  CONST UNICODE_WIDTH_ENTRY *Item;\r
+  UINTN                             Index;\r
+  UINTN                             Low;\r
+  UINTN                             High;\r
+  CONST UNICODE_WIDTH_ENTRY         *Item;\r
 \r
   Item  = NULL;\r
   Low   = 0;\r
   High  = (sizeof (mUnicodeWidthTable)) / (sizeof (UNICODE_WIDTH_ENTRY)) - 1;\r
-  while (Low <= High) {\r
+  \r
+  while (Low <= High) {    \r
     Index = (Low + High) >> 1;\r
     Item  = &(mUnicodeWidthTable[Index]);\r
     if (Index == 0) {\r
       if (UnicodeChar <= Item->WChar) {\r
         break;\r
       }\r
-\r
       return 0;\r
     }\r
 \r
@@ -256,19 +252,18 @@ GetGlyphWidth (
   characters that are width glyphs have a width of 2. \r
   If String is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
-  @param  String      A pointer to a Null-terminated Unicode string.\r
+  @param  String   A pointer to a Null-terminated Unicode string.\r
 \r
-  @return The display length of the Null-terminated Unicode string specified by String.\r
-  \r
+  @return          The display length of the Null-terminated Unicode string specified by String.\r
 **/\r
 UINTN\r
 EFIAPI\r
 UnicodeStringDisplayLength (\r
-  IN CONST CHAR16  *String\r
+  IN CONST CHAR16                   *String\r
   )\r
 {\r
-  UINTN      Length;\r
-  UINTN      Width;\r
+  UINTN                             Length;\r
+  UINTN                             Width;\r
 \r
   if (String == NULL) {\r
     return 0;\r

diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c
index 28037b605873ed1251b01b4e41e2b2210a33732d..ce54c932f16c378477d6a210ca2bc2a96224736e 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c
+++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiDriverModel.c
@@ -13,7 +13,6 @@
 \r
 **/ \r
 \r
-\r
 #include "UefiLibInternal.h"\r
 \r
 /**\r
@@ -36,18 +35,17 @@
   @retval EFI_SUCCESS           The protocol installation is completed successfully.\r
   @retval EFI_OUT_OF_RESOURCES  There was not enough system resources to install the protocol.\r
   @retval Others                Status from gBS->InstallMultipleProtocolInterfaces().\r
-\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 EfiLibInstallDriverBinding (\r
-  IN CONST EFI_HANDLE             ImageHandle,\r
-  IN CONST EFI_SYSTEM_TABLE       *SystemTable,\r
-  IN EFI_DRIVER_BINDING_PROTOCOL  *DriverBinding,\r
-  IN EFI_HANDLE                   DriverBindingHandle\r
+  IN CONST EFI_HANDLE               ImageHandle,\r
+  IN CONST EFI_SYSTEM_TABLE         *SystemTable,\r
+  IN EFI_DRIVER_BINDING_PROTOCOL    *DriverBinding,\r
+  IN EFI_HANDLE                     DriverBindingHandle\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
+  EFI_STATUS                        Status;\r
 \r
   ASSERT (DriverBinding != NULL);\r
 \r
@@ -56,9 +54,6 @@ EfiLibInstallDriverBinding (
                   &gEfiDriverBindingProtocolGuid, DriverBinding,\r
                   NULL\r
                   );\r
-  //\r
-  // ASSERT if the call to InstallMultipleProtocolInterfaces() failed\r
-  //\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -70,7 +65,6 @@ EfiLibInstallDriverBinding (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Installs and completes the initialization of a Driver Binding Protocol instance and\r
   optionally installs the Component Name, Driver Configuration and Driver Diagnostics Protocols.\r
@@ -109,9 +103,11 @@ EfiLibInstallAllDriverProtocols (
   IN CONST EFI_DRIVER_DIAGNOSTICS_PROTOCOL    *DriverDiagnostics    OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
+  EFI_STATUS                                  Status;\r
 \r
-  ASSERT (DriverBinding != NULL);\r
+  if (DriverBinding == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
   if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r
     if (DriverConfiguration == NULL) {\r
@@ -229,15 +225,15 @@ EfiLibInstallAllDriverProtocols (
 EFI_STATUS\r
 EFIAPI\r
 EfiLibInstallDriverBindingComponentName2 (\r
-  IN CONST EFI_HANDLE                         ImageHandle,\r
-  IN CONST EFI_SYSTEM_TABLE                   *SystemTable,\r
-  IN EFI_DRIVER_BINDING_PROTOCOL              *DriverBinding,\r
-  IN EFI_HANDLE                               DriverBindingHandle,\r
-  IN CONST EFI_COMPONENT_NAME_PROTOCOL        *ComponentName,       OPTIONAL\r
-  IN CONST EFI_COMPONENT_NAME2_PROTOCOL       *ComponentName2       OPTIONAL\r
+  IN CONST EFI_HANDLE                    ImageHandle,\r
+  IN CONST EFI_SYSTEM_TABLE              *SystemTable,\r
+  IN EFI_DRIVER_BINDING_PROTOCOL         *DriverBinding,\r
+  IN EFI_HANDLE                          DriverBindingHandle,\r
+  IN CONST EFI_COMPONENT_NAME_PROTOCOL   *ComponentName,  OPTIONAL\r
+  IN CONST EFI_COMPONENT_NAME2_PROTOCOL  *ComponentName2  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
+  EFI_STATUS                             Status;\r
 \r
   ASSERT (DriverBinding != NULL);\r
 \r

diff --git a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLibFramework.c b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLibFramework.c
index 68bc432c63216796ec7eebea267bddd4a55fea7e..b24355494de4078fa2dc2ffbf1015e7784c6203e 100644 (file)
--- a/IntelFrameworkPkg/Library/HiiLibFramework/HiiLibFramework.c
+++ b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLibFramework.c
@@ -15,7 +15,6 @@
 \r
 #include <FrameworkDxe.h>\r
 \r
-\r
 #include <Protocol/FrameworkHii.h>\r
 \r
 #include <Library/HiiLib.h>\r
@@ -44,7 +43,7 @@ HiiLibFrameworkConstructor (
   IN      EFI_SYSTEM_TABLE          *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS                        Status;\r
 \r
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
@@ -53,8 +52,7 @@ HiiLibFrameworkConstructor (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return Status;\r
-  \r
+  return Status;  \r
 }\r
 \r
 /**\r
@@ -67,23 +65,23 @@ HiiLibFrameworkConstructor (
   @param  Guid             Package GUID.\r
   @param  Args             Package contents\r
 \r
-  @return The allocated and initialized packages.\r
+  @return                  The allocated and initialized packages.\r
 \r
 **/\r
 EFI_HII_PACKAGES *\r
 InternalPreparePackages (\r
-  IN UINTN           NumberOfPackages,\r
-  IN CONST EFI_GUID  *Guid OPTIONAL,\r
-  IN VA_LIST         Args\r
+  IN UINTN                          NumberOfPackages,\r
+  IN CONST EFI_GUID                 *Guid OPTIONAL,\r
+  IN VA_LIST                        Args\r
   )\r
 {\r
-  EFI_HII_PACKAGES  *HiiPackages;\r
-  VOID              **Package;\r
-  UINTN             Index;\r
+  EFI_HII_PACKAGES                  *HiiPackages;\r
+  VOID                              **Package;\r
+  UINTN                             Index;\r
 \r
   ASSERT (NumberOfPackages > 0);\r
 \r
-  HiiPackages                   = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
+  HiiPackages = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
   ASSERT (HiiPackages != NULL);\r
 \r
   HiiPackages->GuidId           = (EFI_GUID *) Guid;\r
@@ -96,7 +94,6 @@ InternalPreparePackages (
   }\r
 \r
   return HiiPackages;\r
-\r
 }\r
 \r
 \r