MdeModulePkg/SetupBrowser: Handle questions with Bit VarStore

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=545

For oneof/numeric/CheckBox(storage can be Bit VarStore)
If the question value can be updated and shown correctly
in UI page, we need do enhancements in following cases:
1. Parse the Ifr data to get the bit VarStore info correctly.
2. Set/get value to/from bit VarStore correctly.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index 6b3e5e098e910ba8aea2a2b9daf6d73a4d808173..9bda482a4ac3301a5a867cf03d11b798302a9d85 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -59,6 +59,7 @@ CreateStatement (
 \r
   Statement->Operand = ((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode;\r
   Statement->OpCode  = (EFI_IFR_OP_HEADER *) OpCodeData;\r
 \r
   Statement->Operand = ((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode;\r
   Statement->OpCode  = (EFI_IFR_OP_HEADER *) OpCodeData;\r

+  Statement->QuestionReferToBitField = FALSE;\r

 \r
   StatementHdr = (EFI_IFR_STATEMENT_HEADER *) (OpCodeData + sizeof (EFI_IFR_OP_HEADER));\r
   CopyMem (&Statement->Prompt, &StatementHdr->Prompt, sizeof (EFI_STRING_ID));\r
 \r
   StatementHdr = (EFI_IFR_STATEMENT_HEADER *) (OpCodeData + sizeof (EFI_IFR_OP_HEADER));\r
   CopyMem (&Statement->Prompt, &StatementHdr->Prompt, sizeof (EFI_STRING_ID));\r


@@ -1314,6 +1315,8 @@ ParseOpCodes (
   FORMSET_DEFAULTSTORE    *PreDefaultStore;\r
   LIST_ENTRY              *DefaultLink;\r
   BOOLEAN                 HaveInserted;\r
   FORMSET_DEFAULTSTORE    *PreDefaultStore;\r
   LIST_ENTRY              *DefaultLink;\r
   BOOLEAN                 HaveInserted;\r

+  UINT16                  TotalBits;\r
+  BOOLEAN                 QuestionReferBitField;\r

 \r
   SuppressForQuestion      = FALSE;\r
   SuppressForOption        = FALSE;\r
 \r
   SuppressForQuestion      = FALSE;\r
   SuppressForOption        = FALSE;\r


@@ -1335,6 +1338,7 @@ ParseOpCodes (
   ConditionalExprCount     = 0;\r
   InUnknownScope           = FALSE;\r
   UnknownDepth             = 0;\r
   ConditionalExprCount     = 0;\r
   InUnknownScope           = FALSE;\r
   UnknownDepth             = 0;\r

+  QuestionReferBitField    = FALSE;\r

 \r
   //\r
   // Get the number of Statements and Expressions\r
 \r
   //\r
   // Get the number of Statements and Expressions\r


@@ -1980,43 +1984,94 @@ ParseOpCodes (
       CurrentStatement->Flags = ((EFI_IFR_ONE_OF *) OpCodeData)->Flags;\r
       Value = &CurrentStatement->HiiValue;\r
 \r
       CurrentStatement->Flags = ((EFI_IFR_ONE_OF *) OpCodeData)->Flags;\r
       Value = &CurrentStatement->HiiValue;\r
 \r

-      switch (CurrentStatement->Flags & EFI_IFR_NUMERIC_SIZE) {\r
-      case EFI_IFR_NUMERIC_SIZE_1:\r
-        CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue;\r
-        CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue;\r
-        CurrentStatement->Step    = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step;\r
-        CurrentStatement->StorageWidth = (UINT16) sizeof (UINT8);\r
-        Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
-        break;\r
+      if (QuestionReferBitField) {\r
+        //\r
+        // Get the bit var store info (bit/byte offset, bit/byte offset)\r
+        //\r
+        CurrentStatement->QuestionReferToBitField = TRUE;\r
+        CurrentStatement->BitStorageWidth = CurrentStatement->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
+        CurrentStatement->BitVarOffset = CurrentStatement->VarStoreInfo.VarOffset;\r
+        CurrentStatement->VarStoreInfo.VarOffset = CurrentStatement->BitVarOffset / 8;\r
+        TotalBits = CurrentStatement->BitVarOffset % 8 + CurrentStatement->BitStorageWidth;\r
+        CurrentStatement->StorageWidth = (TotalBits % 8 == 0? TotalBits / 8: TotalBits / 8 + 1);\r

 \r
 \r

-      case EFI_IFR_NUMERIC_SIZE_2:\r
-        CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue, sizeof (UINT16));\r
-        CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue, sizeof (UINT16));\r
-        CopyMem (&CurrentStatement->Step,    &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step,     sizeof (UINT16));\r
-        CurrentStatement->StorageWidth = (UINT16) sizeof (UINT16);\r
-        Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
-        break;\r
+        //\r
+        // Get the Minimum/Maximum/Step value(Note: bit field type has been stored as UINT32 type)\r
+        //\r
+        CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue;\r
+        CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue;\r
+        CurrentStatement->Step    = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step;\r

 \r
 \r

-      case EFI_IFR_NUMERIC_SIZE_4:\r
-        CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue, sizeof (UINT32));\r
-        CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue, sizeof (UINT32));\r
-        CopyMem (&CurrentStatement->Step,    &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step,     sizeof (UINT32));\r
-        CurrentStatement->StorageWidth = (UINT16) sizeof (UINT32);\r
-        Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
-        break;\r
+        //\r
+        // Update the Flag and type of Minimum/Maximum/Step according to the actual width of bit field,\r
+        // in order to make Browser handle these question with bit varstore correctly.\r
+        //\r
+        ((EFI_IFR_NUMERIC *) OpCodeData)->Flags &=  EDKII_IFR_DISPLAY_BIT;\r
+        ((EFI_IFR_NUMERIC *) OpCodeData)->Flags >>= 2;\r
+        switch (CurrentStatement->StorageWidth) {\r
+        case 1:\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_8;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue = (UINT8)CurrentStatement->Minimum;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue = (UINT8)CurrentStatement->Maximum;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step = (UINT8)CurrentStatement->Step;\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+          break;\r
+        case 2:\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_16;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue = (UINT16)CurrentStatement->Minimum;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue = (UINT16)CurrentStatement->Maximum;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step = (UINT16)CurrentStatement->Step;\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+          break;\r
+        case 3:\r
+        case 4:\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_32;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue = (UINT32)CurrentStatement->Minimum;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue = (UINT32)CurrentStatement->Maximum;\r
+          ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step = (UINT32)CurrentStatement->Step;\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
+          break;\r
+        default:\r
+          break;\r
+        }\r
+      } else {\r
+        switch (CurrentStatement->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+        case EFI_IFR_NUMERIC_SIZE_1:\r
+          CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue;\r
+          CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue;\r
+          CurrentStatement->Step    = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step;\r
+          CurrentStatement->StorageWidth = (UINT16) sizeof (UINT8);\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+          break;\r

 \r
 \r

-      case EFI_IFR_NUMERIC_SIZE_8:\r
-        CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MinValue, sizeof (UINT64));\r
-        CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MaxValue, sizeof (UINT64));\r
-        CopyMem (&CurrentStatement->Step,    &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.Step,     sizeof (UINT64));\r
-        CurrentStatement->StorageWidth = (UINT16) sizeof (UINT64);\r
-        Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
-        break;\r
+        case EFI_IFR_NUMERIC_SIZE_2:\r
+          CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue, sizeof (UINT16));\r
+          CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue, sizeof (UINT16));\r
+          CopyMem (&CurrentStatement->Step,    &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step,     sizeof (UINT16));\r
+          CurrentStatement->StorageWidth = (UINT16) sizeof (UINT16);\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+          break;\r

 \r
 \r

-      default:\r
-        break;\r
-      }\r
+        case EFI_IFR_NUMERIC_SIZE_4:\r
+          CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue, sizeof (UINT32));\r
+          CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue, sizeof (UINT32));\r
+          CopyMem (&CurrentStatement->Step,    &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step,     sizeof (UINT32));\r
+          CurrentStatement->StorageWidth = (UINT16) sizeof (UINT32);\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
+          break;\r
+\r
+        case EFI_IFR_NUMERIC_SIZE_8:\r
+          CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MinValue, sizeof (UINT64));\r
+          CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MaxValue, sizeof (UINT64));\r
+          CopyMem (&CurrentStatement->Step,    &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.Step,     sizeof (UINT64));\r
+          CurrentStatement->StorageWidth = (UINT16) sizeof (UINT64);\r
+          Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
+          break;\r

 \r
 \r

