diff options
| author | Star Zeng <star.zeng@intel.com> | 2018-03-13 09:23:38 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2018-03-17 15:51:20 +0800 |
| commit | f4d825eb43ea107b46ee50c8bba590977dd93860 (patch) | |
| tree | 8e282f2f0a7f5a1095d1b0d964bc2001bffd6042 | |
| parent | 8f75e458a09ddcfef47079ffaf72876944cd512b (diff) | |
| download | edk2-f4d825eb43ea107b46ee50c8bba590977dd93860.tar.gz | |
SecurityPkg OpalPasswordDxe: Move OPAL request variable definition
Move OPAL request variable definition from OpalHiiFormValues.h to
OpalHii.h.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
(cherry picked from commit 849c684b860dcfd4a4e3992ed95dc0fb1c2b406f)
| -rw-r--r-- | SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h | 8 | ||||
| -rw-r--r-- | SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h index a1b1131c13..a4bb19ad60 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h @@ -26,9 +26,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x0d510a4f, 0xa81b, 0x473f, { 0x87, 0x07, 0xb7, 0xfd, 0xfb, 0xc0, 0x45, 0xba } \
}
+#define OPAL_REQUEST_VARIABLE_NAME L"OpalRequest"
+
#pragma pack(1)
typedef struct {
+ UINT32 Length;
+ OPAL_REQUEST OpalRequest;
+ //EFI_DEVICE_PATH_PROTOCOL OpalDevicePath;
+} OPAL_REQUEST_VARIABLE;
+
+typedef struct {
UINT16 Id: HII_KEY_ID_BITS;
UINT16 Index: HII_KEY_INDEX_BITS;
UINT16 Flag: HII_KEY_FLAG_BITS;
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h index 3ff7d4726d..a2313fed29 100644 --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h @@ -20,8 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define FORMID_VALUE_MAIN_MENU 0x01
#define FORMID_VALUE_DISK_INFO_FORM_MAIN 0x02
-#define OPAL_REQUEST_VARIABLE_NAME L"OpalRequest"
-
#pragma pack(1)
typedef struct {
UINT16 Lock:1;
@@ -48,12 +46,6 @@ typedef struct { UINT8 EnableBlockSid;
} OPAL_HII_CONFIGURATION;
-typedef struct {
- UINT32 Length;
- OPAL_REQUEST OpalRequest;
- //EFI_DEVICE_PATH_PROTOCOL OpalDevicePath;
-} OPAL_REQUEST_VARIABLE;
-
#pragma pack()
/* Action Flags */
|