Replace CopyMem() which can be replaced by BaseLib's Read/WriteUnalianedXX() as these...

[mirror_edk2.git] / MdeModulePkg / Library / ExtendedIfrSupportLib / Common.c

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
index 6f8926b42cd1d3462f0e288f1df3dbea75f23667..56f2b79a7145cabd6013e783f8bbee41d697baac 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
@@ -21,7 +21,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 EFI_HII_DATABASE_PROTOCOL *gIfrLibHiiDatabase;\r
 EFI_HII_STRING_PROTOCOL   *gIfrLibHiiString;\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;\r
 \r
+/**\r
+  ExtendedIfrSupportLib's constructor. It locates the required protocol:\r
+  gEfiHiiDatabaseProtocolGuid and gEfiHiiStringProtocolGuid.\r
+\r
+  @param ImageHandle     The firmware allocated handle for the EFI image.\r
+  \r
+  @param SystemTable     A pointer to the EFI System Table.\r
+\r
+  @retval EFI_SUCCESS    This function always completes successfully.\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 ExtendedIfrSupportLibConstructor (\r
@@ -41,9 +53,19 @@ ExtendedIfrSupportLibConstructor (
 }\r
 \r
 \r
+/**\r
+  Extract formset class for given HII handle.\r
+\r
+\r
+  @param Handle          The HII handle.\r
+  @param Class           Class of the formset.\r
+  @param FormSetTitle    Formset title string.\r
+  @param FormSetHelp     Formset help string.\r
 \r
-STATIC EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;\r
+  @retval  EFI_SUCCESS      Successfully extract Class for specified Hii handle.\r
+  @return  Other values if failed to export packages for the given HII handle.\r
 \r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 IfrLibExtractClassFromHiiHandle (\r
@@ -52,21 +74,6 @@ IfrLibExtractClassFromHiiHandle (
   OUT     EFI_STRING_ID       *FormSetTitle,\r
   OUT     EFI_STRING_ID       *FormSetHelp\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-  Extract formset class for given HII handle.\r
-\r
-Arguments:\r
-  HiiHandle       - Hii handle\r
-  Class           - Class of the formset\r
-  FormSetTitle    - Formset title string\r
-  FormSetHelp     - Formset help string\r
-\r
-Returns:\r
-  EFI_SUCCESS     - Successfully extract Class for specified Hii handle.\r
-\r
---*/\r
 {\r
   EFI_STATUS                   Status;\r
   UINTN                        BufferSize;\r
@@ -110,13 +117,13 @@ Returns:
   //\r
   Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
   Offset2 = 0;\r
-  CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32));\r
+  PackageListLength = ReadUnaligned32 (&HiiPackageList->PackageLength);\r
 \r
   while (Offset < PackageListLength) {\r
     Package = ((UINT8 *) HiiPackageList) + Offset;\r
     CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
 \r
-    if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) {\r
+    if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
       //\r
       // Search Class Opcode in this Form Package\r
       //\r
@@ -161,7 +168,7 @@ Returns:
     Offset += PackageHeader.Length;\r
   }\r
 \r
-  gBS->FreePool (HiiPackageList);\r
+  FreePool (HiiPackageList);\r
 \r
   return EFI_SUCCESS;\r
 }\r