]> git.proxmox.com Git - mirror_edk2.git/blobdiff - SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c
SecurityPkg: Apply uncrustify changes
[mirror_edk2.git] / SecurityPkg / Tcg / Opal / OpalPassword / OpalDriver.c
index b5b6aec98cafd4b101bacda13479698430e54a8a..f127757ad9f0422d6f8996621a6a128980af4475 100644 (file)
@@ -15,19 +15,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "OpalDriver.h"\r
 #include "OpalHii.h"\r
 \r
-EFI_GUID mOpalDeviceLockBoxGuid = OPAL_DEVICE_LOCKBOX_GUID;\r
+EFI_GUID  mOpalDeviceLockBoxGuid = OPAL_DEVICE_LOCKBOX_GUID;\r
 \r
-BOOLEAN                 mOpalEndOfDxe = FALSE;\r
-OPAL_REQUEST_VARIABLE   *mOpalRequestVariable = NULL;\r
-UINTN                   mOpalRequestVariableSize = 0;\r
-CHAR16                  mPopUpString[100];\r
+BOOLEAN                mOpalEndOfDxe            = FALSE;\r
+OPAL_REQUEST_VARIABLE  *mOpalRequestVariable    = NULL;\r
+UINTN                  mOpalRequestVariableSize = 0;\r
+CHAR16                 mPopUpString[100];\r
 \r
-OPAL_DRIVER mOpalDriver;\r
+OPAL_DRIVER  mOpalDriver;\r
 \r
 //\r
 // Globals\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gOpalDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gOpalDriverBinding = {\r
   OpalEfiDriverBindingSupported,\r
   OpalEfiDriverBindingStart,\r
   OpalEfiDriverBindingStop,\r
