SecurityPkg/OpalPassword: Remove HW init codes and consume SSC PPI

[mirror_edk2.git] / SecurityPkg / Tcg / Opal / OpalPassword / OpalPasswordCommon.h

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordCommon.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordCommon.h
index e10146e46619a8b5e1f388531e565c4055828e0e..f9fdb641373dde18faea740f813fb55fb15d034e 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordCommon.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalPasswordCommon.h
@@ -1,7 +1,7 @@
 /** @file\r
   Opal Password common header file.\r
 \r
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -30,38 +30,15 @@ typedef struct {
 } OPAL_PCI_DEVICE;\r
 \r
 typedef struct {\r
-  UINT16            Length;\r
-  OPAL_PCI_DEVICE   Device;\r
-  UINT8             PasswordLength;\r
-  UINT8             Password[OPAL_MAX_PASSWORD_SIZE];\r
-  UINT16            OpalBaseComId;\r
-  UINT32            BarAddr;\r
-} OPAL_DEVICE_COMMON;\r
-\r
-#define OPAL_DEVICE_ATA_GUID { 0xcb934fe1, 0xb8cd, 0x46b1, { 0xa0, 0x58, 0xdd, 0xcb, 0x7, 0xb7, 0xb4, 0x17 } }\r
-\r
-typedef struct {\r
-  UINT16            Length;\r
-  OPAL_PCI_DEVICE   Device;\r
-  UINT8             PasswordLength;\r
-  UINT8             Password[OPAL_MAX_PASSWORD_SIZE];\r
-  UINT16            OpalBaseComId;\r
-  UINT32            BarAddr;\r
-  UINT16            Port;\r
-  UINT16            PortMultiplierPort;\r
-} OPAL_DEVICE_ATA;\r
-\r
-#define OPAL_DEVICE_NVME_GUID { 0xde116925, 0xaf7f, 0x42d9, { 0x83, 0xc0, 0x7e, 0xd6, 0x26, 0x59, 0x0, 0xfb } }\r
-\r
-typedef struct {\r
-  UINT16            Length;\r
-  OPAL_PCI_DEVICE   Device;\r
-  UINT8             PasswordLength;\r
-  UINT8             Password[OPAL_MAX_PASSWORD_SIZE];\r
-  UINT16            OpalBaseComId;\r
-  UINT32            BarAddr;\r
-  UINT32            NvmeNamespaceId;\r
-  OPAL_PCI_DEVICE   PciBridgeNode[0];\r
-} OPAL_DEVICE_NVME;\r
+  UINT32                      Length;\r
+  OPAL_PCI_DEVICE             Device;\r
+  UINT8                       PasswordLength;\r
+  UINT8                       Password[OPAL_MAX_PASSWORD_SIZE];\r
+  UINT16                      OpalBaseComId;\r
+  UINT32                      DevicePathLength;\r
+  EFI_DEVICE_PATH_PROTOCOL    DevicePath[];\r
+} OPAL_DEVICE_LOCKBOX_DATA;\r
+\r
+#define OPAL_DEVICE_LOCKBOX_GUID  { 0x56a77f0d, 0x6f05, 0x4d47, { 0xb9, 0x11, 0x4f, 0xd, 0xec, 0x5c, 0x58, 0x61 } }\r
 \r
 #endif // _OPAL_PASSWORD_COMMON_H_\r