From nobody Fri Apr 26 08:19:47 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 149587414467224.469983428315004; Sat, 27 May 2017 01:35:44 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 85F0321A16E28; Sat, 27 May 2017 01:34:47 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 00C9421A16EFA for ; Sat, 27 May 2017 01:34:46 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 May 2017 01:35:42 -0700 Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by fmsmga005.fm.intel.com with ESMTP; 27 May 2017 01:35:41 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,400,1491289200"; d="scan'208";a="107265653" From: Dandan Bi To: edk2-devel@lists.01.org Date: Sat, 27 May 2017 16:34:18 +0800 Message-Id: <1495874060-331108-4-git-send-email-dandan.bi@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1495874060-331108-1-git-send-email-dandan.bi@intel.com> References: <1495874060-331108-1-git-send-email-dandan.bi@intel.com> Subject: [edk2] [RFC V2 3/5] MdeModulePkg/SetupBrowser: Handle questions with Bit VarStore X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Dong , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" For oneof/numeric/CheckBox(storage can be Bit VarStore) If we want 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 Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi --- MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c | 140 ++++++++++++++++-= ---- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 108 +++++++++++++++- MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 3 + .../Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 1 + 4 files changed, 214 insertions(+), 38 deletions(-) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModuleP= kg/Universal/SetupBrowserDxe/IfrParse.c index 6b3e5e0..0de1144 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c @@ -15,10 +15,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITH= ER EXPRESS OR IMPLIED. #include "Setup.h" =20 UINT16 mStatementIndex; UINT16 mExpressionOpCodeIndex; EFI_QUESTION_ID mUsedQuestionId; +BOOLEAN mQuestionReferBitVar =3D FALSE; + extern LIST_ENTRY gBrowserStorageList; /** Initialize Statement header members. =20 @param OpCodeData Pointer of the raw OpCode data. @@ -57,10 +59,11 @@ CreateStatement ( =20 Statement->Signature =3D FORM_BROWSER_STATEMENT_SIGNATURE; =20 Statement->Operand =3D ((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode; Statement->OpCode =3D (EFI_IFR_OP_HEADER *) OpCodeData; + Statement->QuestionReferToBitFields =3D FALSE; =20 StatementHdr =3D (EFI_IFR_STATEMENT_HEADER *) (OpCodeData + sizeof (EFI_= IFR_OP_HEADER)); CopyMem (&Statement->Prompt, &StatementHdr->Prompt, sizeof (EFI_STRING_I= D)); CopyMem (&Statement->Help, &StatementHdr->Help, sizeof (EFI_STRING_ID)); =20 @@ -1312,10 +1315,12 @@ ParseOpCodes ( BOOLEAN InUnknownScope; UINT8 UnknownDepth; FORMSET_DEFAULTSTORE *PreDefaultStore; LIST_ENTRY *DefaultLink; BOOLEAN HaveInserted; + UINT16 ByteWidth; + UINT16 BitWidth; =20 SuppressForQuestion =3D FALSE; SuppressForOption =3D FALSE; InScopeDisable =3D FALSE; DepthOfDisable =3D 0; @@ -1978,47 +1983,103 @@ ParseOpCodes ( ASSERT(CurrentStatement !=3D NULL); =20 CurrentStatement->Flags =3D ((EFI_IFR_ONE_OF *) OpCodeData)->Flags; Value =3D &CurrentStatement->HiiValue; =20 - switch (CurrentStatement->Flags & EFI_IFR_NUMERIC_SIZE) { - case EFI_IFR_NUMERIC_SIZE_1: - CurrentStatement->Minimum =3D ((EFI_IFR_NUMERIC *) OpCodeData)->da= ta.u8.MinValue; - CurrentStatement->Maximum =3D ((EFI_IFR_NUMERIC *) OpCodeData)->da= ta.u8.MaxValue; - CurrentStatement->Step =3D ((EFI_IFR_NUMERIC *) OpCodeData)->da= ta.u8.Step; - CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT8); - Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_8; - break; + if (mQuestionReferBitVar) { + mQuestionReferBitVar =3D FALSE; + CurrentStatement->StorageBitWidth =3D CurrentStatement->Flags & EF= I_IFR_NUMERIC_SIZE_BIT; + CurrentStatement->QuestionReferToBitFields =3D TRUE; + CurrentStatement->VarBitOffset =3D CurrentStatement->VarStoreInfo.= VarOffset; + CurrentStatement->VarStoreInfo.VarOffset =3D CurrentStatement->Var= BitOffset / 8; + BitWidth =3D CurrentStatement->VarBitOffset - (CurrentStatement->V= arStoreInfo.VarOffset * 8) + CurrentStatement->StorageBitWidth; + ByteWidth =3D BitWidth / 8; + CurrentStatement->StorageWidth =3D (BitWidth % 8 =3D=3D 0? ByteWid= th: ByteWidth + 1); + CurrentStatement->Minimum =3D ((EFI_IFR_NUMERIC *) OpCodeData)->da= ta.u32.MinValue; + CurrentStatement->Maximum =3D ((EFI_IFR_NUMERIC *) OpCodeData)->da= ta.u32.MaxValue; + CurrentStatement->Step =3D ((EFI_IFR_NUMERIC *) OpCodeData)->da= ta.u32.Step; + if (Operand =3D=3D EFI_IFR_NUMERIC_OP) { + switch (CurrentStatement->StorageWidth) { + case 1: + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags &=3D EFI_IFR_DISPLAY= _BIT; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags >>=3D 2; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |=3D EFI_IFR_TYPE_NU= M_SIZE_8; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue =3D (UINT= 8)CurrentStatement->Minimum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue =3D (UINT= 8)CurrentStatement->Maximum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step =3D (UINT8)Cu= rrentStatement->Step; + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_8; + break; + case 2: + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags &=3D EFI_IFR_DISPLAY_= BIT; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags >>=3D 2; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |=3D EFI_IFR_TYPE_NUM= _SIZE_16; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue =3D (UINT= 16)CurrentStatement->Minimum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue =3D (UINT= 16)CurrentStatement->Maximum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step =3D (UINT16)C= urrentStatement->Step; + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_16; + break; + case 3: + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags &=3D EFI_IFR_DISPLAY= _BIT; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags >>=3D 2; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |=3D EFI_IFR_TYPE_NU= M_SIZE_32; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue =3D (UIN= T32)CurrentStatement->Minimum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue =3D (UIN= T32)CurrentStatement->Maximum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step =3D (UINT32)= CurrentStatement->Step; + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_32; + break; + case 4: + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags &=3D EFI_IFR_DISPLAY= _BIT; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags >>=3D 2; + ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |=3D EFI_IFR_TYPE_NU= M_SIZE_32; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue =3D (UIN= T32)CurrentStatement->Minimum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue =3D (UIN= T32)CurrentStatement->Maximum; + ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step =3D (UINT32)= CurrentStatement->Step; + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_32; + break; + default: + break; + } + } + } else { =20 - case EFI_IFR_NUMERIC_SIZE_2: - CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u16.MinValue, sizeof (UINT16)); - CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u16.MaxValue, sizeof (UINT16)); - CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u16.Step, sizeof (UINT16)); - CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT16); - Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_16; - break; + switch (CurrentStatement->Flags & EFI_IFR_NUMERIC_SIZE) { + case EFI_IFR_NUMERIC_SIZE_1: + CurrentStatement->Minimum =3D ((EFI_IFR_NUMERIC *) OpCodeData)->= data.u8.MinValue; + CurrentStatement->Maximum =3D ((EFI_IFR_NUMERIC *) OpCodeData)->= data.u8.MaxValue; + CurrentStatement->Step =3D ((EFI_IFR_NUMERIC *) OpCodeData)->= data.u8.Step; + CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT8); + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_8; + break; =20 - case EFI_IFR_NUMERIC_SIZE_4: - CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u32.MinValue, sizeof (UINT32)); - CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u32.MaxValue, sizeof (UINT32)); - CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u32.Step, sizeof (UINT32)); - CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT32); - Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_32; - break; + case EFI_IFR_NUMERIC_SIZE_2: + CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u16.MinValue, sizeof (UINT16)); + CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u16.MaxValue, sizeof (UINT16)); + CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u16.Step, sizeof (UINT16)); + CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT16); + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_16; + break; =20 - case EFI_IFR_NUMERIC_SIZE_8: - CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u64.MinValue, sizeof (UINT64)); - CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u64.MaxValue, sizeof (UINT64)); - CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeD= ata)->data.u64.Step, sizeof (UINT64)); - CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT64); - Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_64; - break; + case EFI_IFR_NUMERIC_SIZE_4: + CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u32.MinValue, sizeof (UINT32)); + CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u32.MaxValue, sizeof (UINT32)); + CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u32.Step, sizeof (UINT32)); + CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT32); + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_32; + break; =20 - default: - break; - } + case EFI_IFR_NUMERIC_SIZE_8: + CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u64.MinValue, sizeof (UINT64)); + CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u64.MaxValue, sizeof (UINT64)); + CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCod= eData)->data.u64.Step, sizeof (UINT64)); + CurrentStatement->StorageWidth =3D (UINT16) sizeof (UINT64); + Value->Type =3D EFI_IFR_TYPE_NUM_SIZE_64; + break; =20 + default: + break; + } + } InitializeRequestElement (FormSet, CurrentStatement, CurrentForm); =20 if ((Operand =3D=3D EFI_IFR_ONE_OF_OP) && Scope !=3D 0) { SuppressForOption =3D TRUE; } @@ -2045,10 +2106,21 @@ ParseOpCodes ( =20 CurrentStatement->Flags =3D ((EFI_IFR_CHECKBOX *) OpCodeData)->Flags; CurrentStatement->StorageWidth =3D (UINT16) sizeof (BOOLEAN); CurrentStatement->HiiValue.Type =3D EFI_IFR_TYPE_BOOLEAN; =20 + if (mQuestionReferBitVar) { + mQuestionReferBitVar =3D FALSE; + CurrentStatement->StorageBitWidth =3D 1; + CurrentStatement->QuestionReferToBitFields =3D TRUE; + CurrentStatement->VarBitOffset =3D CurrentStatement->VarStoreInfo.= VarOffset; + CurrentStatement->VarStoreInfo.VarOffset =3D CurrentStatement->Var= BitOffset / 8; + BitWidth =3D CurrentStatement->VarBitOffset - (CurrentStatement->V= arStoreInfo.VarOffset * 8) + CurrentStatement->StorageBitWidth; + ByteWidth =3D BitWidth / 8; + CurrentStatement->StorageWidth =3D (BitWidth % 8 =3D=3D 0? ByteWid= th: ByteWidth + 1); + } + InitializeRequestElement (FormSet, CurrentStatement, CurrentForm); =20 break; =20 case EFI_IFR_STRING_OP: @@ -2594,10 +2666,14 @@ ParseOpCodes ( // // Vendor specific // case EFI_IFR_GUID_OP: =20 CurrentStatement =3D CreateStatement (OpCodeData, FormSet, CurrentFo= rm); + if (CompareGuid ((EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER= )), &gEfiIfrBitvarstoreGuid)) { + Scope =3D 0; + mQuestionReferBitVar =3D TRUE; + } break; =20 // // Scope End // diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/= Universal/SetupBrowserDxe/Setup.c index 83dc2b8..73dab0a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -1392,10 +1392,16 @@ BufferToValue ( UINTN Index; UINT8 DigitUint8; BOOLEAN IsString; UINTN Length; EFI_STATUS Status; + UINT8 *Buffer; + UINT32 Mask; + UINT32 PreBits; + UINT32 BufferValue; + + Buffer =3D NULL; =20 IsString =3D (BOOLEAN) ((Question->HiiValue.Type =3D=3D EFI_IFR_TYPE_STR= ING) ? TRUE : FALSE); if (Question->Storage->Type =3D=3D EFI_HII_VARSTORE_BUFFER ||=20 Question->Storage->Type =3D=3D EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)= { IsBufferStorage =3D TRUE; @@ -1413,11 +1419,17 @@ BufferToValue ( Dst =3D Question->BufferValue; } else { // // Other type of Questions // - Dst =3D (UINT8 *) &Question->HiiValue.Value; + if (Question->QuestionReferToBitFields) { + Buffer =3D (UINT8 *)AllocateZeroPool (Question->StorageWidth); + ASSERT (Buffer !=3D NULL); + Dst =3D Buffer; + } else { + Dst =3D (UINT8 *) &Question->HiiValue.Value; + } } =20 // // Temp cut at the end of this section, end with '\0' or '&'. // @@ -1471,10 +1483,27 @@ BufferToValue ( } } =20 *StringPtr =3D TempChar; =20 + if (Question->QuestionReferToBitFields) { + PreBits =3D Question->VarBitOffset - Question->VarStoreInfo.VarOffset = * 8; + Mask =3D (1 << Question->StorageBitWidth) - 1; + BufferValue =3D *(Buffer); + BufferValue |=3D *(Buffer + 1) << 8; + BufferValue |=3D *(Buffer + 2) << 16; + BufferValue |=3D *(Buffer + 3) << 24; + BufferValue >>=3D PreBits; + BufferValue &=3D Mask; + + CopyMem ((UINT8 *) &Question->HiiValue.Value, (UINT8*)&BufferValue, Qu= estion->StorageWidth); + + if (Buffer !=3D NULL) { + FreePool (Buffer); + } + } + return Status; } =20 /** Get Question's current Value. @@ -1509,10 +1538,13 @@ GetQuestionValue ( CHAR16 *Result; CHAR16 *Value; UINTN Length; BOOLEAN IsBufferStorage; UINTN MaxLen; + UINT32 PreBits; + UINT32 Mask; + UINT32 BufferValue; =20 Status =3D EFI_SUCCESS; Value =3D NULL; Result =3D NULL; =20 @@ -1676,16 +1708,40 @@ GetQuestionValue ( if (IsBufferStorage) { if (GetValueFrom =3D=3D GetSetValueWithEditBuffer) { // // Copy from storage Edit buffer // - CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOffs= et, StorageWidth); + if (Question->QuestionReferToBitFields) { + PreBits =3D Question->VarBitOffset - Question->VarStoreInfo.VarO= ffset * 8; + Mask =3D (1<< Question->StorageBitWidth) -1; + BufferValue =3D *(Storage->EditBuffer + Question->VarStoreInfo.V= arOffset); + BufferValue |=3D *(Storage->EditBuffer + Question->VarStoreInfo.= VarOffset + 1) << 8; + BufferValue |=3D *(Storage->EditBuffer + Question->VarStoreInfo.= VarOffset + 2) << 16; + BufferValue |=3D *(Storage->EditBuffer + Question->VarStoreInfo.= VarOffset + 3) << 24; + BufferValue >>=3D PreBits; + BufferValue &=3D Mask; + CopyMem (Dst, (UINT8*)&BufferValue, StorageWidth); + } else { + CopyMem (Dst, Storage->EditBuffer + Question->VarStoreInfo.VarOf= fset, StorageWidth); + } } else { // // Copy from storage Edit buffer // - CopyMem (Dst, Storage->Buffer + Question->VarStoreInfo.VarOffset, = StorageWidth); + if (Question->QuestionReferToBitFields) { + PreBits =3D Question->VarBitOffset - Question->VarStoreInfo.VarO= ffset * 8; + Mask =3D (1<< Question->StorageBitWidth) -1; + BufferValue =3D *(Storage->Buffer + Question->VarStoreInfo.VarOf= fset); + BufferValue |=3D *(Storage->Buffer + Question->VarStoreInfo.VarO= ffset + 1) << 8; + BufferValue |=3D *(Storage->Buffer + Question->VarStoreInfo.VarO= ffset + 2) << 16; + BufferValue |=3D *(Storage->Buffer + Question->VarStoreInfo.VarO= ffset + 3) << 24; + BufferValue >>=3D PreBits; + BufferValue &=3D Mask; + CopyMem (Dst, (UINT8*)&BufferValue, StorageWidth); + } else { + CopyMem (Dst, Storage->Buffer + Question->VarStoreInfo.VarOffset= , StorageWidth); + } } } else { Value =3D NULL; Status =3D GetValueByName (Storage, Question->VariableName, &Value, = GetValueFrom); if (EFI_ERROR (Status)) { @@ -1825,10 +1881,14 @@ SetQuestionValue ( CHAR16 *TemName; CHAR16 *TemString; UINTN Index; NAME_VALUE_NODE *Node; UINTN MaxLen; + UINT32 PreBits; + UINT32 Mask; + UINT32 Buffer; + UINT32 SrcValue; =20 Status =3D EFI_SUCCESS; Node =3D NULL; =20 if (SetValueTo >=3D GetSetValueWithMax) { @@ -1947,17 +2007,53 @@ SetQuestionValue ( if (SetValueTo =3D=3D GetSetValueWithEditBuffer || SetValueTo =3D=3D Get= SetValueWithBuffer) { if (IsBufferStorage) { if (SetValueTo =3D=3D GetSetValueWithEditBuffer) { // // Copy to storage edit buffer - // =20 - CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset, S= rc, StorageWidth); + // + if (Question->QuestionReferToBitFields) { + PreBits =3D Question->VarBitOffset - Question->VarStoreInfo.VarO= ffset * 8; + SrcValue =3D (UINT32)(*Src); + SrcValue <<=3D PreBits; + Mask =3D (1<< Question->StorageBitWidth) -1; + Mask <<=3D PreBits; + Buffer =3D *(Storage->EditBuffer + Question->VarStoreInfo.VarOff= set); + Buffer |=3D *(Storage->EditBuffer + Question->VarStoreInfo.VarOf= fset + 1) << 8; + Buffer |=3D *(Storage->EditBuffer + Question->VarStoreInfo.VarOf= fset + 2) << 16; + Buffer |=3D *(Storage->EditBuffer + Question->VarStoreInfo.VarOf= fset + 3) << 24; + + Buffer =3D (Buffer & (~Mask)) | SrcValue; + *(Storage->EditBuffer + Question->VarStoreInfo.VarOffset) =3D (U= INT8) Buffer & 0xFF; + *(Storage->EditBuffer + Question->VarStoreInfo.VarOffset + 1) = =3D (UINT8) (Buffer >> 8); + *(Storage->EditBuffer + Question->VarStoreInfo.VarOffset + 2) = =3D (UINT8) (Buffer >> 16); + *(Storage->EditBuffer + Question->VarStoreInfo.VarOffset + 3) = =3D (UINT8) (Buffer >> 24); + } else { + CopyMem (Storage->EditBuffer + Question->VarStoreInfo.VarOffset,= Src, StorageWidth); + } } else if (SetValueTo =3D=3D GetSetValueWithBuffer) { // // Copy to storage edit buffer // =20 - CopyMem (Storage->Buffer + Question->VarStoreInfo.VarOffset, Src, = StorageWidth); + if (Question->QuestionReferToBitFields) { + PreBits =3D Question->VarBitOffset - Question->VarStoreInfo.VarO= ffset * 8; + SrcValue =3D (UINT32)(*Src); + SrcValue <<=3D PreBits; + Mask =3D (1<< Question->StorageBitWidth) -1; + Mask <<=3D PreBits; + Buffer =3D *(Storage->Buffer + Question->VarStoreInfo.VarOffset); + Buffer |=3D *(Storage->Buffer + Question->VarStoreInfo.VarOffset= + 1) << 8; + Buffer |=3D *(Storage->Buffer + Question->VarStoreInfo.VarOffset= + 2) << 16; + Buffer |=3D *(Storage->Buffer + Question->VarStoreInfo.VarOffset= + 3) << 24; + + Buffer =3D (Buffer & (~Mask)) | SrcValue; + *(Storage->Buffer + Question->VarStoreInfo.VarOffset) =3D (UINT8= ) Buffer & 0xFF; + *(Storage->Buffer + Question->VarStoreInfo.VarOffset + 1) =3D (U= INT8) (Buffer >> 8); + *(Storage->Buffer + Question->VarStoreInfo.VarOffset + 2) =3D (U= INT8) (Buffer >> 16); + *(Storage->Buffer + Question->VarStoreInfo.VarOffset + 3) =3D (U= INT8) (Buffer >> 24); + } else { + CopyMem (Storage->Buffer + Question->VarStoreInfo.VarOffset, Src= , StorageWidth); + } } } else { if (IsString) { // // Allocate enough string buffer. diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/= Universal/SetupBrowserDxe/Setup.h index f1accdf..d5889cc 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -327,11 +327,14 @@ struct _FORM_BROWSER_STATEMENT{ EFI_QUESTION_ID QuestionId; // The value of zero is reserved EFI_VARSTORE_ID VarStoreId; // A value of zero indicates no = variable storage BROWSER_STORAGE *Storage; VAR_STORE_INFO VarStoreInfo; UINT16 StorageWidth; + UINT16 StorageBitWidth; + UINT16 VarBitOffset; UINT8 QuestionFlags; + BOOLEAN QuestionReferToBitFields; CHAR16 *VariableName; // Name/Value or EFI Variable na= me CHAR16 *BlockName; // Buffer storage block name: "O= FFSET=3D...WIDTH=3D..." =20 EFI_HII_VALUE HiiValue; // Edit copy for checkbox, numbe= ric, oneof UINT8 *BufferValue; // Edit copy for string, passwor= d, orderedlist diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/M= deModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 012a39b..77e0a48 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -60,10 +60,11 @@ [Guids] gEfiIfrFrameworkGuid ## SOMETIMES_CONSUMES ## = GUID gEfiHiiPlatformSetupFormsetGuid ## SOMETIMES_CONSUMES ## = GUID gEfiHiiStandardFormGuid ## SOMETIMES_CONSUMES ## = GUID gZeroGuid ## SOMETIMES_CONSUMES ## = GUID + gEfiIfrBitvarstoreGuid ## SOMETIMES_CONSUMES ## = GUID =20 [Protocols] gEfiHiiConfigAccessProtocolGuid ## SOMETIMES_CONSUMES gEfiFormBrowser2ProtocolGuid ## PRODUCES gEdkiiFormBrowserEx2ProtocolGuid ## PRODUCES --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel