SecurityPkg: Fix spelling errors

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

diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
index 3cfa80051fa47cf3593edbf260557d691be8db5c..c19d78218ec9e83d9de14d2cc8a0bda9376f3b0c 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
+++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.h
@@ -1,14 +1,8 @@
 /** @file\r
   Values defined and used by the Opal UEFI Driver.\r
 \r
-Copyright (c) 2016 - 2018, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -28,6 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/StorageSecurityCommand.h>\r
 \r
 #include <Guid/EventGroup.h>\r
+#include <Guid/S3StorageDeviceInitList.h>\r
 \r
 #include <Library/UefiLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
@@ -42,7 +37,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/HiiLib.h>\r
 #include <Library/UefiHiiServicesLib.h>\r
 #include <Library/PciLib.h>\r
-#include <Library/S3BootScriptLib.h>\r
 #include <Library/LockBoxLib.h>\r
 #include <Library/TcgStorageOpalLib.h>\r
 #include <Library/Tcg2PhysicalPresenceLib.h>\r
@@ -67,7 +61,7 @@ extern EFI_DRIVER_BINDING_PROTOCOL   gOpalDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL   gOpalComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gOpalComponentName2;\r
 \r
-#define OPAL_MSID_LENGHT        128\r
+#define OPAL_MSID_LENGTH        128\r
 \r
 #define MAX_PASSWORD_TRY_COUNT  5\r
 \r
@@ -77,7 +71,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gOpalComponentName2;
 \r
 //\r
 // The max timeout value assume the user can wait for the revert action. The unit of this macro is second.\r
-// If the revert time value bigger than this one, driver needs to popup a dialog to let user confirm the \r
+// If the revert time value bigger than this one, driver needs to popup a dialog to let user confirm the\r
 // revert action.\r
 //\r
 #define MAX_ACCEPTABLE_REVERTING_TIME    10\r
@@ -137,7 +131,7 @@ typedef struct {
 //\r
 typedef struct {\r
   UINT32                                          MsidLength;             // Byte length of MSID Pin for device\r
-  UINT8                                           Msid[OPAL_MSID_LENGHT]; // MSID Pin for device\r
+  UINT8                                           Msid[OPAL_MSID_LENGTH]; // MSID Pin for device\r
   EFI_STORAGE_SECURITY_COMMAND_PROTOCOL           *Sscp;\r
   UINT32                                          MediaId;                // MediaId is used by Ssc Protocol.\r
   EFI_DEVICE_PATH_PROTOCOL                        *OpalDevicePath;\r
@@ -149,6 +143,7 @@ typedef struct {
   UINT8                                           Password[OPAL_MAX_PASSWORD_SIZE];\r
 \r
   UINT32                                          EstimateTimeCost;\r
+  BOOLEAN                                         SentBlockSID;           // Check whether BlockSid command has been sent.\r
 } OPAL_DISK;\r
 \r
 //\r
@@ -258,7 +253,7 @@ OpalSupportGetAvailableActions(
   @param[in]      Msid               Msid\r
   @param[in]      MsidLength         Msid Length\r
   @param[in]      Password           Admin password\r
-  @param[in]      PassLength         Length of password in bytes \r
+  @param[in]      PassLength         Length of password in bytes\r
 \r
 **/\r
 TCG_RESULT\r
@@ -314,7 +309,7 @@ OpalEfiDriverBindingSupported(
   "controller", which is a child handle, contains the EF_STORAGE_SECURITY_COMMAND protocols.\r
   This function will complete the other necessary checks, such as verifying the device supports\r
   the correct version of Opal.  Upon verification, it will add the device to the\r
-  Opal HII list in order to expose Opal managmeent options.\r
+  Opal HII list in order to expose Opal management options.\r
 \r
   @param[in]  This                  A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.\r
   @param[in]  ControllerHandle      The handle of the controller to start. This handle\r