[PATCH] SecurityPkg OpalPasswordDxe: Move OPAL request variable definition

[PATCH] SecurityPkg OpalPasswordDxe: Move OPAL request variable definition

[Star Zeng]

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>
---
 SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h           | 11 +++++++++++
 SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h |  8 --------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
index a1b1131c1380..906106b3f5e8 100644
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
@@ -26,8 +26,19 @@ 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)
 
+//
+// Request for one device.
+//
+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;
diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
index 3ff7d4726d5e..a2313fed290b 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 */
-- 
2.7.0.windows.1

Re: [PATCH] SecurityPkg OpalPasswordDxe: Move OPAL request variable definition

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Star
> Zeng
> Sent: Tuesday, March 13, 2018 9:29 AM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Chao B <chao.b.zhang@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Dong, Eric <eric.dong@intel.com>; Zeng, Star
> <star.zeng@intel.com>
> Subject: [edk2] [PATCH] 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>
> ---
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h           | 11 +++++++++++
>  SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h |  8 --------
>  2 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> index a1b1131c1380..906106b3f5e8 100644
> --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHii.h
> @@ -26,8 +26,19 @@ 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)
> 
> +//
> +// Request for one device.
> +//
> +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;
> diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
> b/SecurityPkg/Tcg/Opal/OpalPassword/OpalHiiFormValues.h
> index 3ff7d4726d5e..a2313fed290b 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 */
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel