UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / HiiDataBaseDxe / Package.c

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
index 6f864b62e77a6b112f66f95b8b08317a9da16860..7a1cc197f81bb1e05de7c6fe23bb46ef28aa9d4b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/Package.c
@@ -141,12 +141,12 @@ Returns:
 \r
   RawData = (UINT8 *) FormPack;\r
 \r
-  for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
-    if (RawData[Index] == EFI_IFR_FORM_SET_OP) {\r
+  for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+    if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
       //\r
       // Cache the guid for this formset\r
       //\r
-      CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+      CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
       break;\r
     }\r
 \r
@@ -171,12 +171,12 @@ Returns:
       FormPack  = (EFI_HII_IFR_PACK *) ((CHAR8 *) (&HandlePackageInstance->IfrData) + sizeof (EFI_HII_PACK_HEADER));\r
       RawData   = (UINT8 *) FormPack;\r
 \r
-      for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
-        if (RawData[Index] == EFI_IFR_FORM_SET_OP) {\r
+      for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+        if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
           //\r
           // Cache the guid for this formset\r
           //\r
-          CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+          CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
           break;\r
         }\r
 \r
@@ -209,7 +209,7 @@ EFIAPI
 HiiNewPack (\r
   IN  EFI_HII_PROTOCOL    *This,\r
   IN  EFI_HII_PACKAGES    *Packages,\r
-  OUT EFI_HII_HANDLE      *Handle\r
+  OUT FRAMEWORK_EFI_HII_HANDLE       *Handle\r
   )\r
 /*++\r
 \r
@@ -334,13 +334,13 @@ Returns:
     //\r
     // Advance to the Form Set Op-code\r
     //\r
-    for (Count = 0; ((EFI_IFR_OP_HEADER *) &Location[Count])->OpCode != EFI_IFR_FORM_SET_OP;) {\r
-      Count = Count + ((EFI_IFR_OP_HEADER *) &Location[Count])->Length;\r
+    for (Count = 0; ((FRAMEWORK_EFI_IFR_OP_HEADER *) &Location[Count])->OpCode != FRAMEWORK_EFI_IFR_FORM_SET_OP;) {\r
+      Count = Count + ((FRAMEWORK_EFI_IFR_OP_HEADER *) &Location[Count])->Length;\r
     }\r
     //\r
     // Copy to local variable\r
     //\r
-    CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &Location[Count])->Guid, sizeof (EFI_GUID));\r
+    CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &Location[Count])->Guid, sizeof (EFI_GUID));\r
 \r
     //\r
     // Check to see if IfrPack->Guid != GuidId\r
@@ -364,16 +364,16 @@ Returns:
     FormSetStub.Header.Type           = EFI_HII_IFR;\r
     FormSetStub.Header.Length         = sizeof (EFI_FORM_SET_STUB);\r
 \r
-    FormSetStub.FormSet.Header.OpCode = EFI_IFR_FORM_SET_OP;\r
-    FormSetStub.FormSet.Header.Length = (UINT8) sizeof (EFI_IFR_FORM_SET);\r
+    FormSetStub.FormSet.Header.OpCode = FRAMEWORK_EFI_IFR_FORM_SET_OP;\r
+    FormSetStub.FormSet.Header.Length = (UINT8) sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\r
     //\r
     // Dummy string\r
     //\r
     FormSetStub.FormSet.FormSetTitle  = 0x02;\r
     CopyMem (&FormSetStub.FormSet.Guid, Packages->GuidId, sizeof (EFI_GUID));\r
 \r
-    FormSetStub.EndFormSet.Header.OpCode  = EFI_IFR_END_FORM_SET_OP;\r
-    FormSetStub.EndFormSet.Header.Length  = (UINT8) sizeof (EFI_IFR_END_FORM_SET);\r
+    FormSetStub.EndFormSet.Header.OpCode  = FRAMEWORK_EFI_IFR_END_FORM_SET_OP;\r
+    FormSetStub.EndFormSet.Header.Length  = (UINT8) sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);\r
     IfrPack = (EFI_HII_IFR_PACK *) &FormSetStub;\r
   }\r
 \r
@@ -432,7 +432,7 @@ Returns:
       // we go down one level deeper, increment the handle value that will be passed back.\r
       //\r
       if (Database->Handle >= *Handle) {\r
-        *Handle = (EFI_HII_HANDLE) (Database->Handle + 1);\r
+        *Handle = (FRAMEWORK_EFI_HII_HANDLE ) (Database->Handle + 1);\r
       }\r
     }\r
 \r
@@ -543,7 +543,7 @@ Returns:
       // If someone updates the Descriptors with a count of 0, blow aware the overrides.\r
       //\r
       if (KeyboardPack->DescriptorCount == 0) {\r
-        ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106);\r
+        ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);\r
       }\r
 \r
       if (KeyboardPack->DescriptorCount < 106 && KeyboardPack->DescriptorCount > 0) {\r
@@ -551,26 +551,26 @@ Returns:
         // If SystemKeyboard was updated already, then steer changes to the override database\r
         //\r
         if (GlobalData->SystemKeyboardUpdate) {\r
-          ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106);\r
+          ZeroMem (GlobalData->OverrideKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);\r
           for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) {\r
             CopyMem (&Member, &KeyboardPack->Descriptor[Count].Key, sizeof (UINT16));\r
             CopyMem (\r
               &GlobalData->OverrideKeyboardLayout[Member],\r
               &KeyboardPack->Descriptor[Count],\r
-              sizeof (EFI_KEY_DESCRIPTOR)\r
+              sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR)\r
               );\r
           }\r
         } else {\r
           //\r
           // SystemKeyboard was never updated, so this is likely the keyboard driver setting the System database.\r
           //\r
-          ZeroMem (GlobalData->SystemKeyboardLayout, sizeof (EFI_KEY_DESCRIPTOR) * 106);\r
+          ZeroMem (GlobalData->SystemKeyboardLayout, sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR) * 106);\r
           for (Count = 0; Count < KeyboardPack->DescriptorCount; Count++) {\r
             CopyMem (&Member, &KeyboardPack->Descriptor->Key, sizeof (UINT16));\r
             CopyMem (\r
               &GlobalData->SystemKeyboardLayout[Member],\r
               &KeyboardPack->Descriptor[Count],\r
-              sizeof (EFI_KEY_DESCRIPTOR)\r
+              sizeof (FRAMEWORK_EFI_KEY_DESCRIPTOR)\r
               );\r
           }\r
           //\r
@@ -593,7 +593,7 @@ EFI_STATUS
 EFIAPI\r
 HiiRemovePack (\r
   IN EFI_HII_PROTOCOL    *This,\r
-  IN EFI_HII_HANDLE      Handle\r
+  IN FRAMEWORK_EFI_HII_HANDLE       Handle\r
   )\r
 /*++\r
 \r