Re: [edk2] [PATCH v3] MdeModulePkg/VarCheckHii: Enhance VarCheckHiiLib to support bit check

2017-11-06 Thread Zeng, Star 
Reviewed-by: Star Zeng 

-Original Message-
From: Bi, Dandan 
Sent: Monday, November 6, 2017 3:47 PM
To: edk2-devel@lists.01.org
Cc: Zeng, Star ; Dong, Eric ; Gao, 
Liming 
Subject: [PATCH v3] MdeModulePkg/VarCheckHii: Enhance VarCheckHiiLib to support 
bit check

V3:
(1) Reset QuestionStoredInBitField to FALSE at end opcode(EFI_IFR_END_OP)
(2) Fix typo and format issues(line alignment for debug print message and value 
assignment...)

V2:
(1)Remove the VarOffsetBitLevel/StorageWidthBitLevel to reduce the final 
VarCheckBinSize and update the implementation accordingly.
(2)Update the VAR_CHECK_HII_REVISION
(3)Refine the Debug message and function comments,like update oneof", 
"checkbox", "numeric" to "OneOf", "CheckBox", "Numeric".

VarCheckHiiLib check the value set to storage based on the possible value 
listed in the vfr file. Since we have enhanced vfr to support Question value 
stored in bit field, so now enhance VarCheckHiiLib to support bit field check.

Cc: Star Zeng 
Cc: Eric Dong 
Cc: Liming Gao 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi 
---
 .../VarCheckHiiLib/InternalVarCheckStructure.h |   9 +-
 MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h  |   4 +-
 .../Library/VarCheckHiiLib/VarCheckHiiGen.c| 248 +++--
 .../Library/VarCheckHiiLib/VarCheckHiiLib.inf  |   5 +-
 .../VarCheckHiiLib/VarCheckHiiLibNullClass.c   | 174 ++-
 5 files changed, 310 insertions(+), 130 deletions(-)

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h 
b/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
index a9faed4..8878e4a 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
+++ b/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
@@ -1,9 +1,9 @@
 /** @file
   Internal structure for Var Check Hii.
 
-Copyright (c) 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
 This program and the accompanying materials  are licensed and made available 
under the terms and conditions of the BSD License  which accompanies this 
distribution.  The full text of the license may be found at  
http://opensource.org/licenses/bsd-license.php
 
@@ -21,11 +21,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #define HEADER_ALIGNMENT  4
 #define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & 
(~(HEADER_ALIGNMENT - 1)))
 
 #pragma pack (1)
 
-#define VAR_CHECK_HII_REVISION  0x0001
+#define VAR_CHECK_HII_REVISION  0x0002
 
 typedef struct {
   UINT16Revision;
   UINT16HeaderLength;
   UINT32Length; // Length include this header
@@ -40,41 +40,46 @@ typedef struct {
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 } VAR_CHECK_HII_QUESTION_HEADER;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 //UINTx   Data[]; // x = UINT8/UINT16/UINT32/UINT64;
 } VAR_CHECK_HII_QUESTION_ONEOF;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 } VAR_CHECK_HII_QUESTION_CHECKBOX;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 //UINTx   Minimum; // x = UINT8/UINT16/UINT32/UINT64;
 //UINTx   Maximum; // x = UINT8/UINT16/UINT32/UINT64;
 } VAR_CHECK_HII_QUESTION_NUMERIC;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the

[edk2] [PATCH v3] MdeModulePkg/VarCheckHii: Enhance VarCheckHiiLib to support bit check

2017-11-05 Thread Dandan Bi 
V3:
(1) Reset QuestionStoredInBitField to FALSE at end opcode(EFI_IFR_END_OP)
(2) Fix typo and format issues(line alignment for debug print message
and value assignment...)

V2:
(1)Remove the VarOffsetBitLevel/StorageWidthBitLevel to reduce the final
VarCheckBinSize and update the implementation accordingly.
(2)Update the VAR_CHECK_HII_REVISION
(3)Refine the Debug message and function comments,like update oneof",
"checkbox", "numeric" to "OneOf", "CheckBox", "Numeric".

VarCheckHiiLib check the value set to storage based on the possible value
listed in the vfr file. Since we have enhanced vfr to support Question
value stored in bit field, so now enhance VarCheckHiiLib to support bit
field check.

Cc: Star Zeng 
Cc: Eric Dong 
Cc: Liming Gao 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi 
---
 .../VarCheckHiiLib/InternalVarCheckStructure.h |   9 +-
 MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h  |   4 +-
 .../Library/VarCheckHiiLib/VarCheckHiiGen.c| 248 +++--
 .../Library/VarCheckHiiLib/VarCheckHiiLib.inf  |   5 +-
 .../VarCheckHiiLib/VarCheckHiiLibNullClass.c   | 174 ++-
 5 files changed, 310 insertions(+), 130 deletions(-)

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h 
b/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
index a9faed4..8878e4a 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
+++ b/MdeModulePkg/Library/VarCheckHiiLib/InternalVarCheckStructure.h
@@ -1,9 +1,9 @@
 /** @file
   Internal structure for Var Check Hii.
 
-Copyright (c) 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD 
License
 which accompanies this distribution.  The full text of the license may be 
found at
 http://opensource.org/licenses/bsd-license.php
 
@@ -21,11 +21,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #define HEADER_ALIGNMENT  4
 #define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & 
(~(HEADER_ALIGNMENT - 1)))
 
 #pragma pack (1)
 
-#define VAR_CHECK_HII_REVISION  0x0001
+#define VAR_CHECK_HII_REVISION  0x0002
 
 typedef struct {
   UINT16Revision;
   UINT16HeaderLength;
   UINT32Length; // Length include this header
@@ -40,41 +40,46 @@ typedef struct {
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 } VAR_CHECK_HII_QUESTION_HEADER;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 //UINTx   Data[]; // x = UINT8/UINT16/UINT32/UINT64;
 } VAR_CHECK_HII_QUESTION_ONEOF;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 } VAR_CHECK_HII_QUESTION_CHECKBOX;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
 //UINTx   Minimum; // x = UINT8/UINT16/UINT32/UINT64;
 //UINTx   Maximum; // x = UINT8/UINT16/UINT32/UINT64;
 } VAR_CHECK_HII_QUESTION_NUMERIC;
 
 typedef struct {
   UINT8 OpCode;
   UINT8 Length; // Length include this header
   UINT16VarOffset;
   UINT8 StorageWidth;
+  BOOLEAN   BitFieldStore; // Whether the Question is stored in bit 
field, if TRUE, the VarOffset/StorageWidth will be saved as bit level, 
otherwise in byte level.
   UINT8 MaxContainers;
 //UINTx   Data[]; // x = UINT8/UINT16/UINT32/UINT64;
 } VAR_CHECK_HII_QUESTION_ORDEREDLIST;
 
 #pragma pack ()
diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h 
b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHii.h
index a54b867..7363edf