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>

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
index a1b1131c1380f99669b135cb639815c00b87f224..a4bb19ad6034403d67a7d5e2c2776e2bbec5147e 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
@@ -26,8 +26,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     0x0d510a4f, 0xa81b, 0x473f, { 0x87, 0x07, 0xb7, 0xfd, 0xfb, 0xc0, 0x45, 0xba } \\r
   }\r
 \r
+#define OPAL_REQUEST_VARIABLE_NAME     L"OpalRequest"\r
+\r
 #pragma pack(1)\r
 \r
+typedef struct {\r
+  UINT32                   Length;\r
+  OPAL_REQUEST             OpalRequest;\r
+  //EFI_DEVICE_PATH_PROTOCOL OpalDevicePath;\r
+} OPAL_REQUEST_VARIABLE;\r
+\r
 typedef struct {\r
   UINT16 Id: HII_KEY_ID_BITS;\r
   UINT16 Index: HII_KEY_INDEX_BITS;\r

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
index 3ff7d4726d5e3d9684ea870389cdf6be0f302c8f..a2313fed290b76ee9a5ea71bb2c48abd3857d4c9 100644 (file)
--- 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\r
 #define FORMID_VALUE_DISK_INFO_FORM_MAIN                   0x02\r
 \r
-#define OPAL_REQUEST_VARIABLE_NAME                         L"OpalRequest"\r
-\r
 #pragma pack(1)\r
 typedef struct {\r
   UINT16    Lock:1;\r
@@ -48,12 +46,6 @@ typedef struct {
   UINT8           EnableBlockSid;\r
 } OPAL_HII_CONFIGURATION;\r
 \r
-typedef struct {\r
-  UINT32                   Length;\r
-  OPAL_REQUEST             OpalRequest;\r
-  //EFI_DEVICE_PATH_PROTOCOL OpalDevicePath;\r
-} OPAL_REQUEST_VARIABLE;\r
-\r
 #pragma pack()\r
 \r
 /* Action Flags */\r