+        default:\r
+          break;\r
+        }\r
+      }\r

       InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
 \r
       if ((Operand == EFI_IFR_ONE_OF_OP) && Scope != 0) {\r
       InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
 \r
       if ((Operand == EFI_IFR_ONE_OF_OP) && Scope != 0) {\r


@@ -2047,6 +2102,18 @@ ParseOpCodes (
       CurrentStatement->StorageWidth = (UINT16) sizeof (BOOLEAN);\r
       CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BOOLEAN;\r
 \r
       CurrentStatement->StorageWidth = (UINT16) sizeof (BOOLEAN);\r
       CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BOOLEAN;\r
 \r

+      if (QuestionReferBitField) {\r
+        //\r
+        // Get the bit var store info (bit/byte offset, bit/byte offset)\r
+        //\r
+        CurrentStatement->QuestionReferToBitField = TRUE;\r
+        CurrentStatement->BitStorageWidth = 1;\r
+        CurrentStatement->BitVarOffset = CurrentStatement->VarStoreInfo.VarOffset;\r
+        CurrentStatement->VarStoreInfo.VarOffset = CurrentStatement->BitVarOffset / 8;\r
+        TotalBits = CurrentStatement->BitVarOffset % 8 + CurrentStatement->BitStorageWidth;\r
+        CurrentStatement->StorageWidth = (TotalBits % 8 == 0? TotalBits / 8: TotalBits / 8 + 1);\r
+      }\r
+\r

       InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
 \r
       break;\r
       InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
 \r
       break;\r


@@ -2594,14 +2661,19 @@ ParseOpCodes (
     //\r
     // Vendor specific\r
     //\r
     //\r
     // Vendor specific\r
     //\r

-    case EFI_IFR_GUID_OP:     \r
+    case EFI_IFR_GUID_OP:\r

       CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
       CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r

+      if (CompareGuid ((EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)), &gEdkiiIfrBitVarstoreGuid)) {\r
+        Scope = 0;\r
+        QuestionReferBitField = TRUE;\r
+      }\r

       break;\r
 \r
     //\r
     // Scope End\r
     //\r
     case EFI_IFR_END_OP:\r
       break;\r
 \r
     //\r
     // Scope End\r
     //\r
     case EFI_IFR_END_OP:\r

+      QuestionReferBitField = FALSE;\r

       Status = PopScope (&ScopeOpCode);\r
       if (EFI_ERROR (Status)) {\r
         ResetScopeStack ();\r
       Status = PopScope (&ScopeOpCode);\r
       if (EFI_ERROR (Status)) {\r
         ResetScopeStack ();\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 89e06deae86c4bae00b4cb78fe65ca45b34cff15..48beeb6539d19f9b703d385d0b2258d3259fb6c3 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1368,6 +1368,71 @@ ConfigRespToStorage (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

+/**\r
+  Get bit field value from the buffer and then set the value for the question.\r
+  Note: Data type UINT32 can cover all the bit field value.\r
+\r
+  @param  Question        The question refer to bit field.\r
+  @param  Buffer          Point to the buffer which the question value get from.\r
+\r
+**/\r
+VOID\r
+GetBitsQuestionValue (\r
+  IN  FORM_BROWSER_STATEMENT *Question,\r
+  IN  UINT8                  *Buffer\r
+  )\r
+{\r
+  UINTN    StartBit;\r
+  UINTN    EndBit;\r
+  UINT32   RetVal;\r
+  UINT32   BufferValue;\r
+\r
+  StartBit = Question->BitVarOffset % 8;\r
+  EndBit = StartBit + Question->BitStorageWidth - 1;\r
+\r
+  CopyMem ((UINT8 *) &BufferValue, Buffer, Question->StorageWidth);\r
+\r
+  RetVal = BitFieldRead32 (BufferValue, StartBit, EndBit);\r
+\r
+  //\r
+  // Set question value.\r
+  // Note: Since Question with BufferValue (orderedlist, password, string)are not supported to refer bit field.\r
+  // Only oneof/checkbox/oneof can support bit field.So we can copy the value to the Hiivalue of Question directly.\r
+  //\r
+  CopyMem ((UINT8 *) &Question->HiiValue.Value, (UINT8 *) &RetVal, Question->StorageWidth);\r
+}\r
+\r
+/**\r
+  Set bit field value to the buffer.\r
+  Note: Data type UINT32 can cover all the bit field value.\r
+\r
+  @param  Question        The question refer to bit field.\r
+  @param  Buffer          Point to the buffer which the question value set to.\r
+  @param  Value           The bit field value need to set.\r
+\r
+**/\r
+VOID\r
+SetBitsQuestionValue (\r
+  IN     FORM_BROWSER_STATEMENT *Question,\r
+  IN OUT UINT8                  *Buffer,\r
+  IN     UINT32                 Value\r
+  )\r
+{\r
+  UINT32   Operand;\r
+  UINTN    StartBit;\r
+  UINTN    EndBit;\r
+  UINT32   RetVal;\r
+\r
+  StartBit = Question->BitVarOffset % 8;\r
+  EndBit = StartBit + Question->BitStorageWidth - 1;\r
+\r
+  CopyMem ((UINT8*) &Operand, Buffer, Question->StorageWidth);\r
+\r
+  RetVal = BitFieldWrite32 (Operand, StartBit, EndBit, Value);\r
+\r
+  CopyMem (Buffer, (UINT8*) &RetVal, Question->StorageWidth);\r
+}\r
+\r

 /**\r
   Convert the buffer value to HiiValue.\r
 \r
 /**\r
   Convert the buffer value to HiiValue.\r
 \r


@@ -1395,6 +1460,9 @@ BufferToValue (
   BOOLEAN                      IsString;\r
   UINTN                        Length;\r
   EFI_STATUS                   Status;\r
   BOOLEAN                      IsString;\r
   UINTN                        Length;\r
   EFI_STATUS                   Status;\r

+  UINT8                        *Buffer;\r
+\r
+  Buffer = NULL;\r

 \r
   IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ?  TRUE : FALSE);\r
   if (Question->Storage->Type == EFI_HII_VARSTORE_BUFFER || \r
 \r
   IsString = (BOOLEAN) ((Question->HiiValue.Type == EFI_IFR_TYPE_STRING) ?  TRUE : FALSE);\r
   if (Question->Storage->Type == EFI_HII_VARSTORE_BUFFER || \r


@@ -1416,7 +1484,13 @@ BufferToValue (
     //\r
     // Other type of Questions\r
     //\r
     //\r
     // Other type of Questions\r
     //\r

-    Dst = (UINT8 *) &Question->HiiValue.Value;\r
+    if (Question->QuestionReferToBitField) {\r
+      Buffer = (UINT8 *)AllocateZeroPool (Question->StorageWidth);\r
+      ASSERT (Buffer != NULL);\r
+      Dst = Buffer;\r
+    } else {\r
+      Dst = (UINT8 *) &Question->HiiValue.Value;\r
+    }\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -1474,6 +1548,13 @@ BufferToValue (
 \r
   *StringPtr = TempChar;\r
 \r
 \r
   *StringPtr = TempChar;\r
 \r

+  if (Question->QuestionReferToBitField) {\r
+    GetBitsQuestionValue (Question, Buffer);\r
+    if (Buffer != NULL) {\r
+      FreePool (Buffer);\r
+    }\r
+  }\r
+\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -1678,13 +1759,23 @@ GetQuestionValue (
       if (GetValueFrom == GetSetValueWithEditBuffer) {\r
         //\r
         // Copy from storage Edit buffer\r
       if (GetValueFrom == GetSetValueWithEditBuffer) {\r
         //\r
         // Copy from storage Edit buffer\r

+        // If the Question refer to bit filed, get the value in the related bit filed.\r

         //\r
         //\r

-        CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOffset, StorageWidth);\r
+        if (Question->QuestionReferToBitField) {\r
+          GetBitsQuestionValue (Question, Storage->EditBuffer + Question->VarStoreInfo.VarOffset);\r
+        } else {\r
+          CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOffset, StorageWidth);\r
+        }\r

       } else {\r
         //\r
         // Copy from storage Edit buffer\r
       } else {\r
         //\r
         // Copy from storage Edit buffer\r

+        // If the Question refer to bit filed, get the value in the related bit filed.\r

         //\r
         //\r

-        CopyMem (Dst, Storage->Buffer + Question->VarStoreInfo.VarOffset, StorageWidth);\r
+        if (Question->QuestionReferToBitField) {\r
+          GetBitsQuestionValue (Question, Storage->Buffer + Question->VarStoreInfo.VarOffset);\r
+        } else {\r
+          CopyMem (Dst, Storage->Buffer + Question->VarStoreInfo.VarOffset, StorageWidth);\r
+        }\r

       }\r
     } else {\r
       Value = NULL;\r
       }\r
     } else {\r
       Value = NULL;\r


@@ -1950,13 +2041,23 @@ SetQuestionValue (
       if (SetValueTo == GetSetValueWithEditBuffer) {\r
         //\r
         // Copy to storage edit buffer\r
       if (SetValueTo == GetSetValueWithEditBuffer) {\r
         //\r
         // Copy to storage edit buffer\r

-        //      \r
-        CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth);\r
+        // If the Question refer to bit filed, copy the value in related bit filed to storage edit buffer.\r
+        //\r
+        if (Question->QuestionReferToBitField) {\r
+          SetBitsQuestionValue (Question, Storage->EditBuffer + Question->VarStoreInfo.VarOffset, (UINT32)(*Src));\r
+        } else {\r
+          CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth);\r
+        }\r

       } else if (SetValueTo == GetSetValueWithBuffer) {\r
         //\r
       } else if (SetValueTo == GetSetValueWithBuffer) {\r
         //\r

-        // Copy to storage edit buffer\r
-        //     \r
-        CopyMem (Storage->Buffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth);\r
+        // Copy to storage buffer\r
+        // If the Question refer to bit filed, copy the value in related bit filed to storage buffer.\r
+        //\r
+        if (Question->QuestionReferToBitField) {\r
+          SetBitsQuestionValue (Question, Storage->Buffer + Question->VarStoreInfo.VarOffset, (UINT32)(*Src));\r
+        } else {\r
+          CopyMem (Storage->Buffer + Question->VarStoreInfo.VarOffset, Src, StorageWidth);\r
+        }\r

       }\r
     } else {\r
       if (IsString) {\r
       }\r
     } else {\r
       if (IsString) {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index de140e9cb271156d72fc535497b36613afc98467..09e0be7494b3d15283d82bd8ec9a00c493c17daa 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -329,7 +329,10 @@ struct _FORM_BROWSER_STATEMENT{
   BROWSER_STORAGE       *Storage;\r
   VAR_STORE_INFO        VarStoreInfo;\r
   UINT16                StorageWidth;\r
   BROWSER_STORAGE       *Storage;\r
   VAR_STORE_INFO        VarStoreInfo;\r
   UINT16                StorageWidth;\r

+  UINT16                BitStorageWidth;\r
+  UINT16                BitVarOffset;\r

   UINT8                 QuestionFlags;\r
   UINT8                 QuestionFlags;\r

+  BOOLEAN               QuestionReferToBitField;// Whether the question is stored in a bit field.\r

   CHAR16                *VariableName;    // Name/Value or EFI Variable name\r
   CHAR16                *BlockName;       // Buffer storage block name: "OFFSET=...WIDTH=..."\r
 \r
   CHAR16                *VariableName;    // Name/Value or EFI Variable name\r
   CHAR16                *BlockName;       // Buffer storage block name: "OFFSET=...WIDTH=..."\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 012a39bee5df78a962327af1e3490359a34fee74..fefaefe59c8ddc84795f290850299862fcd4d0c9 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -3,7 +3,7 @@
 #\r
 # It also produces FormBrowserEx(2) protocol to let user register the different Hot key service. \r
 #\r
 #\r
 # It also produces FormBrowserEx(2) protocol to let user register the different Hot key service. \r
 #\r

-# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -62,6 +62,7 @@
   gEfiHiiPlatformSetupFormsetGuid               ## SOMETIMES_CONSUMES  ## GUID\r
   gEfiHiiStandardFormGuid                       ## SOMETIMES_CONSUMES  ## GUID\r
   gZeroGuid                                     ## SOMETIMES_CONSUMES  ## GUID\r
   gEfiHiiPlatformSetupFormsetGuid               ## SOMETIMES_CONSUMES  ## GUID\r
   gEfiHiiStandardFormGuid                       ## SOMETIMES_CONSUMES  ## GUID\r
   gZeroGuid                                     ## SOMETIMES_CONSUMES  ## GUID\r

+  gEdkiiIfrBitVarstoreGuid                      ## SOMETIMES_CONSUMES  ## GUID\r

 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## SOMETIMES_CONSUMES\r
 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## SOMETIMES_CONSUMES\r