UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / SetupBrowserDxe / InputHandler.c

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 838c120d94e77e7b6411dd3b87733469431b024f..8bba3925e4fd723bb9252f60dafdbf88db20dcb4 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -195,7 +195,7 @@ ReadPassword (
   IN  UI_MENU_OPTION              *MenuOption,\r
   IN  BOOLEAN                     PromptForPassword,\r
   IN  EFI_TAG                     *Tag,\r
-  IN  EFI_IFR_DATA_ARRAY          *PageData,\r
+  IN  FRAMEWORK_EFI_IFR_DATA_ARRAY          *PageData,\r
   IN  BOOLEAN                     SecondEntry,\r
   IN  EFI_FILE_FORM_TAGS          *FileFormTags,\r
   OUT CHAR16                      *StringPtr\r
@@ -219,7 +219,7 @@ ReadPassword (
   EFI_VARIABLE_DEFINITION     *VariableDefinition;\r
   UINTN                       DimensionsWidth;\r
   UINTN                       DimensionsHeight;\r
-  EFI_IFR_DATA_ENTRY          *DataEntry;\r
+  FRAMEWORK_EFI_IFR_DATA_ENTRY          *DataEntry;\r
   UINTN                       WidthOfString;\r
 \r
   DimensionsWidth       = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;\r
@@ -252,12 +252,12 @@ ReadPassword (
   ASSERT (TempString);\r
   ASSERT (TempString2);\r
 \r
-  if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+  if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
     //\r
     // Password requires a callback to determine if a password exists\r
     //\r
-    DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
-    DataEntry->OpCode  = EFI_IFR_PASSWORD_OP;\r
+    DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+    DataEntry->OpCode  = FRAMEWORK_EFI_IFR_PASSWORD_OP;\r
     DataEntry->Length  = 3;\r
 \r
     ExtractRequestedNvMap (FileFormTags, Tag->VariableNumber, &VariableDefinition);\r
@@ -347,12 +347,12 @@ Error:
         break;\r
 \r
       case CHAR_CARRIAGE_RETURN:\r
-        if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+        if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
           //\r
           // User just typed a string in\r
           //\r
-          DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
-          DataEntry->OpCode = EFI_IFR_PASSWORD_OP;\r
+          DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+          DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;\r
 \r
           //\r
           // If the user just typed in a password, Data = 1\r
@@ -371,7 +371,7 @@ Error:
                                       );\r
             }\r
 \r
-            DataEntry->Length  = sizeof (EFI_IFR_DATA_ENTRY);\r
+            DataEntry->Length  = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);\r
             DataEntry->Data    = (VOID *) TempString;\r
           } else {\r
             DataEntry->Length  = 3;\r
@@ -386,7 +386,7 @@ Error:
                                       );\r
             }\r
 \r
-            DataEntry->Length  = sizeof (EFI_IFR_DATA_ENTRY);\r
+            DataEntry->Length  = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);\r
             DataEntry->Data    = (VOID *) TempString2;\r
           }\r
 \r
