MdeModulePkg/SetupBrowser: Handle questions with Bit VarStore

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / IfrParse.c

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
+  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
@@ -1314,6 +1315,8 @@ ParseOpCodes (
   FORMSET_DEFAULTSTORE    *PreDefaultStore;\r
   LIST_ENTRY              *DefaultLink;\r
   BOOLEAN                 HaveInserted;\r
+  UINT16                  TotalBits;\r
+  BOOLEAN                 QuestionReferBitField;\r
 \r
   SuppressForQuestion      = FALSE;\r
   SuppressForOption        = FALSE;\r
@@ -1335,6 +1338,7 @@ ParseOpCodes (
   ConditionalExprCount     = 0;\r
   InUnknownScope           = FALSE;\r
   UnknownDepth             = 0;\r
+  QuestionReferBitField    = FALSE;\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
-      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
-      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
-      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
-      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
-      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
+        default:\r
+          break;\r
+        }\r
+      }\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
+      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
@@ -2594,14 +2661,19 @@ ParseOpCodes (
     //\r
     // Vendor specific\r
     //\r
-    case EFI_IFR_GUID_OP:     \r
+    case EFI_IFR_GUID_OP:\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
+      QuestionReferBitField = FALSE;\r
       Status = PopScope (&ScopeOpCode);\r
       if (EFI_ERROR (Status)) {\r
         ResetScopeStack ();\r