Update ALTCFG reference from default name token to default ID.

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

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index d2b25a003645e3fc4db7a8d0184a1bee159b0435..7e93df9adadbdd9f17561e5ad44e754f669fc249 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1629,15 +1629,10 @@ InternalHiiIfrValueAction (
   UINT32         Index;\r
   EFI_GUID       *VarGuid;\r
   EFI_STRING     VarName;\r
-  EFI_STRING_ID  DefaultName;\r
 \r
   UINT8                        *PackageData;\r
-  UINTN                        IfrOffset;\r
-  EFI_IFR_OP_HEADER            *IfrOpHdr;\r
   EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;\r
-  UINT32                       PackageOffset;  \r
   UINTN                        PackageListLength;\r
-  EFI_HII_PACKAGE_HEADER       PacakgeHeader;\r
   EFI_DEVICE_PATH_PROTOCOL     *DevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL     *TempDevicePath;\r
   \r
@@ -1772,13 +1767,9 @@ InternalHiiIfrValueAction (
            Status = EFI_SUCCESS;\r
       goto NextConfigAltResp;\r
     }\r
-    \r
-    //\r
-    // 2. Get DefaultName string ID by parsing the PacakgeList \r
-    //\r
 \r
     //\r
-    // Get HiiPackage by HiiHandle\r
+    // 2. Get HiiPackage by HiiHandle\r
     //\r
     PackageListLength  = 0;\r
     HiiPackageList     = NULL;\r
@@ -1806,59 +1797,9 @@ InternalHiiIfrValueAction (
       goto Done;\r
     }\r
     \r
-    //\r
-    // Parse the form package and get the default name string ID.\r
-    //\r
-    if (ActionType == ACTION_SET_DEFAUTL_VALUE) {\r
-      PackageOffset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
-      Status = EFI_NOT_FOUND;\r
-      while (PackageOffset < PackageListLength) {\r
-        CopyMem (&PacakgeHeader, (UINT8 *) HiiPackageList + PackageOffset, sizeof (PacakgeHeader));\r
-        \r
-        //\r
-        // Parse IFR opcode to get default store opcode\r
-        //\r
-        if (PacakgeHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
-          IfrOffset = sizeof (PacakgeHeader);\r
-          PackageData = (UINT8 *) HiiPackageList + PackageOffset;\r
-          while (IfrOffset < PacakgeHeader.Length) {\r
-            IfrOpHdr = (EFI_IFR_OP_HEADER *) (PackageData + IfrOffset);\r
-            //\r
-            // Match DefaultId to find its DefaultName\r
-            //\r
-            if (IfrOpHdr->OpCode == EFI_IFR_DEFAULTSTORE_OP) {\r
-              if (((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultId == DefaultId) {\r
-                DefaultName = ((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultName;\r
-                Status = EFI_SUCCESS;\r
-                break;\r
-              }\r
-            }\r
-            IfrOffset += IfrOpHdr->Length;\r
-          }\r
-          //\r
-          // Only one form is in a package list.\r
-          //\r
-          break;\r
-        }\r
-        \r
-        //\r
-        // Go to next package.\r
-        //\r
-        PackageOffset += PacakgeHeader.Length;      \r
-      }\r
-      \r
-      //\r
-      // Not found the matched default string ID\r
-      //\r
-      if (EFI_ERROR (Status)) {\r
-        Status = EFI_SUCCESS;\r
-        goto NextConfigAltResp;\r
-      }\r
-    }\r
-    \r
     //\r
     // 3. Call ConfigRouting GetAltCfg(ConfigRoute, <ConfigResponse>, Guid, Name, DevicePath, AltCfgId, AltCfgResp)\r
-    //    Get the default configuration string according to the found default name string ID.\r
+    //    Get the default configuration string according to the default ID.\r
     //\r
     Status = gHiiConfigRouting->GetAltConfig (\r
                                   gHiiConfigRouting,\r
@@ -1866,7 +1807,7 @@ InternalHiiIfrValueAction (
                                   VarGuid,\r
                                   VarName,\r
                                   DevicePath,\r
-                                  (ActionType == ACTION_SET_DEFAUTL_VALUE) ? &DefaultName:NULL,  // it can be NULL to get the current setting.\r
+                                  (ActionType == ACTION_SET_DEFAUTL_VALUE) ? &DefaultId:NULL,  // it can be NULL to get the current setting.\r
                                   &ConfigResp\r
                                 );\r
     \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 30f602d30fe316aa2877106fa42a1990eba02a8c..02d7d7b5fa60475aded17332c0f065f525573d07 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -635,37 +635,6 @@ MergeDefaultString (
   return EFI_SUCCESS;  \r
 }\r
 \r
-/**\r
-  This function finds the matched DefaultName for the input DefaultId\r
-\r
-  @param  DefaultIdArray    Array stores the map table between DefaultId and DefaultName.\r
-  @param  VarDefaultId      Default Id\r
-  @param  VarDefaultName    Default Name string ID for the input default ID.\r
-  \r
-  @retval EFI_SUCCESS       The mapped default name string ID is found.\r
-  @retval EFI_NOT_FOUND     The mapped default name string ID is not found.\r
-**/\r
-EFI_STATUS\r
-FindDefaultName (\r
-  IN  IFR_DEFAULT_DATA *DefaultIdArray, \r
-  IN  UINT16           VarDefaultId, \r
-  OUT EFI_STRING_ID    *VarDefaultName\r
-  )\r
-{\r
-  LIST_ENTRY        *Link;\r
-  IFR_DEFAULT_DATA  *DefaultData;\r
-\r
-  for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {\r
-    DefaultData = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);\r
-    if (DefaultData->DefaultId == VarDefaultId) {\r
-      *VarDefaultName = DefaultData->DefaultName;\r
-      return EFI_SUCCESS;\r
-    }\r
-  }\r
-  \r
-  return EFI_NOT_FOUND;\r
-}\r
-\r
 /**\r
   This function inserts new DefaultValueData into the BlockData DefaultValue array.\r
 \r
@@ -948,7 +917,6 @@ ParseIfrData (
         goto Done;\r
       }\r
       DefaultData->DefaultId   = ((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultId;\r
-      DefaultData->DefaultName = ((EFI_IFR_DEFAULTSTORE *) IfrOpHdr)->DefaultName;\r
       InsertTailList (&DefaultIdArray->Entry, &DefaultData->Entry);\r
       DefaultData = NULL;\r
       break;\r
@@ -1038,13 +1006,9 @@ ParseIfrData (
         //\r
 \r
         //\r
-        // Set standard ID and Get DefaultName String ID\r
+        // Set standard ID\r
         //\r
         VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
-        Status       = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
-        if (EFI_ERROR (Status)) {\r
-          goto Done;\r
-        }\r
         //\r
         // Prepare new DefaultValue\r
         //\r
@@ -1055,7 +1019,6 @@ ParseIfrData (
         }\r
         DefaultData->OpCode      = IfrOpHdr->OpCode;\r
         DefaultData->DefaultId   = VarDefaultId;\r
-        DefaultData->DefaultName = VarDefaultName;\r
 \r
         switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {\r
         case EFI_IFR_NUMERIC_SIZE_1:\r
@@ -1199,13 +1162,9 @@ ParseIfrData (
       //\r
       if ((IfrCheckBox->Flags & EFI_IFR_CHECKBOX_DEFAULT) == EFI_IFR_CHECKBOX_DEFAULT) {\r
         //\r
-        // Set standard ID to Manufacture ID and Get DefaultName String ID\r
+        // Set standard ID to Manufacture ID\r
         //\r
         VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
-        Status       = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
-        if (EFI_ERROR (Status)) {\r
-          goto Done;\r
-        }\r
         //\r
         // Prepare new DefaultValue\r
         //\r
@@ -1216,7 +1175,6 @@ ParseIfrData (
         }\r
         DefaultData->OpCode      = IfrOpHdr->OpCode;\r
         DefaultData->DefaultId   = VarDefaultId;\r
-        DefaultData->DefaultName = VarDefaultName;\r
         DefaultData->Value       = 1;\r
         //\r
         // Add DefaultValue into current BlockData\r
@@ -1226,13 +1184,9 @@ ParseIfrData (
 \r
       if ((IfrCheckBox->Flags & EFI_IFR_CHECKBOX_DEFAULT_MFG) == EFI_IFR_CHECKBOX_DEFAULT_MFG) {\r
         //\r
-        // Set standard ID to Manufacture ID and Get DefaultName String ID\r
+        // Set standard ID to Manufacture ID\r
         //\r
         VarDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
-        Status       = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
-        if (EFI_ERROR (Status)) {\r
-          goto Done;\r
-        }\r
         //\r
         // Prepare new DefaultValue\r
         //\r
@@ -1243,7 +1197,6 @@ ParseIfrData (
         }\r
         DefaultData->OpCode      = IfrOpHdr->OpCode;\r
         DefaultData->DefaultId   = VarDefaultId;\r
-        DefaultData->DefaultName = VarDefaultName;\r
         DefaultData->Value       = 1;\r
         //\r
         // Add DefaultValue into current BlockData\r
@@ -1466,13 +1419,9 @@ ParseIfrData (
         //\r
         FirstOneOfOption = FALSE;\r
         //\r
-        // Set standard ID to Manufacture ID and Get DefaultName String ID\r
+        // Set standard ID to Manufacture ID\r
         //\r
         VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
-        Status       = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
-        if (EFI_ERROR (Status)) {\r
-          goto Done;\r
-        }\r
         //\r
         // Prepare new DefaultValue\r
         //\r
@@ -1483,7 +1432,6 @@ ParseIfrData (
         }\r
         DefaultData->OpCode      = IfrOpHdr->OpCode;\r
         DefaultData->DefaultId   = VarDefaultId;\r
-        DefaultData->DefaultName = VarDefaultName;\r
         DefaultData->Value       = IfrOneOfOption->Value.u64;\r
         //\r
         // Add DefaultValue into current BlockData\r
@@ -1493,13 +1441,9 @@ ParseIfrData (
 \r
       if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG) {\r
         //\r
-        // Set default ID to Manufacture ID and Get DefaultName String ID\r
+        // Set default ID to Manufacture ID\r
         //\r
         VarDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
-        Status       = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
-        if (EFI_ERROR (Status)) {\r
-          goto Done;\r
-        }\r
         //\r
         // Prepare new DefaultValue\r
         //\r
@@ -1510,7 +1454,6 @@ ParseIfrData (
         }\r
         DefaultData->OpCode      = IfrOpHdr->OpCode;\r
         DefaultData->DefaultId   = VarDefaultId;\r
-        DefaultData->DefaultName = VarDefaultName;\r
         DefaultData->Value       = IfrOneOfOption->Value.u64;\r
         //\r
         // Add DefaultValue into current BlockData\r
@@ -1537,14 +1480,10 @@ ParseIfrData (
         break;\r
       }\r
       //\r
-      // Get the DefaultId and DefaultName String ID\r
+      // Get the DefaultId\r
       //\r
       IfrDefault     = (EFI_IFR_DEFAULT *) IfrOpHdr;\r
       VarDefaultId   = IfrDefault->DefaultId;\r
-      Status       = FindDefaultName (DefaultIdArray, VarDefaultId, &VarDefaultName);\r
-      if (EFI_ERROR (Status)) {\r
-        goto Done;\r
-      }\r
       //\r
       // Prepare new DefaultValue\r
       //\r
@@ -1555,7 +1494,6 @@ ParseIfrData (
       }\r
       DefaultData->OpCode      = IfrOpHdr->OpCode;\r
       DefaultData->DefaultId   = VarDefaultId;\r
-      DefaultData->DefaultName = VarDefaultName;\r
       DefaultData->Value       = IfrDefault->Value.u64;\r
       //\r
       // Add DefaultValue into current BlockData\r
@@ -2128,7 +2066,7 @@ GetFullStringFromHiiFormPackages (
       (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), \r
       L"&%s&ALTCFG=%04X", \r
       ConfigHdr, \r
-      DefaultId->DefaultName\r
+      DefaultId->DefaultId\r
       );\r
     StringPtr += StrLen (StringPtr);\r
     \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index d01a672189455b38a6120b8cec48ff36d0937ece..d4f730abb8382fbb17c1500a4f634c39d4c5c2c4 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -89,7 +89,6 @@ typedef struct {
 typedef struct {\r
   LIST_ENTRY          Entry;\r
   UINT8               OpCode;\r
-  EFI_STRING_ID       DefaultName;\r
   UINT16              DefaultId;\r
   UINT64              Value;\r
 } IFR_DEFAULT_DATA;\r