@@ -661,7 +661,7 @@ Returns:
   if (ManualInput) {\r
     PrintAt (Column, Row, (CHAR16 *) L"[     ]");\r
     Column++;\r
-    if (Tag->Operand != EFI_IFR_TIME_OP) {\r
+    if (Tag->Operand != FRAMEWORK_EFI_IFR_TIME_OP) {\r
       *Value = BackupValue;\r
     }\r
   }\r
@@ -683,7 +683,7 @@ TheKey2:
     switch (Key.UnicodeChar) {\r
     case '+':\r
     case '-':\r
-      if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+      if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
         Key.UnicodeChar = CHAR_NULL;\r
         if (Key.UnicodeChar == '+') {\r
           Key.ScanCode = SCAN_RIGHT;\r
@@ -699,7 +699,7 @@ TheKey2:
       switch (Key.ScanCode) {\r
       case SCAN_LEFT:\r
       case SCAN_RIGHT:\r
-        if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+        if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
           //\r
           // By setting this value, we will return back to the caller.\r
           // We need to do this since an auto-refresh will destroy the adjustment\r
@@ -734,7 +734,7 @@ TheKey2:
           Number = (UINT16) GetStringWidth (FormattedNumber);\r
 \r
           gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
-          if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+          if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
             for (Loop = 0; Loop < (UINTN) ((Number >= 8) ? 4 : 2); Loop++) {\r
               PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, (CHAR16 *) L" ");\r
             }\r
@@ -847,7 +847,7 @@ EnterCarriageReturn:
       // if two questions are bound by consistency checks and each only has two possible choices, there\r
       // would be no way for a user to switch the values.  Thus we require late checking.\r
       //\r
-      if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {\r
+      if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {\r
         CopyMem (&Tag->OldValue, &BackupValue, Tag->StorageWidth);\r
       } else {\r
         //\r
@@ -1015,7 +1015,7 @@ GetSelectionInputPopUp (
   ShowDownArrow     = FALSE;\r
   ShowUpArrow       = FALSE;\r
 \r
-  if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+  if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
     ValueArrayBackup = AllocateZeroPool (Tag->StorageWidth);\r
     ASSERT (ValueArrayBackup != NULL);\r
     CopyMem (ValueArrayBackup, ValueArray, ValueCount);\r
@@ -1045,8 +1045,8 @@ GetSelectionInputPopUp (
   //\r
   // Get the number of one of options present and its size\r
   //\r
-  for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
-    if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+  for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
+    if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
         !MenuOption->Tags[Index].Suppress) {\r
       if (!FirstOptionFoundFlag) {\r
         FirstOptionFoundFlag  = TRUE;\r
@@ -1060,7 +1060,7 @@ GetSelectionInputPopUp (
       //\r
       if (Initialized) {\r
         for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
-             MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_OP;\r
+             MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_OP;\r
              ValueBackup++\r
             ) {\r
           if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {\r
@@ -1123,9 +1123,9 @@ GetSelectionInputPopUp (
           break;\r
         }\r
 \r
-        if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+        if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
           for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
-               MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;\r
+               MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
                ValueBackup++\r
               ) {\r
             //\r
@@ -1190,14 +1190,14 @@ GetSelectionInputPopUp (
     //\r
     Index2 = Top + 1;\r
     for (Index = MenuOption->TagIndex + TopOptionIndex;\r
-         (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);\r
+         (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);\r
          Index++\r
         ) {\r
-      if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+      if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
         Token = MenuOption->Tags[Index].Text;\r
         if (Initialized) {\r
           for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
-               MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;\r
+               MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
                ValueBackup++\r
               ) {\r
             if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {\r
@@ -1282,7 +1282,7 @@ GetSelectionInputPopUp (
     }\r
 \r
     if (!KeyInitialized) {\r
-      if (MenuOption->ThisTag->Operand == EFI_IFR_ONE_OF_OP) {\r
+      if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ONE_OF_OP) {\r
         *KeyValue = MenuOption->Tags[MenuOption->TagIndex + 1].Key;\r
       } else {\r
         *KeyValue = MenuOption->ThisTag->Key;\r
@@ -1301,7 +1301,7 @@ TheKey:
       // If an ordered list op-code, we will allow for a popup of +/- keys\r
       // to create an ordered list of items\r
       //\r
-      if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+      if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
         if (Key.UnicodeChar == '+') {\r
           if ((TopOptionIndex > 1) && (HighlightPosition == (Top + 1))) {\r
             //\r
@@ -1329,10 +1329,10 @@ TheKey:
         }\r
 \r
         for (Index = MenuOption->TagIndex + TopOptionIndex;\r
-             MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;\r
+             MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
              Index++\r
             ) {\r
-          if (MenuOption->Tags[Index].Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+          if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
             continue;\r
           }\r
 \r
@@ -1348,7 +1348,7 @@ TheKey:
             //\r
             // Is this prior tag a valid choice?  If not, bail out\r
             //\r
-            if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+            if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
               //\r
               // Copy the destination tag to the local variable\r
               //\r
@@ -1434,10 +1434,10 @@ TheKey:
         }\r
 \r
         for (Index = MenuOption->TagIndex + TopOptionIndex;\r
-             MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;\r
+             MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
              Index++\r
             ) {\r
-          if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+          if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
             if (Initialized) {\r
               for (Index = 0; (ValueArrayBackup[Index] != TempValue) && (Index < ValueCount); Index++)\r
                 ;\r
@@ -1466,11 +1466,11 @@ TheKey:
                 //\r
                 // Keep going until meets meaningful tag.\r
                 //\r
-                while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP  &&\r
-                         MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP        &&\r
-                         MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)\r
+                while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP  &&\r
+                         MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP        &&\r
+                         MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)\r
                        ||\r
-                       (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP  &&\r
+                       (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP  &&\r
                          (MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {\r
                   TempIndex--;\r
                 }\r
@@ -1480,11 +1480,11 @@ TheKey:
                 //\r
                 // Keep going until meets meaningful tag.\r
                 //\r
-                while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP  &&\r
-                         MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP        &&\r
-                         MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)\r
+                while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP  &&\r
+                         MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP        &&\r
+                         MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)\r
                        ||\r
-                       (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP  &&\r
+                       (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP  &&\r
                          (MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {\r
                   TempIndex++;\r
                 }\r
@@ -1496,7 +1496,7 @@ TheKey:
                 //\r
                 // Only if the previous op-code is an option can we select it, otherwise we are at the left-most option\r
                 //\r
-                if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+                if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
                   TempValue = MenuOption->Tags[TempIndex].Value;\r
                   *KeyValue = MenuOption->Tags[TempIndex].Key;\r
                 } else {\r
@@ -1528,7 +1528,7 @@ TheKey:
       //\r
       // return the current selection\r
       //\r
-      if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+      if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
         CopyMem (ValueArray, ValueArrayBackup, ValueCount);\r
         FreePool (ValueArrayBackup);\r
       } else {\r