@@ -48,21 +48,21 @@ EFI_DRIVER_BINDING_PROTOCOL gOpalDriverBinding = {
 **/\r
 TCG_RESULT\r
 EFIAPI\r
-OpalSupportGetAvailableActions(\r
-  IN  OPAL_DISK_SUPPORT_ATTRIBUTE      *SupportedAttributes,\r
-  IN  TCG_LOCKING_FEATURE_DESCRIPTOR   *LockingFeature,\r
-  IN  UINT16                           OwnerShip,\r
-  OUT OPAL_DISK_ACTIONS                *AvalDiskActions\r
+OpalSupportGetAvailableActions (\r
+  IN  OPAL_DISK_SUPPORT_ATTRIBUTE     *SupportedAttributes,\r
+  IN  TCG_LOCKING_FEATURE_DESCRIPTOR  *LockingFeature,\r
+  IN  UINT16                          OwnerShip,\r
+  OUT OPAL_DISK_ACTIONS               *AvalDiskActions\r
   )\r
 {\r
-  BOOLEAN ExistingPassword;\r
+  BOOLEAN  ExistingPassword;\r
 \r
-  NULL_CHECK(AvalDiskActions);\r
+  NULL_CHECK (AvalDiskActions);\r
 \r
-  AvalDiskActions->AdminPass = 1;\r
-  AvalDiskActions->UserPass = 0;\r
+  AvalDiskActions->AdminPass   = 1;\r
+  AvalDiskActions->UserPass    = 0;\r
   AvalDiskActions->DisableUser = 0;\r
-  AvalDiskActions->Unlock = 0;\r
+  AvalDiskActions->Unlock      = 0;\r
 \r
   //\r
   // Revert is performed on locking sp, so only allow if locking sp is enabled\r
@@ -75,13 +75,12 @@ OpalSupportGetAvailableActions(
   // Psid revert is available for any device with media encryption support or pyrite 2.0 type support.\r
   //\r
   if (SupportedAttributes->PyriteSscV2 || SupportedAttributes->MediaEncryption) {\r
-\r
     //\r
     // Only allow psid revert if media encryption is enabled or pyrite 2.0 type support..\r
     // Otherwise, someone who steals a disk can psid revert the disk and the user Data is still\r
     // intact and accessible\r
     //\r
-    AvalDiskActions->PsidRevert = 1;\r
+    AvalDiskActions->PsidRevert           = 1;\r
     AvalDiskActions->RevertKeepDataForced = 0;\r
 \r
     //\r
@@ -90,7 +89,7 @@ OpalSupportGetAvailableActions(
     //\r
     AvalDiskActions->SecureErase = 1;\r
   } else {\r
-    AvalDiskActions->PsidRevert = 0;\r
+    AvalDiskActions->PsidRevert  = 0;\r
     AvalDiskActions->SecureErase = 0;\r
 \r
     //\r
@@ -109,7 +108,7 @@ OpalSupportGetAvailableActions(
   //\r
   // Only allow user to set password if an admin password exists\r
   //\r
-  ExistingPassword = OpalUtilAdminPasswordExists(OwnerShip, LockingFeature);\r
+  ExistingPassword          = OpalUtilAdminPasswordExists (OwnerShip, LockingFeature);\r
   AvalDiskActions->UserPass = ExistingPassword;\r
 \r
   //\r
@@ -133,42 +132,42 @@ OpalSupportGetAvailableActions(
 TCG_RESULT\r
 EFIAPI\r
 OpalSupportEnableOpalFeature (\r
-  IN OPAL_SESSION              *Session,\r
-  IN VOID                      *Msid,\r
-  IN UINT32                    MsidLength,\r
-  IN VOID                      *Password,\r
-  IN UINT32                    PassLength\r
+  IN OPAL_SESSION  *Session,\r
+  IN VOID          *Msid,\r
+  IN UINT32        MsidLength,\r
+  IN VOID          *Password,\r
+  IN UINT32        PassLength\r
   )\r
 {\r
-  TCG_RESULT   Ret;\r
-\r
-  NULL_CHECK(Session);\r
-  NULL_CHECK(Msid);\r
-  NULL_CHECK(Password);\r
-\r
-  Ret = OpalUtilSetAdminPasswordAsSid(\r
-                          Session,\r
-                          Msid,\r
-                          MsidLength,\r
-                          Password,\r
-                          PassLength\r
-                          );\r
+  TCG_RESULT  Ret;\r
+\r
+  NULL_CHECK (Session);\r
+  NULL_CHECK (Msid);\r
+  NULL_CHECK (Password);\r
+\r
+  Ret = OpalUtilSetAdminPasswordAsSid (\r
+          Session,\r
+          Msid,\r
+          MsidLength,\r
+          Password,\r
+          PassLength\r
+          );\r
   if (Ret == TcgResultSuccess) {\r
     //\r
     // Enable global locking range\r
     //\r
-    Ret = OpalUtilSetOpalLockingRange(\r
-                              Session,\r
-                              Password,\r
-                              PassLength,\r
-                              OPAL_LOCKING_SP_LOCKING_GLOBALRANGE,\r
-                              0,\r
-                              0,\r
-                              TRUE,\r
-                              TRUE,\r
-                              FALSE,\r
-                              FALSE\r
-                              );\r
+    Ret = OpalUtilSetOpalLockingRange (\r
+            Session,\r
+            Password,\r
+            PassLength,\r
+            OPAL_LOCKING_SP_LOCKING_GLOBALRANGE,\r
+            0,\r
+            0,\r
+            TRUE,\r
+            TRUE,\r
+            FALSE,\r
+            FALSE\r
+            );\r
   }\r
 \r
   return Ret;\r
@@ -184,13 +183,13 @@ OpalSupportEnableOpalFeature (
 **/\r
 VOID\r
 OpalSupportUpdatePassword (\r
-  IN OUT OPAL_DISK      *OpalDisk,\r
-  IN VOID               *Password,\r
-  IN UINT32             PasswordLength\r
+  IN OUT OPAL_DISK  *OpalDisk,\r
+  IN VOID           *Password,\r
+  IN UINT32         PasswordLength\r
   )\r
 {\r
   CopyMem (OpalDisk->Password, Password, PasswordLength);\r
-  OpalDisk->PasswordLength = (UINT8) PasswordLength;\r
+  OpalDisk->PasswordLength = (UINT8)PasswordLength;\r
 }\r
 \r
 /**\r
@@ -208,17 +207,17 @@ ExtractDeviceInfoFromDevicePath (
   OUT OPAL_DEVICE_LOCKBOX_DATA  *DevInfo OPTIONAL\r
   )\r
 {\r
-  EFI_DEVICE_PATH_PROTOCOL      *TmpDevPath;\r
-  EFI_DEVICE_PATH_PROTOCOL      *TmpDevPath2;\r
-  PCI_DEVICE_PATH               *PciDevPath;\r
-  UINT8                         DeviceType;\r
-  UINT8                         BusNum;\r
-  OPAL_PCI_DEVICE               *PciDevice;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpDevPath;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpDevPath2;\r
+  PCI_DEVICE_PATH           *PciDevPath;\r
+  UINT8                     DeviceType;\r
+  UINT8                     BusNum;\r
+  OPAL_PCI_DEVICE           *PciDevice;\r
 \r
   ASSERT (DevicePath != NULL);\r
   ASSERT (DevInfoLength != NULL);\r
 \r
-  DeviceType = OPAL_DEVICE_TYPE_UNKNOWN;\r
+  DeviceType     = OPAL_DEVICE_TYPE_UNKNOWN;\r
   *DevInfoLength = 0;\r
 \r
   TmpDevPath = DevicePath;\r
@@ -228,39 +227,42 @@ ExtractDeviceInfoFromDevicePath (
   //\r
   while (!IsDevicePathEnd (TmpDevPath)) {\r
     if ((TmpDevPath->Type == MESSAGING_DEVICE_PATH) &&\r
-        (TmpDevPath->SubType == MSG_SATA_DP || TmpDevPath->SubType == MSG_NVME_NAMESPACE_DP)) {\r
+        ((TmpDevPath->SubType == MSG_SATA_DP) || (TmpDevPath->SubType == MSG_NVME_NAMESPACE_DP)))\r
+    {\r
       if (DevInfo != NULL) {\r
-        DevInfo->DevicePathLength = (UINT32) GetDevicePathSize (DevicePath);\r
+        DevInfo->DevicePathLength = (UINT32)GetDevicePathSize (DevicePath);\r
         CopyMem (DevInfo->DevicePath, DevicePath, DevInfo->DevicePathLength);\r
       }\r
 \r
-      DeviceType = (TmpDevPath->SubType == MSG_SATA_DP) ? OPAL_DEVICE_TYPE_ATA : OPAL_DEVICE_TYPE_NVME;\r
-      *DevInfoLength = sizeof (OPAL_DEVICE_LOCKBOX_DATA) + (UINT32) GetDevicePathSize (DevicePath);\r
+      DeviceType     = (TmpDevPath->SubType == MSG_SATA_DP) ? OPAL_DEVICE_TYPE_ATA : OPAL_DEVICE_TYPE_NVME;\r
+      *DevInfoLength = sizeof (OPAL_DEVICE_LOCKBOX_DATA) + (UINT32)GetDevicePathSize (DevicePath);\r
       break;\r
     }\r
+\r
     TmpDevPath = NextDevicePathNode (TmpDevPath);\r
   }\r
 \r
   //\r
   // Get device info.\r
   //\r
-  BusNum = 0;\r
-  TmpDevPath = DevicePath;\r
+  BusNum      = 0;\r
+  TmpDevPath  = DevicePath;\r
   TmpDevPath2 = NextDevicePathNode (DevicePath);\r
   while (!IsDevicePathEnd (TmpDevPath2)) {\r
-    if (TmpDevPath->Type == HARDWARE_DEVICE_PATH && TmpDevPath->SubType == HW_PCI_DP) {\r
-      PciDevPath = (PCI_DEVICE_PATH *) TmpDevPath;\r
+    if ((TmpDevPath->Type == HARDWARE_DEVICE_PATH) && (TmpDevPath->SubType == HW_PCI_DP)) {\r
+      PciDevPath = (PCI_DEVICE_PATH *)TmpDevPath;\r
       if ((TmpDevPath2->Type == MESSAGING_DEVICE_PATH) &&\r
-          (TmpDevPath2->SubType == MSG_SATA_DP || TmpDevPath2->SubType == MSG_NVME_NAMESPACE_DP)) {\r
+          ((TmpDevPath2->SubType == MSG_SATA_DP) || (TmpDevPath2->SubType == MSG_NVME_NAMESPACE_DP)))\r
+      {\r
         if (DevInfo != NULL) {\r
-          PciDevice = &DevInfo->Device;\r
-          PciDevice->Segment = 0;\r
-          PciDevice->Bus = BusNum;\r
-          PciDevice->Device = PciDevPath->Device;\r
+          PciDevice           = &DevInfo->Device;\r
+          PciDevice->Segment  = 0;\r
+          PciDevice->Bus      = BusNum;\r
+          PciDevice->Device   = PciDevPath->Device;\r
           PciDevice->Function = PciDevPath->Function;\r
         }\r
       } else {\r
-        if (TmpDevPath2->Type == HARDWARE_DEVICE_PATH && TmpDevPath2->SubType == HW_PCI_DP) {\r
+        if ((TmpDevPath2->Type == HARDWARE_DEVICE_PATH) && (TmpDevPath2->SubType == HW_PCI_DP)) {\r
           BusNum = PciRead8 (PCI_LIB_ADDRESS (BusNum, PciDevPath->Device, PciDevPath->Function, PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET));\r
         }\r
       }\r
@@ -283,23 +285,23 @@ BuildOpalDeviceInfo (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  OPAL_DEVICE_LOCKBOX_DATA    *DevInfo;\r
-  OPAL_DEVICE_LOCKBOX_DATA    *TempDevInfo;\r
-  UINTN                       TotalDevInfoLength;\r
-  UINT32                      DevInfoLength;\r
-  OPAL_DRIVER_DEVICE          *TmpDev;\r
-  UINT8                       DummyData;\r
-  BOOLEAN                     S3InitDevicesExist;\r
-  UINTN                       S3InitDevicesLength;\r
-  EFI_DEVICE_PATH_PROTOCOL    *S3InitDevices;\r
-  EFI_DEVICE_PATH_PROTOCOL    *S3InitDevicesBak;\r
+  EFI_STATUS                Status;\r
+  OPAL_DEVICE_LOCKBOX_DATA  *DevInfo;\r
+  OPAL_DEVICE_LOCKBOX_DATA  *TempDevInfo;\r
+  UINTN                     TotalDevInfoLength;\r
+  UINT32                    DevInfoLength;\r
+  OPAL_DRIVER_DEVICE        *TmpDev;\r
+  UINT8                     DummyData;\r
+  BOOLEAN                   S3InitDevicesExist;\r
+  UINTN                     S3InitDevicesLength;\r
+  EFI_DEVICE_PATH_PROTOCOL  *S3InitDevices;\r
+  EFI_DEVICE_PATH_PROTOCOL  *S3InitDevicesBak;\r
 \r
   //\r
   // Build OPAL device info and save them to LockBox.\r
   //\r
   TotalDevInfoLength = 0;\r
-  TmpDev = mOpalDriver.DeviceList;\r
+  TmpDev             = mOpalDriver.DeviceList;\r
   while (TmpDev != NULL) {\r
     ExtractDeviceInfoFromDevicePath (\r
       TmpDev->OpalDisk.OpalDevicePath,\r
@@ -307,7 +309,7 @@ BuildOpalDeviceInfo (
       NULL\r
       );\r
     TotalDevInfoLength += DevInfoLength;\r
-    TmpDev = TmpDev->Next;\r
+    TmpDev              = TmpDev->Next;\r
   }\r
 \r
   if (TotalDevInfoLength == 0) {\r
@@ -315,11 +317,11 @@ BuildOpalDeviceInfo (
   }\r
 \r
   S3InitDevicesLength = sizeof (DummyData);\r
-  Status = RestoreLockBox (\r
-             &gS3StorageDeviceInitListGuid,\r
-             &DummyData,\r
-             &S3InitDevicesLength\r
-             );\r
+  Status              = RestoreLockBox (\r
+                          &gS3StorageDeviceInitListGuid,\r
+                          &DummyData,\r
+                          &S3InitDevicesLength\r
+                          );\r
   ASSERT ((Status == EFI_NOT_FOUND) || (Status == EFI_BUFFER_TOO_SMALL));\r
   if (Status == EFI_NOT_FOUND) {\r
     S3InitDevices      = NULL;\r
@@ -356,7 +358,7 @@ BuildOpalDeviceInfo (
       &DevInfoLength,\r
       TempDevInfo\r
       );\r
-    TempDevInfo->Length = DevInfoLength;\r
+    TempDevInfo->Length        = DevInfoLength;\r
     TempDevInfo->OpalBaseComId = TmpDev->OpalDisk.OpalBaseComId;\r
     CopyMem (\r
       TempDevInfo->Password,\r
@@ -373,13 +375,14 @@ BuildOpalDeviceInfo (
     if (S3InitDevicesBak != NULL) {\r
       FreePool (S3InitDevicesBak);\r
     }\r
+\r
     ASSERT (S3InitDevices != NULL);\r
     if (S3InitDevices == NULL) {\r
       return;\r
     }\r
 \r
-    TempDevInfo = (OPAL_DEVICE_LOCKBOX_DATA *) ((UINTN) TempDevInfo + DevInfoLength);\r
-    TmpDev = TmpDev->Next;\r
+    TempDevInfo = (OPAL_DEVICE_LOCKBOX_DATA *)((UINTN)TempDevInfo + DevInfoLength);\r
+    TmpDev      = TmpDev->Next;\r
   }\r
 \r
   Status = SaveLockBox (\r
@@ -434,10 +437,10 @@ SendBlockSidCommand (
   VOID\r
   )\r
 {\r
-  OPAL_DRIVER_DEVICE                         *Itr;\r
-  TCG_RESULT                                 Result;\r
-  OPAL_SESSION                               Session;\r
-  UINT32                                     PpStorageFlag;\r
+  OPAL_DRIVER_DEVICE  *Itr;\r
+  TCG_RESULT          Result;\r
+  OPAL_SESSION        Session;\r
+  UINT32              PpStorageFlag;\r
 \r
   PpStorageFlag = Tcg2PhysicalPresenceLibGetManagementFlags ();\r
   if ((PpStorageFlag & TCG2_BIOS_STORAGE_MANAGEMENT_FLAG_ENABLE_BLOCK_SID) != 0) {\r
@@ -447,9 +450,9 @@ SendBlockSidCommand (
     Itr = mOpalDriver.DeviceList;\r
     while (Itr != NULL) {\r
       if (Itr->OpalDisk.SupportedAttributes.BlockSid) {\r
-        ZeroMem(&Session, sizeof(Session));\r
-        Session.Sscp = Itr->OpalDisk.Sscp;\r
-        Session.MediaId = Itr->OpalDisk.MediaId;\r
+        ZeroMem (&Session, sizeof (Session));\r
+        Session.Sscp          = Itr->OpalDisk.Sscp;\r
+        Session.MediaId       = Itr->OpalDisk.MediaId;\r
         Session.OpalBaseComId = Itr->OpalDisk.OpalBaseComId;\r
 \r
         DEBUG ((DEBUG_INFO, "OpalPassword: EndOfDxe point, send BlockSid command to device!\n"));\r
@@ -482,11 +485,11 @@ SendBlockSidCommand (
 VOID\r
 EFIAPI\r
 OpalEndOfDxeEventNotify (\r
-  EFI_EVENT                               Event,\r
-  VOID                                    *Context\r
+  EFI_EVENT  Event,\r
+  VOID       *Context\r
   )\r
 {\r
-  OPAL_DRIVER_DEVICE    *TmpDev;\r
+  OPAL_DRIVER_DEVICE  *TmpDev;\r
 \r
   DEBUG ((DEBUG_INFO, "%a() - enter\n", __FUNCTION__));\r
 \r
@@ -498,7 +501,7 @@ OpalEndOfDxeEventNotify (
     // as the OPAL requests should have been processed.\r
     //\r
     FreePool (mOpalRequestVariable);\r
-    mOpalRequestVariable = NULL;\r
+    mOpalRequestVariable     = NULL;\r
     mOpalRequestVariableSize = 0;\r
   }\r
 \r
@@ -547,25 +550,25 @@ OpalEndOfDxeEventNotify (
 **/\r
 CHAR8 *\r
 OpalDriverPopUpPsidInput (\r
-  IN OPAL_DRIVER_DEVICE     *Dev,\r
-  IN CHAR16                 *PopUpString,\r
-  IN CHAR16                 *PopUpString2,\r
-  IN CHAR16                 *PopUpString3,\r
-  OUT BOOLEAN               *PressEsc\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *PopUpString,\r
+  IN CHAR16              *PopUpString2,\r
+  IN CHAR16              *PopUpString3,\r
+  OUT BOOLEAN            *PressEsc\r
   )\r
 {\r
-  EFI_INPUT_KEY             InputKey;\r
-  UINTN                     InputLength;\r
-  CHAR16                    Mask[PSID_CHARACTER_LENGTH + 1];\r
-  CHAR16                    Unicode[PSID_CHARACTER_LENGTH + 1];\r
-  CHAR8                     *Ascii;\r
+  EFI_INPUT_KEY  InputKey;\r
+  UINTN          InputLength;\r
+  CHAR16         Mask[PSID_CHARACTER_LENGTH + 1];\r
+  CHAR16         Unicode[PSID_CHARACTER_LENGTH + 1];\r
+  CHAR8          *Ascii;\r
 \r
-  ZeroMem(Unicode, sizeof(Unicode));\r
-  ZeroMem(Mask, sizeof(Mask));\r
+  ZeroMem (Unicode, sizeof (Unicode));\r
+  ZeroMem (Mask, sizeof (Mask));\r
 \r
   *PressEsc = FALSE;\r
 \r
-  gST->ConOut->ClearScreen(gST->ConOut);\r
+  gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
   InputLength = 0;\r
   while (TRUE) {\r
@@ -578,7 +581,7 @@ OpalDriverPopUpPsidInput (
         L"---------------------",\r
         Mask,\r
         NULL\r
-      );\r
+        );\r
     } else {\r
       if (PopUpString3 == NULL) {\r
         CreatePopUp (\r
@@ -589,7 +592,7 @@ OpalDriverPopUpPsidInput (
           L"---------------------",\r
           Mask,\r
           NULL\r
-        );\r
+          );\r
       } else {\r
         CreatePopUp (\r
           EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
@@ -600,7 +603,7 @@ OpalDriverPopUpPsidInput (
           L"---------------------",\r
           Mask,\r
           NULL\r
-        );\r
+          );\r
       }\r
     }\r
 \r
@@ -616,12 +619,13 @@ OpalDriverPopUpPsidInput (
         // Add the null terminator.\r
         //\r
         Unicode[InputLength] = 0;\r
-        Mask[InputLength] = 0;\r
+        Mask[InputLength]    = 0;\r
         break;\r
       } else if ((InputKey.UnicodeChar == CHAR_NULL) ||\r
                  (InputKey.UnicodeChar == CHAR_TAB) ||\r
                  (InputKey.UnicodeChar == CHAR_LINEFEED)\r
-                ) {\r
+                 )\r
+      {\r
         continue;\r
       } else {\r
         //\r
@@ -630,7 +634,7 @@ OpalDriverPopUpPsidInput (
         if (InputKey.UnicodeChar == CHAR_BACKSPACE) {\r
           if (InputLength > 0) {\r
             Unicode[InputLength] = 0;\r
-            Mask[InputLength] = 0;\r
+            Mask[InputLength]    = 0;\r
             InputLength--;\r
           }\r
         } else {\r
@@ -638,14 +642,14 @@ OpalDriverPopUpPsidInput (
           // add Next key entry\r
           //\r
           Unicode[InputLength] = InputKey.UnicodeChar;\r
-          Mask[InputLength] = InputKey.UnicodeChar;\r
+          Mask[InputLength]    = InputKey.UnicodeChar;\r
           InputLength++;\r
           if (InputLength == PSID_CHARACTER_LENGTH) {\r
             //\r
             // Add the null terminator.\r
             //\r
             Unicode[InputLength] = 0;\r
-            Mask[InputLength] = 0;\r
+            Mask[InputLength]    = 0;\r
             break;\r
           }\r
         }\r
@@ -661,9 +665,9 @@ OpalDriverPopUpPsidInput (
     }\r
   }\r
 \r
-  gST->ConOut->ClearScreen(gST->ConOut);\r
+  gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
-  if (InputLength == 0 || InputKey.ScanCode == SCAN_ESC) {\r
+  if ((InputLength == 0) || (InputKey.ScanCode == SCAN_ESC)) {\r
     ZeroMem (Unicode, sizeof (Unicode));\r
     ZeroMem (Mask, sizeof (Mask));\r
     return NULL;\r
@@ -683,7 +687,6 @@ OpalDriverPopUpPsidInput (
   return Ascii;\r
 }\r
 \r
-\r
 /**\r
   Get password input from the popup window.\r
 \r
@@ -699,25 +702,25 @@ OpalDriverPopUpPsidInput (
 **/\r
 CHAR8 *\r
 OpalDriverPopUpPasswordInput (\r
-  IN OPAL_DRIVER_DEVICE     *Dev,\r
-  IN CHAR16                 *PopUpString1,\r
-  IN CHAR16                 *PopUpString2,\r
-  IN CHAR16                 *PopUpString3,\r
-  OUT BOOLEAN               *PressEsc\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *PopUpString1,\r
+  IN CHAR16              *PopUpString2,\r
+  IN CHAR16              *PopUpString3,\r
+  OUT BOOLEAN            *PressEsc\r
   )\r
 {\r
-  EFI_INPUT_KEY             InputKey;\r
-  UINTN                     InputLength;\r
-  CHAR16                    Mask[OPAL_MAX_PASSWORD_SIZE + 1];\r
-  CHAR16                    Unicode[OPAL_MAX_PASSWORD_SIZE + 1];\r
-  CHAR8                     *Ascii;\r
+  EFI_INPUT_KEY  InputKey;\r
+  UINTN          InputLength;\r
+  CHAR16         Mask[OPAL_MAX_PASSWORD_SIZE + 1];\r
+  CHAR16         Unicode[OPAL_MAX_PASSWORD_SIZE + 1];\r
+  CHAR8          *Ascii;\r
 \r
-  ZeroMem(Unicode, sizeof(Unicode));\r
-  ZeroMem(Mask, sizeof(Mask));\r
+  ZeroMem (Unicode, sizeof (Unicode));\r
+  ZeroMem (Mask, sizeof (Mask));\r
 \r
   *PressEsc = FALSE;\r
 \r
-  gST->ConOut->ClearScreen(gST->ConOut);\r
+  gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
   InputLength = 0;\r
   while (TRUE) {\r
@@ -730,7 +733,7 @@ OpalDriverPopUpPasswordInput (
         L"---------------------",\r
         Mask,\r
         NULL\r
-      );\r
+        );\r
     } else {\r
       if (PopUpString3 == NULL) {\r
         CreatePopUp (\r
@@ -741,7 +744,7 @@ OpalDriverPopUpPasswordInput (
           L"---------------------",\r
           Mask,\r
           NULL\r
-        );\r
+          );\r
       } else {\r
         CreatePopUp (\r
           EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
@@ -752,7 +755,7 @@ OpalDriverPopUpPasswordInput (
           L"---------------------",\r
           Mask,\r
           NULL\r
-        );\r
+          );\r
       }\r
     }\r
 \r
@@ -768,12 +771,13 @@ OpalDriverPopUpPasswordInput (
         // Add the null terminator.\r
         //\r
         Unicode[InputLength] = 0;\r
-        Mask[InputLength] = 0;\r
+        Mask[InputLength]    = 0;\r
         break;\r
       } else if ((InputKey.UnicodeChar == CHAR_NULL) ||\r
                  (InputKey.UnicodeChar == CHAR_TAB) ||\r
                  (InputKey.UnicodeChar == CHAR_LINEFEED)\r
-                ) {\r
+                 )\r
+      {\r
         continue;\r
       } else {\r
         //\r
@@ -782,7 +786,7 @@ OpalDriverPopUpPasswordInput (
         if (InputKey.UnicodeChar == CHAR_BACKSPACE) {\r
           if (InputLength > 0) {\r
             Unicode[InputLength] = 0;\r
-            Mask[InputLength] = 0;\r
+            Mask[InputLength]    = 0;\r
             InputLength--;\r
           }\r
         } else {\r
@@ -790,14 +794,14 @@ OpalDriverPopUpPasswordInput (
           // add Next key entry\r
           //\r
           Unicode[InputLength] = InputKey.UnicodeChar;\r
-          Mask[InputLength] = L'*';\r
+          Mask[InputLength]    = L'*';\r
           InputLength++;\r
           if (InputLength == OPAL_MAX_PASSWORD_SIZE) {\r
             //\r
             // Add the null terminator.\r
             //\r
             Unicode[InputLength] = 0;\r
-            Mask[InputLength] = 0;\r
+            Mask[InputLength]    = 0;\r
             break;\r
           }\r
         }\r
@@ -813,9 +817,9 @@ OpalDriverPopUpPasswordInput (
     }\r
   }\r
 \r
-  gST->ConOut->ClearScreen(gST->ConOut);\r
+  gST->ConOut->ClearScreen (gST->ConOut);\r
 \r
-  if (InputLength == 0 || InputKey.ScanCode == SCAN_ESC) {\r
+  if ((InputLength == 0) || (InputKey.ScanCode == SCAN_ESC)) {\r
     ZeroMem (Unicode, sizeof (Unicode));\r
     return NULL;\r
   }\r
@@ -843,8 +847,8 @@ OpalDriverPopUpPasswordInput (
 **/\r
 CHAR16 *\r
 OpalGetPopUpString (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
   if (Dev->Name16 == NULL) {\r
@@ -865,20 +869,20 @@ OpalGetPopUpString (
 **/\r
 VOID\r
 OpalDriverRequestPassword (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  BOOLEAN               IsEnabled;\r
-  BOOLEAN               IsLocked;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  CHAR16                *PopUpString;\r
+  UINT8          Count;\r
+  BOOLEAN        IsEnabled;\r
+  BOOLEAN        IsLocked;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  CHAR16         *PopUpString;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -892,9 +896,9 @@ OpalDriverRequestPassword (
 \r
   IsEnabled = OpalFeatureEnabled (&Dev->OpalDisk.SupportedAttributes, &Dev->OpalDisk.LockingFeature);\r
   if (IsEnabled) {\r
-    ZeroMem(&Session, sizeof(Session));\r
-    Session.Sscp = Dev->OpalDisk.Sscp;\r
-    Session.MediaId = Dev->OpalDisk.MediaId;\r
+    ZeroMem (&Session, sizeof (Session));\r
+    Session.Sscp          = Dev->OpalDisk.Sscp;\r
+    Session.MediaId       = Dev->OpalDisk.MediaId;\r
     Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
     IsLocked = OpalDeviceLocked (&Dev->OpalDisk.SupportedAttributes, &Dev->OpalDisk.LockingFeature);\r
@@ -935,7 +939,7 @@ OpalDriverRequestPassword (
           } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
           if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-            gST->ConOut->ClearScreen(gST->ConOut);\r
+            gST->ConOut->ClearScreen (gST->ConOut);\r
             //\r
             // Keep lock and continue boot.\r
             //\r
@@ -973,17 +977,18 @@ OpalDriverRequestPassword (
       }\r
 \r
       if (Password == NULL) {\r
-        Count ++;\r
+        Count++;\r
         continue;\r
       }\r
-      PasswordLen = (UINT32) AsciiStrLen(Password);\r
+\r
+      PasswordLen = (UINT32)AsciiStrLen (Password);\r
 \r
       if (IsLocked) {\r
-        Ret = OpalUtilUpdateGlobalLockingRange(&Session, Password, PasswordLen, FALSE, FALSE);\r
+        Ret = OpalUtilUpdateGlobalLockingRange (&Session, Password, PasswordLen, FALSE, FALSE);\r
       } else {\r
-        Ret = OpalUtilUpdateGlobalLockingRange(&Session, Password, PasswordLen, TRUE, TRUE);\r
+        Ret = OpalUtilUpdateGlobalLockingRange (&Session, Password, PasswordLen, TRUE, TRUE);\r
         if (Ret == TcgResultSuccess) {\r
-          Ret = OpalUtilUpdateGlobalLockingRange(&Session, Password, PasswordLen, FALSE, FALSE);\r
+          Ret = OpalUtilUpdateGlobalLockingRange (&Session, Password, PasswordLen, FALSE, FALSE);\r
         }\r
       }\r
 \r
@@ -1050,20 +1055,20 @@ OpalDriverRequestPassword (
 **/\r
 VOID\r
 ProcessOpalRequestEnableFeature (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  CHAR8                 *PasswordConfirm;\r
-  UINT32                PasswordLenConfirm;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  CHAR16                *PopUpString;\r
+  UINT8          Count;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  CHAR8          *PasswordConfirm;\r
+  UINT32         PasswordLenConfirm;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  CHAR16         *PopUpString;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1075,51 +1080,54 @@ ProcessOpalRequestEnableFeature (
 \r
   Count = 0;\r
 \r
-  ZeroMem(&Session, sizeof(Session));\r
-  Session.Sscp = Dev->OpalDisk.Sscp;\r
-  Session.MediaId = Dev->OpalDisk.MediaId;\r
+  ZeroMem (&Session, sizeof (Session));\r
+  Session.Sscp          = Dev->OpalDisk.Sscp;\r
+  Session.MediaId       = Dev->OpalDisk.MediaId;\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
   while (Count < MAX_PASSWORD_TRY_COUNT) {\r
     Password = OpalDriverPopUpPasswordInput (Dev, PopUpString, L"Please type in your new password", NULL, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input password again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input password again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          return;\r
-        } else {\r
-          //\r
-          // Let user input password again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        return;\r
+      } else {\r
+        //\r
+        // Let user input password again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (Password == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLen = (UINT32) AsciiStrLen(Password);\r
+\r
+    PasswordLen = (UINT32)AsciiStrLen (Password);\r
 \r
     PasswordConfirm = OpalDriverPopUpPasswordInput (Dev, PopUpString, L"Please confirm your new password", NULL, &PressEsc);\r
     if (PasswordConfirm == NULL) {\r
       ZeroMem (Password, PasswordLen);\r
       FreePool (Password);\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLenConfirm = (UINT32) AsciiStrLen(PasswordConfirm);\r
+\r
+    PasswordLenConfirm = (UINT32)AsciiStrLen (PasswordConfirm);\r
     if ((PasswordLen != PasswordLenConfirm) ||\r
-        (CompareMem (Password, PasswordConfirm, PasswordLen) != 0)) {\r
+        (CompareMem (Password, PasswordConfirm, PasswordLen) != 0))\r
+    {\r
       ZeroMem (Password, PasswordLen);\r
       FreePool (Password);\r
       ZeroMem (PasswordConfirm, PasswordLenConfirm);\r
@@ -1133,7 +1141,8 @@ ProcessOpalRequestEnableFeature (
           NULL\r
           );\r
       } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-      Count ++;\r
+\r
+      Count++;\r
       continue;\r
     }\r
 \r
@@ -1142,7 +1151,7 @@ ProcessOpalRequestEnableFeature (
       FreePool (PasswordConfirm);\r
     }\r
 \r
-    Ret = OpalSupportEnableOpalFeature (&Session, Dev->OpalDisk.Msid,  Dev->OpalDisk.MsidLength, Password, PasswordLen);\r
+    Ret = OpalSupportEnableOpalFeature (&Session, Dev->OpalDisk.Msid, Dev->OpalDisk.MsidLength, Password, PasswordLen);\r
     if (Ret == TcgResultSuccess) {\r
       OpalSupportUpdatePassword (&Dev->OpalDisk, Password, PasswordLen);\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
@@ -1182,7 +1191,8 @@ ProcessOpalRequestEnableFeature (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 }\r
 \r
@@ -1195,19 +1205,19 @@ ProcessOpalRequestEnableFeature (
 **/\r
 VOID\r
 ProcessOpalRequestDisableUser (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  BOOLEAN               PasswordFailed;\r
-  CHAR16                *PopUpString;\r
+  UINT8          Count;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  BOOLEAN        PasswordFailed;\r
+  CHAR16         *PopUpString;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1219,42 +1229,43 @@ ProcessOpalRequestDisableUser (
 \r
   Count = 0;\r
 \r
-  ZeroMem(&Session, sizeof(Session));\r
-  Session.Sscp = Dev->OpalDisk.Sscp;\r
-  Session.MediaId = Dev->OpalDisk.MediaId;\r
+  ZeroMem (&Session, sizeof (Session));\r
+  Session.Sscp          = Dev->OpalDisk.Sscp;\r
+  Session.MediaId       = Dev->OpalDisk.MediaId;\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
   while (Count < MAX_PASSWORD_TRY_COUNT) {\r
     Password = OpalDriverPopUpPasswordInput (Dev, PopUpString, NULL, NULL, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input password again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input password again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          return;\r
-        } else {\r
-          //\r
-          // Let user input password again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        return;\r
+      } else {\r
+        //\r
+        // Let user input password again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (Password == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLen = (UINT32) AsciiStrLen(Password);\r
 \r
-    Ret = OpalUtilDisableUser(&Session, Password, PasswordLen, &PasswordFailed);\r
+    PasswordLen = (UINT32)AsciiStrLen (Password);\r
+\r
+    Ret = OpalUtilDisableUser (&Session, Password, PasswordLen, &PasswordFailed);\r
     if (Ret == TcgResultSuccess) {\r
       OpalSupportUpdatePassword (&Dev->OpalDisk, Password, PasswordLen);\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
@@ -1294,7 +1305,8 @@ ProcessOpalRequestDisableUser (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 }\r
 \r
@@ -1307,21 +1319,21 @@ ProcessOpalRequestDisableUser (
 **/\r
 VOID\r
 ProcessOpalRequestPsidRevert (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *Psid;\r
-  UINT32                PsidLen;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  CHAR16                *PopUpString;\r
-  CHAR16                *PopUpString2;\r
-  CHAR16                *PopUpString3;\r
-  UINTN                 BufferSize;\r
+  UINT8          Count;\r
+  CHAR8          *Psid;\r
+  UINT32         PsidLen;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  CHAR16         *PopUpString;\r
+  CHAR16         *PopUpString2;\r
+  CHAR16         *PopUpString3;\r
+  UINTN          BufferSize;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1332,14 +1344,14 @@ ProcessOpalRequestPsidRevert (
   PopUpString = OpalGetPopUpString (Dev, RequestString);\r
 \r
   if (Dev->OpalDisk.EstimateTimeCost > MAX_ACCEPTABLE_REVERTING_TIME) {\r
-    BufferSize = StrSize (L"Warning: Revert action will take about ####### seconds");\r
+    BufferSize   = StrSize (L"Warning: Revert action will take about ####### seconds");\r
     PopUpString2 = AllocateZeroPool (BufferSize);\r
     ASSERT (PopUpString2 != NULL);\r
     UnicodeSPrint (\r
-        PopUpString2,\r
-        BufferSize,\r
-        L"WARNING: Revert action will take about %d seconds",\r
-        Dev->OpalDisk.EstimateTimeCost\r
+      PopUpString2,\r
+      BufferSize,\r
+      L"WARNING: Revert action will take about %d seconds",\r
+      Dev->OpalDisk.EstimateTimeCost\r
       );\r
     PopUpString3 = L"DO NOT power off system during the revert action!";\r
   } else {\r
@@ -1349,42 +1361,43 @@ ProcessOpalRequestPsidRevert (
 \r
   Count = 0;\r
 \r
-  ZeroMem(&Session, sizeof(Session));\r
-  Session.Sscp = Dev->OpalDisk.Sscp;\r
-  Session.MediaId = Dev->OpalDisk.MediaId;\r
+  ZeroMem (&Session, sizeof (Session));\r
+  Session.Sscp          = Dev->OpalDisk.Sscp;\r
+  Session.MediaId       = Dev->OpalDisk.MediaId;\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
   while (Count < MAX_PSID_TRY_COUNT) {\r
     Psid = OpalDriverPopUpPsidInput (Dev, PopUpString, PopUpString2, PopUpString3, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input Psid again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input Psid again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          goto Done;\r
-        } else {\r
-          //\r
-          // Let user input Psid again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        goto Done;\r
+      } else {\r
+        //\r
+        // Let user input Psid again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (Psid == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PsidLen = (UINT32) AsciiStrLen(Psid);\r
 \r
-    Ret = OpalUtilPsidRevert(&Session, Psid, PsidLen);\r
+    PsidLen = (UINT32)AsciiStrLen (Psid);\r
+\r
+    Ret = OpalUtilPsidRevert (&Session, Psid, PsidLen);\r
     if (Ret == TcgResultSuccess) {\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
     } else {\r
@@ -1423,7 +1436,8 @@ ProcessOpalRequestPsidRevert (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 \r
 Done:\r
@@ -1442,23 +1456,23 @@ Done:
 **/\r
 VOID\r
 ProcessOpalRequestRevert (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN BOOLEAN            KeepUserData,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN BOOLEAN             KeepUserData,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  BOOLEAN               PasswordFailed;\r
-  CHAR16                *PopUpString;\r
-  CHAR16                *PopUpString2;\r
-  CHAR16                *PopUpString3;\r
-  UINTN                 BufferSize;\r
+  UINT8          Count;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  BOOLEAN        PasswordFailed;\r
+  CHAR16         *PopUpString;\r
+  CHAR16         *PopUpString2;\r
+  CHAR16         *PopUpString3;\r
+  UINTN          BufferSize;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1469,15 +1483,16 @@ ProcessOpalRequestRevert (
   PopUpString = OpalGetPopUpString (Dev, RequestString);\r
 \r
   if ((!KeepUserData) &&\r
-      (Dev->OpalDisk.EstimateTimeCost > MAX_ACCEPTABLE_REVERTING_TIME)) {\r
-    BufferSize = StrSize (L"Warning: Revert action will take about ####### seconds");\r
+      (Dev->OpalDisk.EstimateTimeCost > MAX_ACCEPTABLE_REVERTING_TIME))\r
+  {\r
+    BufferSize   = StrSize (L"Warning: Revert action will take about ####### seconds");\r
     PopUpString2 = AllocateZeroPool (BufferSize);\r
     ASSERT (PopUpString2 != NULL);\r
     UnicodeSPrint (\r
-        PopUpString2,\r
-        BufferSize,\r
-        L"WARNING: Revert action will take about %d seconds",\r
-        Dev->OpalDisk.EstimateTimeCost\r
+      PopUpString2,\r
+      BufferSize,\r
+      L"WARNING: Revert action will take about %d seconds",\r
+      Dev->OpalDisk.EstimateTimeCost\r
       );\r
     PopUpString3 = L"DO NOT power off system during the revert action!";\r
   } else {\r
@@ -1487,49 +1502,51 @@ ProcessOpalRequestRevert (
 \r
   Count = 0;\r
 \r
-  ZeroMem(&Session, sizeof(Session));\r
-  Session.Sscp = Dev->OpalDisk.Sscp;\r
-  Session.MediaId = Dev->OpalDisk.MediaId;\r
+  ZeroMem (&Session, sizeof (Session));\r
+  Session.Sscp          = Dev->OpalDisk.Sscp;\r
+  Session.MediaId       = Dev->OpalDisk.MediaId;\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
   while (Count < MAX_PASSWORD_TRY_COUNT) {\r
     Password = OpalDriverPopUpPasswordInput (Dev, PopUpString, PopUpString2, PopUpString3, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input password again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input password again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          goto Done;\r
-        } else {\r
-          //\r
-          // Let user input password again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        goto Done;\r
+      } else {\r
+        //\r
+        // Let user input password again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (Password == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLen = (UINT32) AsciiStrLen(Password);\r
+\r
+    PasswordLen = (UINT32)AsciiStrLen (Password);\r
 \r
     if ((Dev->OpalDisk.SupportedAttributes.PyriteSsc == 1) &&\r
-        (Dev->OpalDisk.LockingFeature.MediaEncryption == 0)) {\r
+        (Dev->OpalDisk.LockingFeature.MediaEncryption == 0))\r
+    {\r
       //\r
       // For pyrite type device which does not support media encryption,\r
       // it does not accept "Keep User Data" parameter.\r
       // So here hardcode a FALSE for this case.\r
       //\r
-      Ret = OpalUtilRevert(\r
+      Ret = OpalUtilRevert (\r
               &Session,\r
               FALSE,\r
               Password,\r
@@ -1539,7 +1556,7 @@ ProcessOpalRequestRevert (
               Dev->OpalDisk.MsidLength\r
               );\r
     } else {\r
-      Ret = OpalUtilRevert(\r
+      Ret = OpalUtilRevert (\r
               &Session,\r
               KeepUserData,\r
               Password,\r
@@ -1549,6 +1566,7 @@ ProcessOpalRequestRevert (
               Dev->OpalDisk.MsidLength\r
               );\r
     }\r
+\r
     if (Ret == TcgResultSuccess) {\r
       OpalSupportUpdatePassword (&Dev->OpalDisk, Password, PasswordLen);\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
@@ -1588,7 +1606,8 @@ ProcessOpalRequestRevert (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 \r
 Done:\r
@@ -1606,22 +1625,22 @@ Done:
 **/\r
 VOID\r
 ProcessOpalRequestSecureErase (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  BOOLEAN               PasswordFailed;\r
-  CHAR16                *PopUpString;\r
-  CHAR16                *PopUpString2;\r
-  CHAR16                *PopUpString3;\r
-  UINTN                 BufferSize;\r
+  UINT8          Count;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  BOOLEAN        PasswordFailed;\r
+  CHAR16         *PopUpString;\r
+  CHAR16         *PopUpString2;\r
+  CHAR16         *PopUpString3;\r
+  UINTN          BufferSize;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1632,58 +1651,60 @@ ProcessOpalRequestSecureErase (
   PopUpString = OpalGetPopUpString (Dev, RequestString);\r
 \r
   if (Dev->OpalDisk.EstimateTimeCost > MAX_ACCEPTABLE_REVERTING_TIME) {\r
-    BufferSize = StrSize (L"Warning: Secure erase action will take about ####### seconds");\r
+    BufferSize   = StrSize (L"Warning: Secure erase action will take about ####### seconds");\r
     PopUpString2 = AllocateZeroPool (BufferSize);\r
     ASSERT (PopUpString2 != NULL);\r
     UnicodeSPrint (\r
-        PopUpString2,\r
-        BufferSize,\r
-        L"WARNING: Secure erase action will take about %d seconds",\r
-        Dev->OpalDisk.EstimateTimeCost\r
+      PopUpString2,\r
+      BufferSize,\r
+      L"WARNING: Secure erase action will take about %d seconds",\r
+      Dev->OpalDisk.EstimateTimeCost\r
       );\r
     PopUpString3 = L"DO NOT power off system during the action!";\r
   } else {\r
     PopUpString2 = NULL;\r
     PopUpString3 = NULL;\r
   }\r
+\r
   Count = 0;\r
 \r
-  ZeroMem(&Session, sizeof(Session));\r
-  Session.Sscp = Dev->OpalDisk.Sscp;\r
-  Session.MediaId = Dev->OpalDisk.MediaId;\r
+  ZeroMem (&Session, sizeof (Session));\r
+  Session.Sscp          = Dev->OpalDisk.Sscp;\r
+  Session.MediaId       = Dev->OpalDisk.MediaId;\r
   Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
 \r
   while (Count < MAX_PASSWORD_TRY_COUNT) {\r
     Password = OpalDriverPopUpPasswordInput (Dev, PopUpString, PopUpString2, PopUpString3, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input password again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input password again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          goto Done;\r
-        } else {\r
-          //\r
-          // Let user input password again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        goto Done;\r
+      } else {\r
+        //\r
+        // Let user input password again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (Password == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLen = (UINT32) AsciiStrLen(Password);\r
 \r
-    Ret = OpalUtilSecureErase(&Session, Password, PasswordLen, &PasswordFailed);\r
+    PasswordLen = (UINT32)AsciiStrLen (Password);\r
+\r
+    Ret = OpalUtilSecureErase (&Session, Password, PasswordLen, &PasswordFailed);\r
     if (Ret == TcgResultSuccess) {\r
       OpalSupportUpdatePassword (&Dev->OpalDisk, Password, PasswordLen);\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
@@ -1723,7 +1744,8 @@ ProcessOpalRequestSecureErase (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 \r
 Done:\r
@@ -1741,22 +1763,22 @@ Done:
 **/\r
 VOID\r
 ProcessOpalRequestSetUserPwd (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *OldPassword;\r
-  UINT32                OldPasswordLen;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  CHAR8                 *PasswordConfirm;\r
-  UINT32                PasswordLenConfirm;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  CHAR16                *PopUpString;\r
+  UINT8          Count;\r
+  CHAR8          *OldPassword;\r
+  UINT32         OldPasswordLen;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  CHAR8          *PasswordConfirm;\r
+  UINT32         PasswordLenConfirm;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  CHAR16         *PopUpString;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1771,38 +1793,39 @@ ProcessOpalRequestSetUserPwd (
   while (Count < MAX_PASSWORD_TRY_COUNT) {\r
     OldPassword = OpalDriverPopUpPasswordInput (Dev, PopUpString, L"Please type in your password", NULL, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input password again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input password again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          return;\r
-        } else {\r
-          //\r
-          // Let user input password again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        return;\r
+      } else {\r
+        //\r
+        // Let user input password again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (OldPassword == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    OldPasswordLen = (UINT32) AsciiStrLen(OldPassword);\r
 \r
-    ZeroMem(&Session, sizeof(Session));\r
-    Session.Sscp = Dev->OpalDisk.Sscp;\r
-    Session.MediaId = Dev->OpalDisk.MediaId;\r
+    OldPasswordLen = (UINT32)AsciiStrLen (OldPassword);\r
+\r
+    ZeroMem (&Session, sizeof (Session));\r
+    Session.Sscp          = Dev->OpalDisk.Sscp;\r
+    Session.MediaId       = Dev->OpalDisk.MediaId;\r
     Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
-    Ret = OpalUtilVerifyPassword (&Session, OldPassword, OldPasswordLen, OPAL_LOCKING_SP_USER1_AUTHORITY);\r
+    Ret                   = OpalUtilVerifyPassword (&Session, OldPassword, OldPasswordLen, OPAL_LOCKING_SP_USER1_AUTHORITY);\r
     if (Ret == TcgResultSuccess) {\r
       DEBUG ((DEBUG_INFO, "Verify with USER1 authority : Success\n"));\r
     } else {\r
@@ -1822,7 +1845,8 @@ ProcessOpalRequestSetUserPwd (
             NULL\r
             );\r
         } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-        Count ++;\r
+\r
+        Count++;\r
         continue;\r
       }\r
     }\r
@@ -1831,10 +1855,11 @@ ProcessOpalRequestSetUserPwd (
     if (Password == NULL) {\r
       ZeroMem (OldPassword, OldPasswordLen);\r
       FreePool (OldPassword);\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLen = (UINT32) AsciiStrLen(Password);\r
+\r
+    PasswordLen = (UINT32)AsciiStrLen (Password);\r
 \r
     PasswordConfirm = OpalDriverPopUpPasswordInput (Dev, PopUpString, L"Please confirm your new password", NULL, &PressEsc);\r
     if (PasswordConfirm == NULL) {\r
@@ -1842,12 +1867,14 @@ ProcessOpalRequestSetUserPwd (
       FreePool (OldPassword);\r
       ZeroMem (Password, PasswordLen);\r
       FreePool (Password);\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLenConfirm = (UINT32) AsciiStrLen(PasswordConfirm);\r
+\r
+    PasswordLenConfirm = (UINT32)AsciiStrLen (PasswordConfirm);\r
     if ((PasswordLen != PasswordLenConfirm) ||\r
-        (CompareMem (Password, PasswordConfirm, PasswordLen) != 0)) {\r
+        (CompareMem (Password, PasswordConfirm, PasswordLen) != 0))\r
+    {\r
       ZeroMem (OldPassword, OldPasswordLen);\r
       FreePool (OldPassword);\r
       ZeroMem (Password, PasswordLen);\r
@@ -1863,7 +1890,8 @@ ProcessOpalRequestSetUserPwd (
           NULL\r
           );\r
       } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-      Count ++;\r
+\r
+      Count++;\r
       continue;\r
     }\r
 \r
@@ -1872,17 +1900,17 @@ ProcessOpalRequestSetUserPwd (
       FreePool (PasswordConfirm);\r
     }\r
 \r
-    ZeroMem(&Session, sizeof(Session));\r
-    Session.Sscp = Dev->OpalDisk.Sscp;\r
-    Session.MediaId = Dev->OpalDisk.MediaId;\r
+    ZeroMem (&Session, sizeof (Session));\r
+    Session.Sscp          = Dev->OpalDisk.Sscp;\r
+    Session.MediaId       = Dev->OpalDisk.MediaId;\r
     Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
-    Ret = OpalUtilSetUserPassword(\r
-            &Session,\r
-            OldPassword,\r
-            OldPasswordLen,\r
-            Password,\r
-            PasswordLen\r
-            );\r
+    Ret                   = OpalUtilSetUserPassword (\r
+                              &Session,\r
+                              OldPassword,\r
+                              OldPasswordLen,\r
+                              Password,\r
+                              PasswordLen\r
+                              );\r
     if (Ret == TcgResultSuccess) {\r
       OpalSupportUpdatePassword (&Dev->OpalDisk, Password, PasswordLen);\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
@@ -1927,7 +1955,8 @@ ProcessOpalRequestSetUserPwd (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 }\r
 \r
@@ -1940,22 +1969,22 @@ ProcessOpalRequestSetUserPwd (
 **/\r
 VOID\r
 ProcessOpalRequestSetAdminPwd (\r
-  IN OPAL_DRIVER_DEVICE *Dev,\r
-  IN CHAR16             *RequestString\r
+  IN OPAL_DRIVER_DEVICE  *Dev,\r
+  IN CHAR16              *RequestString\r
   )\r
 {\r
-  UINT8                 Count;\r
-  CHAR8                 *OldPassword;\r
-  UINT32                OldPasswordLen;\r
-  CHAR8                 *Password;\r
-  UINT32                PasswordLen;\r
-  CHAR8                 *PasswordConfirm;\r
-  UINT32                PasswordLenConfirm;\r
-  OPAL_SESSION          Session;\r
-  BOOLEAN               PressEsc;\r
-  EFI_INPUT_KEY         Key;\r
-  TCG_RESULT            Ret;\r
-  CHAR16                *PopUpString;\r
+  UINT8          Count;\r
+  CHAR8          *OldPassword;\r
+  UINT32         OldPasswordLen;\r
+  CHAR8          *Password;\r
+  UINT32         PasswordLen;\r
+  CHAR8          *PasswordConfirm;\r
+  UINT32         PasswordLenConfirm;\r
+  OPAL_SESSION   Session;\r
+  BOOLEAN        PressEsc;\r
+  EFI_INPUT_KEY  Key;\r
+  TCG_RESULT     Ret;\r
+  CHAR16         *PopUpString;\r
 \r
   if (Dev == NULL) {\r
     return;\r
@@ -1970,38 +1999,39 @@ ProcessOpalRequestSetAdminPwd (
   while (Count < MAX_PASSWORD_TRY_COUNT) {\r
     OldPassword = OpalDriverPopUpPasswordInput (Dev, PopUpString, L"Please type in your password", NULL, &PressEsc);\r
     if (PressEsc) {\r
-        do {\r
-          CreatePopUp (\r
-            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
-            &Key,\r
-            L"Press ENTER to skip the request and continue boot,",\r
-            L"Press ESC to input password again",\r
-            NULL\r
-            );\r
-        } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
+      do {\r
+        CreatePopUp (\r
+          EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+          &Key,\r
+          L"Press ENTER to skip the request and continue boot,",\r
+          L"Press ESC to input password again",\r
+          NULL\r
+          );\r
+      } while ((Key.ScanCode != SCAN_ESC) && (Key.UnicodeChar != CHAR_CARRIAGE_RETURN));\r
 \r
-        if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-          gST->ConOut->ClearScreen(gST->ConOut);\r
-          return;\r
-        } else {\r
-          //\r
-          // Let user input password again.\r
-          //\r
-          continue;\r
-        }\r
+      if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+        gST->ConOut->ClearScreen (gST->ConOut);\r
+        return;\r
+      } else {\r
+        //\r
+        // Let user input password again.\r
+        //\r
+        continue;\r
+      }\r
     }\r
 \r
     if (OldPassword == NULL) {\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    OldPasswordLen = (UINT32) AsciiStrLen(OldPassword);\r
 \r
-    ZeroMem(&Session, sizeof(Session));\r
-    Session.Sscp = Dev->OpalDisk.Sscp;\r
-    Session.MediaId = Dev->OpalDisk.MediaId;\r
+    OldPasswordLen = (UINT32)AsciiStrLen (OldPassword);\r
+\r
+    ZeroMem (&Session, sizeof (Session));\r
+    Session.Sscp          = Dev->OpalDisk.Sscp;\r
+    Session.MediaId       = Dev->OpalDisk.MediaId;\r
     Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
-    Ret = OpalUtilVerifyPassword (&Session, OldPassword, OldPasswordLen, OPAL_LOCKING_SP_ADMIN1_AUTHORITY);\r
+    Ret                   = OpalUtilVerifyPassword (&Session, OldPassword, OldPasswordLen, OPAL_LOCKING_SP_ADMIN1_AUTHORITY);\r
     if (Ret == TcgResultSuccess) {\r
       DEBUG ((DEBUG_INFO, "Verify: Success\n"));\r
     } else {\r
@@ -2017,7 +2047,8 @@ ProcessOpalRequestSetAdminPwd (
           NULL\r
           );\r
       } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-      Count ++;\r
+\r
+      Count++;\r
       continue;\r
     }\r
 \r
@@ -2025,10 +2056,11 @@ ProcessOpalRequestSetAdminPwd (
     if (Password == NULL) {\r
       ZeroMem (OldPassword, OldPasswordLen);\r
       FreePool (OldPassword);\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLen = (UINT32) AsciiStrLen(Password);\r
+\r
+    PasswordLen = (UINT32)AsciiStrLen (Password);\r
 \r
     PasswordConfirm = OpalDriverPopUpPasswordInput (Dev, PopUpString, L"Please confirm your new password", NULL, &PressEsc);\r
     if (PasswordConfirm == NULL) {\r
@@ -2036,12 +2068,14 @@ ProcessOpalRequestSetAdminPwd (
       FreePool (OldPassword);\r
       ZeroMem (Password, PasswordLen);\r
       FreePool (Password);\r
-      Count ++;\r
+      Count++;\r
       continue;\r
     }\r
-    PasswordLenConfirm = (UINT32) AsciiStrLen(PasswordConfirm);\r
+\r
+    PasswordLenConfirm = (UINT32)AsciiStrLen (PasswordConfirm);\r
     if ((PasswordLen != PasswordLenConfirm) ||\r
-        (CompareMem (Password, PasswordConfirm, PasswordLen) != 0)) {\r
+        (CompareMem (Password, PasswordConfirm, PasswordLen) != 0))\r
+    {\r
       ZeroMem (OldPassword, OldPasswordLen);\r
       FreePool (OldPassword);\r
       ZeroMem (Password, PasswordLen);\r
@@ -2057,7 +2091,8 @@ ProcessOpalRequestSetAdminPwd (
           NULL\r
           );\r
       } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-      Count ++;\r
+\r
+      Count++;\r
       continue;\r
     }\r
 \r
@@ -2066,18 +2101,17 @@ ProcessOpalRequestSetAdminPwd (
       FreePool (PasswordConfirm);\r
     }\r
 \r
-\r
-    ZeroMem(&Session, sizeof(Session));\r
-    Session.Sscp = Dev->OpalDisk.Sscp;\r
-    Session.MediaId = Dev->OpalDisk.MediaId;\r
+    ZeroMem (&Session, sizeof (Session));\r
+    Session.Sscp          = Dev->OpalDisk.Sscp;\r
+    Session.MediaId       = Dev->OpalDisk.MediaId;\r
     Session.OpalBaseComId = Dev->OpalDisk.OpalBaseComId;\r
-    Ret = OpalUtilSetAdminPassword(\r
-            &Session,\r
-            OldPassword,\r
-            OldPasswordLen,\r
-            Password,\r
-            PasswordLen\r
-            );\r
+    Ret                   = OpalUtilSetAdminPassword (\r
+                              &Session,\r
+                              OldPassword,\r
+                              OldPasswordLen,\r
+                              Password,\r
+                              PasswordLen\r
+                              );\r
     if (Ret == TcgResultSuccess) {\r
       OpalSupportUpdatePassword (&Dev->OpalDisk, Password, PasswordLen);\r
       DEBUG ((DEBUG_INFO, "%s Success\n", RequestString));\r
@@ -2122,7 +2156,8 @@ ProcessOpalRequestSetAdminPwd (
         NULL\r
         );\r
     } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-    gST->ConOut->ClearScreen(gST->ConOut);\r
+\r
+    gST->ConOut->ClearScreen (gST->ConOut);\r
   }\r
 }\r
 \r
@@ -2134,7 +2169,7 @@ ProcessOpalRequestSetAdminPwd (
 **/\r
 VOID\r
 ProcessOpalRequest (\r
-  IN OPAL_DRIVER_DEVICE     *Dev\r
+  IN OPAL_DRIVER_DEVICE  *Dev\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -2153,13 +2188,14 @@ ProcessOpalRequest (
     Status = GetVariable2 (\r
                OPAL_REQUEST_VARIABLE_NAME,\r
                &gHiiSetupVariableGuid,\r
-               (VOID **) &Variable,\r
+               (VOID **)&Variable,\r
                &VariableSize\r
                );\r
     if (EFI_ERROR (Status) || (Variable == NULL)) {\r
       return;\r
     }\r
-    mOpalRequestVariable = Variable;\r
+\r
+    mOpalRequestVariable     = Variable;\r
     mOpalRequestVariableSize = VariableSize;\r
 \r
     //\r
@@ -2167,14 +2203,14 @@ ProcessOpalRequest (
     //\r
     Status = gRT->SetVariable (\r
                     OPAL_REQUEST_VARIABLE_NAME,\r
-                    (EFI_GUID *) &gHiiSetupVariableGuid,\r
+                    (EFI_GUID *)&gHiiSetupVariableGuid,\r
                     0,\r
                     0,\r
                     NULL\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
   } else {\r
-    Variable = mOpalRequestVariable;\r
+    Variable     = mOpalRequestVariable;\r
     VariableSize = mOpalRequestVariableSize;\r
   }\r
 \r
@@ -2184,39 +2220,47 @@ ProcessOpalRequest (
   TempVariable = Variable;\r
   while ((VariableSize > sizeof (OPAL_REQUEST_VARIABLE)) &&\r
          (VariableSize >= TempVariable->Length) &&\r
-         (TempVariable->Length > sizeof (OPAL_REQUEST_VARIABLE))) {\r
-    DevicePathInVariable = (EFI_DEVICE_PATH_PROTOCOL *) ((UINTN) TempVariable + sizeof (OPAL_REQUEST_VARIABLE));\r
+         (TempVariable->Length > sizeof (OPAL_REQUEST_VARIABLE)))\r
+  {\r
+    DevicePathInVariable     = (EFI_DEVICE_PATH_PROTOCOL *)((UINTN)TempVariable + sizeof (OPAL_REQUEST_VARIABLE));\r
     DevicePathSizeInVariable = GetDevicePathSize (DevicePathInVariable);\r
-    DevicePath = Dev->OpalDisk.OpalDevicePath;\r
-    DevicePathSize = GetDevicePathSize (DevicePath);\r
+    DevicePath               = Dev->OpalDisk.OpalDevicePath;\r
+    DevicePathSize           = GetDevicePathSize (DevicePath);\r
     if ((DevicePathSize == DevicePathSizeInVariable) &&\r
-        (CompareMem (DevicePath, DevicePathInVariable, DevicePathSize) == 0)) {\r
+        (CompareMem (DevicePath, DevicePathInVariable, DevicePathSize) == 0))\r
+    {\r
       //\r
       // Found the node for the OPAL device.\r
       //\r
       if (TempVariable->OpalRequest.SetAdminPwd != 0) {\r
         ProcessOpalRequestSetAdminPwd (Dev, L"Update Admin Pwd:");\r
       }\r
+\r
       if (TempVariable->OpalRequest.SetUserPwd != 0) {\r
         ProcessOpalRequestSetUserPwd (Dev, L"Set User Pwd:");\r
       }\r
-      if (TempVariable->OpalRequest.SecureErase!= 0) {\r
+\r
+      if (TempVariable->OpalRequest.SecureErase != 0) {\r
         ProcessOpalRequestSecureErase (Dev, L"Secure Erase:");\r
       }\r
+\r
       if (TempVariable->OpalRequest.Revert != 0) {\r
-        KeepUserData = (BOOLEAN) TempVariable->OpalRequest.KeepUserData;\r
+        KeepUserData = (BOOLEAN)TempVariable->OpalRequest.KeepUserData;\r
         ProcessOpalRequestRevert (\r
           Dev,\r
           KeepUserData,\r
           KeepUserData ? L"Admin Revert(keep):" : L"Admin Revert:"\r
           );\r
       }\r
+\r
       if (TempVariable->OpalRequest.PsidRevert != 0) {\r
         ProcessOpalRequestPsidRevert (Dev, L"Psid Revert:");\r
       }\r
+\r
       if (TempVariable->OpalRequest.DisableUser != 0) {\r
         ProcessOpalRequestDisableUser (Dev, L"Disable User:");\r
       }\r
+\r
       if (TempVariable->OpalRequest.EnableFeature != 0) {\r
         ProcessOpalRequestEnableFeature (Dev, L"Enable Feature:");\r
       }\r
@@ -2231,7 +2275,7 @@ ProcessOpalRequest (
     }\r
 \r
     VariableSize -= TempVariable->Length;\r
-    TempVariable = (OPAL_REQUEST_VARIABLE *) ((UINTN) TempVariable + TempVariable->Length);\r
+    TempVariable  = (OPAL_REQUEST_VARIABLE *)((UINTN)TempVariable + TempVariable->Length);\r
   }\r
 \r
   DEBUG ((DEBUG_INFO, "%a() - exit\n", __FUNCTION__));\r
@@ -2244,11 +2288,11 @@ ProcessOpalRequest (
 \r
 **/\r
 VOID\r
-AddDeviceToTail(\r
-  IN OPAL_DRIVER_DEVICE    *Dev\r
+AddDeviceToTail (\r
+  IN OPAL_DRIVER_DEVICE  *Dev\r
   )\r
 {\r
-  OPAL_DRIVER_DEVICE                *TmpDev;\r
+  OPAL_DRIVER_DEVICE  *TmpDev;\r
 \r
   if (mOpalDriver.DeviceList == NULL) {\r
     mOpalDriver.DeviceList = Dev;\r
@@ -2270,10 +2314,10 @@ AddDeviceToTail(
 **/\r
 VOID\r
 RemoveDevice (\r
-  IN OPAL_DRIVER_DEVICE    *Dev\r
+  IN OPAL_DRIVER_DEVICE  *Dev\r
   )\r
 {\r
-  OPAL_DRIVER_DEVICE                *TmpDev;\r
+  OPAL_DRIVER_DEVICE  *TmpDev;\r
 \r
   if (mOpalDriver.DeviceList == NULL) {\r
     return;\r
@@ -2304,10 +2348,10 @@ GetDeviceCount (
   VOID\r
   )\r
 {\r
-  UINT8                Count;\r
-  OPAL_DRIVER_DEVICE   *TmpDev;\r
+  UINT8               Count;\r
+  OPAL_DRIVER_DEVICE  *TmpDev;\r
 \r
-  Count = 0;\r
+  Count  = 0;\r
   TmpDev = mOpalDriver.DeviceList;\r
 \r
   while (TmpDev != NULL) {\r
@@ -2323,8 +2367,8 @@ GetDeviceCount (
 \r
   @retval     return the device list pointer.\r
 **/\r
-OPAL_DRIVER_DEVICE*\r
-OpalDriverGetDeviceList(\r
+OPAL_DRIVER_DEVICE *\r
+OpalDriverGetDeviceList (\r
   VOID\r
   )\r
 {\r
@@ -2339,38 +2383,38 @@ OpalDriverGetDeviceList(
 **/\r
 VOID\r
 OpalDriverStopDevice (\r
-  OPAL_DRIVER_DEVICE     *Dev\r
+  OPAL_DRIVER_DEVICE  *Dev\r
   )\r
 {\r
   //\r
   // free each name\r
   //\r
-  FreePool(Dev->Name16);\r
+  FreePool (Dev->Name16);\r
 \r
   //\r
   // remove OPAL_DRIVER_DEVICE from the list\r
   // it updates the controllerList pointer\r
   //\r
-  RemoveDevice(Dev);\r
+  RemoveDevice (Dev);\r
 \r
   //\r
   // close protocols that were opened\r
   //\r
-  gBS->CloseProtocol(\r
-    Dev->Handle,\r
-    &gEfiStorageSecurityCommandProtocolGuid,\r
-    gOpalDriverBinding.DriverBindingHandle,\r
-    Dev->Handle\r
-    );\r
-\r
-  gBS->CloseProtocol(\r
-    Dev->Handle,\r
-    &gEfiBlockIoProtocolGuid,\r
-    gOpalDriverBinding.DriverBindingHandle,\r
-    Dev->Handle\r
-    );\r
-\r
-  FreePool(Dev);\r
+  gBS->CloseProtocol (\r
+         Dev->Handle,\r
+         &gEfiStorageSecurityCommandProtocolGuid,\r
+         gOpalDriverBinding.DriverBindingHandle,\r
+         Dev->Handle\r
+         );\r
+\r
+  gBS->CloseProtocol (\r
+         Dev->Handle,\r
+         &gEfiBlockIoProtocolGuid,\r
+         gOpalDriverBinding.DriverBindingHandle,\r
+         Dev->Handle\r
+         );\r
+\r
+  FreePool (Dev);\r
 }\r
 \r
 /**\r
@@ -2385,26 +2429,26 @@ OpalDriverStopDevice (
   @retval     FALSE       Not found the name for this device.\r
 **/\r
 BOOLEAN\r
-OpalDriverGetDeviceNameByProtocol(\r
-  EFI_HANDLE             *AllHandlesBuffer,\r
-  UINTN                  NumAllHandles,\r
-  OPAL_DRIVER_DEVICE     *Dev,\r
-  BOOLEAN                UseComp1\r
+OpalDriverGetDeviceNameByProtocol (\r
+  EFI_HANDLE          *AllHandlesBuffer,\r
+  UINTN               NumAllHandles,\r
+  OPAL_DRIVER_DEVICE  *Dev,\r
+  BOOLEAN             UseComp1\r
   )\r
 {\r
-  EFI_HANDLE*                   ProtocolHandlesBuffer;\r
+  EFI_HANDLE                    *ProtocolHandlesBuffer;\r
   UINTN                         NumProtocolHandles;\r
   EFI_STATUS                    Status;\r
-  EFI_COMPONENT_NAME2_PROTOCOLCnp1_2; // efi component name and componentName2 have same layout\r
+  EFI_COMPONENT_NAME2_PROTOCOL  *Cnp1_2; // efi component name and componentName2 have same layout\r
   EFI_GUID                      Protocol;\r
   UINTN                         StrLength;\r
-  EFI_DEVICE_PATH_PROTOCOL*     TmpDevPath;\r
+  EFI_DEVICE_PATH_PROTOCOL      *TmpDevPath;\r
   UINTN                         Index1;\r
   UINTN                         Index2;\r
   EFI_HANDLE                    TmpHandle;\r
   CHAR16                        *DevName;\r
 \r
-  if (Dev == NULL || AllHandlesBuffer == NULL || NumAllHandles == 0) {\r
+  if ((Dev == NULL) || (AllHandlesBuffer == NULL) || (NumAllHandles == 0)) {\r
     return FALSE;\r
   }\r
 \r
@@ -2413,18 +2457,17 @@ OpalDriverGetDeviceNameByProtocol(
   //\r
   // Find all EFI_HANDLES with protocol\r
   //\r
-  Status = gBS->LocateHandleBuffer(\r
-               ByProtocol,\r
-               &Protocol,\r
-               NULL,\r
-               &NumProtocolHandles,\r
-               &ProtocolHandlesBuffer\r
-               );\r
-  if (EFI_ERROR(Status)) {\r
+  Status = gBS->LocateHandleBuffer (\r
+                  ByProtocol,\r
+                  &Protocol,\r
+                  NULL,\r
+                  &NumProtocolHandles,\r
+                  &ProtocolHandlesBuffer\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
     return FALSE;\r
   }\r
 \r
-\r
   //\r
   // Exit early if no supported devices\r
   //\r
@@ -2448,15 +2491,15 @@ OpalDriverGetDeviceNameByProtocol(
 \r
     TmpHandle = ProtocolHandlesBuffer[Index1];\r
 \r
-    Status = gBS->OpenProtocol(\r
-                 TmpHandle,\r
-                 &Protocol,\r
-                 (VOID**)&Cnp1_2,\r
-                 gImageHandle,\r
-                 NULL,\r
-                 EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                 );\r
-    if (EFI_ERROR(Status) || Cnp1_2 == NULL) {\r
+    Status = gBS->OpenProtocol (\r
+                    TmpHandle,\r
+                    &Protocol,\r
+                    (VOID **)&Cnp1_2,\r
+                    gImageHandle,\r
+                    NULL,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
+    if (EFI_ERROR (Status) || (Cnp1_2 == NULL)) {\r
       continue;\r
     }\r
 \r
@@ -2464,53 +2507,55 @@ OpalDriverGetDeviceNameByProtocol(
     // Use all handles array as controller handle\r
     //\r
     for (Index2 = 0; Index2 < NumAllHandles; Index2++) {\r
-      Status = Cnp1_2->GetControllerName(\r
-                   Cnp1_2,\r
-                   AllHandlesBuffer[Index2],\r
-                   Dev->Handle,\r
-                   LANGUAGE_ISO_639_2_ENGLISH,\r
-                   &DevName\r
-                   );\r
-      if (EFI_ERROR(Status)) {\r
-        Status = Cnp1_2->GetControllerName(\r
-                     Cnp1_2,\r
-                     AllHandlesBuffer[Index2],\r
-                     Dev->Handle,\r
-                     LANGUAGE_RFC_3066_ENGLISH,\r
-                     &DevName\r
-                     );\r
+      Status = Cnp1_2->GetControllerName (\r
+                         Cnp1_2,\r
+                         AllHandlesBuffer[Index2],\r
+                         Dev->Handle,\r
+                         LANGUAGE_ISO_639_2_ENGLISH,\r
+                         &DevName\r
+                         );\r
+      if (EFI_ERROR (Status)) {\r
+        Status = Cnp1_2->GetControllerName (\r
+                           Cnp1_2,\r
+                           AllHandlesBuffer[Index2],\r
+                           Dev->Handle,\r
+                           LANGUAGE_RFC_3066_ENGLISH,\r
+                           &DevName\r
+                           );\r
       }\r
-      if (!EFI_ERROR(Status) && DevName != NULL) {\r
-        StrLength = StrLen(DevName) + 1;        // Add one for NULL terminator\r
-        Dev->Name16 = AllocateZeroPool(StrLength * sizeof (CHAR16));\r
+\r
+      if (!EFI_ERROR (Status) && (DevName != NULL)) {\r
+        StrLength   = StrLen (DevName) + 1;     // Add one for NULL terminator\r
+        Dev->Name16 = AllocateZeroPool (StrLength * sizeof (CHAR16));\r
         ASSERT (Dev->Name16 != NULL);\r
         StrCpyS (Dev->Name16, StrLength, DevName);\r
-        Dev->NameZ = (CHAR8*)AllocateZeroPool(StrLength);\r
+        Dev->NameZ = (CHAR8 *)AllocateZeroPool (StrLength);\r
         UnicodeStrToAsciiStrS (DevName, Dev->NameZ, StrLength);\r
 \r
         //\r
         // Retrieve bridge BDF info and port number or namespace depending on type\r
         //\r
         TmpDevPath = NULL;\r
-        Status = gBS->OpenProtocol(\r
-            Dev->Handle,\r
-            &gEfiDevicePathProtocolGuid,\r
-            (VOID**)&TmpDevPath,\r
-            gImageHandle,\r
-            NULL,\r
-            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-            );\r
-        if (!EFI_ERROR(Status)) {\r
+        Status     = gBS->OpenProtocol (\r
+                            Dev->Handle,\r
+                            &gEfiDevicePathProtocolGuid,\r
+                            (VOID **)&TmpDevPath,\r
+                            gImageHandle,\r
+                            NULL,\r
+                            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                            );\r
+        if (!EFI_ERROR (Status)) {\r
           Dev->OpalDevicePath = DuplicateDevicePath (TmpDevPath);\r
           return TRUE;\r
         }\r
 \r
         if (Dev->Name16 != NULL) {\r
-          FreePool(Dev->Name16);\r
+          FreePool (Dev->Name16);\r
           Dev->Name16 = NULL;\r
         }\r
+\r
         if (Dev->NameZ != NULL) {\r
-          FreePool(Dev->NameZ);\r
+          FreePool (Dev->NameZ);\r
           Dev->NameZ = NULL;\r
         }\r
       }\r
@@ -2529,16 +2574,16 @@ OpalDriverGetDeviceNameByProtocol(
   @retval     FALSE       Not found the name for this device.\r
 **/\r
 BOOLEAN\r
-OpalDriverGetDriverDeviceName(\r
-  OPAL_DRIVER_DEVICE          *Dev\r
+OpalDriverGetDriverDeviceName (\r
+  OPAL_DRIVER_DEVICE  *Dev\r
   )\r
 {\r
-  EFI_HANDLE*                  AllHandlesBuffer;\r
-  UINTN                        NumAllHandles;\r
-  EFI_STATUS                   Status;\r
+  EFI_HANDLE  *AllHandlesBuffer;\r
+  UINTN       NumAllHandles;\r
+  EFI_STATUS  Status;\r
 \r
   if (Dev == NULL) {\r
-    DEBUG((DEBUG_ERROR | DEBUG_INIT, "OpalDriverGetDriverDeviceName Exiting, Dev=NULL\n"));\r
+    DEBUG ((DEBUG_ERROR | DEBUG_INIT, "OpalDriverGetDriverDeviceName Exiting, Dev=NULL\n"));\r
     return FALSE;\r
   }\r
 \r
@@ -2546,29 +2591,29 @@ OpalDriverGetDriverDeviceName(
   // Iterate through ComponentName2 handles to get name, if fails, try ComponentName\r
   //\r
   if (Dev->Name16 == NULL) {\r
-    DEBUG((DEBUG_ERROR | DEBUG_INIT, "Name is null, update it\n"));\r
+    DEBUG ((DEBUG_ERROR | DEBUG_INIT, "Name is null, update it\n"));\r
     //\r
     // Find all EFI_HANDLES\r
     //\r
-    Status = gBS->LocateHandleBuffer(\r
-                 AllHandles,\r
-                 NULL,\r
-                 NULL,\r
-                 &NumAllHandles,\r
-                 &AllHandlesBuffer\r
-                 );\r
-    if (EFI_ERROR(Status)) {\r
-      DEBUG ((DEBUG_INFO, "LocateHandleBuffer for AllHandles failed %r\n", Status ));\r
+    Status = gBS->LocateHandleBuffer (\r
+                    AllHandles,\r
+                    NULL,\r
+                    NULL,\r
+                    &NumAllHandles,\r
+                    &AllHandlesBuffer\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      DEBUG ((DEBUG_INFO, "LocateHandleBuffer for AllHandles failed %r\n", Status));\r
       return FALSE;\r
     }\r
 \r
     //\r
     // Try component Name2\r
     //\r
-    if (!OpalDriverGetDeviceNameByProtocol(AllHandlesBuffer, NumAllHandles, Dev, FALSE)) {\r
-      DEBUG((DEBUG_ERROR | DEBUG_INIT, "ComponentName2 failed to get device name, try ComponentName\n"));\r
-      if (!OpalDriverGetDeviceNameByProtocol(AllHandlesBuffer, NumAllHandles, Dev, TRUE)) {\r
-        DEBUG((DEBUG_ERROR | DEBUG_INIT, "ComponentName failed to get device name, skip device\n"));\r
+    if (!OpalDriverGetDeviceNameByProtocol (AllHandlesBuffer, NumAllHandles, Dev, FALSE)) {\r
+      DEBUG ((DEBUG_ERROR | DEBUG_INIT, "ComponentName2 failed to get device name, try ComponentName\n"));\r
+      if (!OpalDriverGetDeviceNameByProtocol (AllHandlesBuffer, NumAllHandles, Dev, TRUE)) {\r
+        DEBUG ((DEBUG_ERROR | DEBUG_INIT, "ComponentName failed to get device name, skip device\n"));\r
         return FALSE;\r
       }\r
     }\r
@@ -2587,13 +2632,13 @@ OpalDriverGetDriverDeviceName(
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-EfiDriverEntryPoint(\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE*  SystemTable\r
+EfiDriverEntryPoint (\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  EFI_EVENT                      EndOfDxeEvent;\r
+  EFI_STATUS  Status;\r
+  EFI_EVENT   EndOfDxeEvent;\r
 \r
   Status = EfiLibInstallDriverBindingComponentName2 (\r
              ImageHandle,\r
@@ -2604,15 +2649,15 @@ EfiDriverEntryPoint(
              &gOpalComponentName2\r
              );\r
 \r
-  if (EFI_ERROR(Status)) {\r
-    DEBUG((DEBUG_ERROR, "Install protocols to Opal driver Handle failed\n"));\r
-    return Status ;\r
+  if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_ERROR, "Install protocols to Opal driver Handle failed\n"));\r
+    return Status;\r
   }\r
 \r
   //\r
   // Initialize Driver object\r
   //\r
-  ZeroMem(&mOpalDriver, sizeof(mOpalDriver));\r
+  ZeroMem (&mOpalDriver, sizeof (mOpalDriver));\r
   mOpalDriver.Handle = ImageHandle;\r
 \r
   Status = gBS->CreateEventEx (\r
@@ -2628,7 +2673,7 @@ EfiDriverEntryPoint(
   //\r
   // Install Hii packages.\r
   //\r
-  HiiInstall();\r
+  HiiInstall ();\r
 \r
   return Status;\r
 }\r
@@ -2659,14 +2704,14 @@ EfiDriverEntryPoint(
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-OpalEfiDriverBindingSupported(\r
-  IN EFI_DRIVER_BINDING_PROTOCOLThis,\r
+OpalEfiDriverBindingSupported (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL*    RemainingDevicePath\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                              Status;\r
-  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL*  SecurityCommand;\r
+  EFI_STATUS                             Status;\r
+  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *SecurityCommand;\r
 \r
   if (mOpalEndOfDxe) {\r
     return EFI_UNSUPPORTED;\r
@@ -2675,33 +2720,32 @@ OpalEfiDriverBindingSupported(
   //\r
   // Test EFI_STORAGE_SECURITY_COMMAND_PROTOCOL on controller Handle.\r
   //\r
-  Status = gBS->OpenProtocol(\r
-    Controller,\r
-    &gEfiStorageSecurityCommandProtocolGuid,\r
-    ( VOID ** )&SecurityCommand,\r
-    This->DriverBindingHandle,\r
-    Controller,\r
-    EFI_OPEN_PROTOCOL_BY_DRIVER\r
-    );\r
+  Status = gBS->OpenProtocol (\r
+                  Controller,\r
+                  &gEfiStorageSecurityCommandProtocolGuid,\r
+                  (VOID **)&SecurityCommand,\r
+                  This->DriverBindingHandle,\r
+                  Controller,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
 \r
   if (Status == EFI_ALREADY_STARTED) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   //\r
   // Close protocol and reopen in Start call\r
   //\r
-  gBS->CloseProtocol(\r
-      Controller,\r
-      &gEfiStorageSecurityCommandProtocolGuid,\r
-      This->DriverBindingHandle,\r
-      Controller\r
-      );\r
-\r
+  gBS->CloseProtocol (\r
+         Controller,\r
+         &gEfiStorageSecurityCommandProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -2739,23 +2783,24 @@ OpalEfiDriverBindingSupported(
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-OpalEfiDriverBindingStart(\r
-  IN EFI_DRIVER_BINDING_PROTOCOLThis,\r
+OpalEfiDriverBindingStart (\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
   IN EFI_HANDLE                   Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL*    RemainingDevicePath\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_BLOCK_IO_PROTOCOL       *BlkIo;\r
-  OPAL_DRIVER_DEVICE          *Dev;\r
-  OPAL_DRIVER_DEVICE          *Itr;\r
-  BOOLEAN                     Result;\r
+  EFI_STATUS             Status;\r
+  EFI_BLOCK_IO_PROTOCOL  *BlkIo;\r
+  OPAL_DRIVER_DEVICE     *Dev;\r
+  OPAL_DRIVER_DEVICE     *Itr;\r
+  BOOLEAN                Result;\r
 \r
   Itr = mOpalDriver.DeviceList;\r
   while (Itr != NULL) {\r
     if (Controller == Itr->Handle) {\r
       return EFI_SUCCESS;\r
     }\r
+\r
     Itr = Itr->Next;\r
   }\r
 \r
@@ -2763,25 +2808,26 @@ OpalEfiDriverBindingStart(
   // Create internal device for tracking.  This allows all disks to be tracked\r
   // by same HII form\r
   //\r
-  Dev = (OPAL_DRIVER_DEVICE*)AllocateZeroPool(sizeof(OPAL_DRIVER_DEVICE));\r
+  Dev = (OPAL_DRIVER_DEVICE *)AllocateZeroPool (sizeof (OPAL_DRIVER_DEVICE));\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   Dev->Handle = Controller;\r
 \r
   //\r
   // Open EFI_STORAGE_SECURITY_COMMAND_PROTOCOL to perform Opal supported checks\r
   //\r
-  Status = gBS->OpenProtocol(\r
-    Controller,\r
-    &gEfiStorageSecurityCommandProtocolGuid,\r
-    (VOID **)&Dev->Sscp,\r
-    This->DriverBindingHandle,\r
-    Controller,\r
-    EFI_OPEN_PROTOCOL_BY_DRIVER\r
-    );\r
-  if (EFI_ERROR(Status)) {\r
-    FreePool(Dev);\r
+  Status = gBS->OpenProtocol (\r
+                  Controller,\r
+                  &gEfiStorageSecurityCommandProtocolGuid,\r
+                  (VOID **)&Dev->Sscp,\r
+                  This->DriverBindingHandle,\r
+                  Controller,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    FreePool (Dev);\r
     return Status;\r
   }\r
 \r
@@ -2789,32 +2835,32 @@ OpalEfiDriverBindingStart(
   // Open EFI_BLOCK_IO_PROTOCOL on controller Handle, required by EFI_STORAGE_SECURITY_COMMAND_PROTOCOL\r
   // function APIs\r
   //\r
-  Status = gBS->OpenProtocol(\r
-    Controller,\r
-    &gEfiBlockIoProtocolGuid,\r
-    (VOID **)&BlkIo,\r
-    This->DriverBindingHandle,\r
-    Controller,\r
-    EFI_OPEN_PROTOCOL_BY_DRIVER\r
-    );\r
-  if (EFI_ERROR(Status)) {\r
+  Status = gBS->OpenProtocol (\r
+                  Controller,\r
+                  &gEfiBlockIoProtocolGuid,\r
+                  (VOID **)&BlkIo,\r
+                  This->DriverBindingHandle,\r
+                  Controller,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
     //\r
     // Block_IO not supported on handle\r
     //\r
-    if(Status == EFI_UNSUPPORTED) {\r
+    if (Status == EFI_UNSUPPORTED) {\r
       BlkIo = NULL;\r
     } else {\r
       //\r
       // Close storage security that was opened\r
       //\r
-      gBS->CloseProtocol(\r
-          Controller,\r
-          &gEfiStorageSecurityCommandProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Controller\r
-          );\r
+      gBS->CloseProtocol (\r
+             Controller,\r
+             &gEfiStorageSecurityCommandProtocolGuid,\r
+             This->DriverBindingHandle,\r
+             Controller\r
+             );\r
 \r
-      FreePool(Dev);\r
+      FreePool (Dev);\r
       return Status;\r
     }\r
   }\r
@@ -2822,18 +2868,18 @@ OpalEfiDriverBindingStart(
   //\r
   // Save mediaId\r
   //\r
-  if(BlkIo == NULL) {\r
+  if (BlkIo == NULL) {\r
     // If no Block IO present, use defined MediaId value.\r
     Dev->MediaId = 0x0;\r
   } else {\r
     Dev->MediaId = BlkIo->Media->MediaId;\r
 \r
-    gBS->CloseProtocol(\r
-      Controller,\r
-      &gEfiBlockIoProtocolGuid,\r
-      This->DriverBindingHandle,\r
-      Controller\r
-    );\r
+    gBS->CloseProtocol (\r
+           Controller,\r
+           &gEfiBlockIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Controller\r
+           );\r
   }\r
 \r
   //\r
@@ -2849,7 +2895,7 @@ OpalEfiDriverBindingStart(
     goto Done;\r
   }\r
 \r
-  AddDeviceToTail(Dev);\r
+  AddDeviceToTail (Dev);\r
 \r
   //\r
   // Check if device is locked and prompt for password.\r
@@ -2867,14 +2913,14 @@ Done:
   //\r
   // free device, close protocols and exit\r
   //\r
-  gBS->CloseProtocol(\r
-      Controller,\r
-      &gEfiStorageSecurityCommandProtocolGuid,\r
-      This->DriverBindingHandle,\r
-      Controller\r
-      );\r
+  gBS->CloseProtocol (\r
+         Controller,\r
+         &gEfiStorageSecurityCommandProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
-  FreePool(Dev);\r
+  FreePool (Dev);\r
 \r
   return EFI_DEVICE_ERROR;\r
 }\r
@@ -2894,14 +2940,14 @@ Done:
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-OpalEfiDriverBindingStop(\r
-  EFI_DRIVER_BINDING_PROTOCOL*    This,\r
-  EFI_HANDLE                      Controller,\r
-  UINTN                           NumberOfChildren,\r
-  EFI_HANDLE*                     ChildHandleBuffer\r
+OpalEfiDriverBindingStop (\r
+  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  EFI_HANDLE                   Controller,\r
+  UINTN                        NumberOfChildren,\r
+  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  OPAL_DRIVER_DEVICE*   Itr;\r
+  OPAL_DRIVER_DEVICE  *Itr;\r
 \r
   Itr = mOpalDriver.DeviceList;\r
 \r
@@ -2920,7 +2966,6 @@ OpalEfiDriverBindingStop(
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Unloads UEFI Driver.  Very useful for debugging and testing.\r
 \r
@@ -2932,11 +2977,11 @@ OpalEfiDriverBindingStop(
 EFI_STATUS\r
 EFIAPI\r
 OpalEfiDriverUnload (\r
-  IN EFI_HANDLE ImageHandle\r
+  IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                     Status;\r
-  OPAL_DRIVER_DEVICE                   *Itr;\r
+  EFI_STATUS          Status;\r
+  OPAL_DRIVER_DEVICE  *Itr;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -2953,14 +2998,13 @@ OpalEfiDriverUnload (
     // Remove OPAL_DRIVER_DEVICE from the list\r
     // it updates the controllerList pointer\r
     //\r
-    OpalDriverStopDevice(Itr);\r
+    OpalDriverStopDevice (Itr);\r
   }\r
 \r
   //\r
   // Uninstall the HII capability\r
   //\r
-  Status = HiiUninstall();\r
+  Status = HiiUninstall ();\r
 \r
   return Status;\r
 }\r
-\r