]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Bus / Ata / AtaAtapiPassThru / AtaAtapiPassThru.c
index 1c94b5f39d9a44d0e333acd6751cc64a31190a52..1070516b358a847450afd6a7f38c796f688c2231 100644 (file)
@@ -12,7 +12,7 @@
 //\r
 //  EFI_DRIVER_BINDING_PROTOCOL instance\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gAtaAtapiPassThruDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gAtaAtapiPassThruDriverBinding = {\r
   AtaAtapiPassThruSupported,\r
   AtaAtapiPassThruStart,\r
   AtaAtapiPassThruStop,\r
@@ -21,7 +21,7 @@ EFI_DRIVER_BINDING_PROTOCOL gAtaAtapiPassThruDriverBinding = {
   NULL\r
 };\r
 \r
-ATA_ATAPI_PASS_THRU_INSTANCE gAtaAtapiPassThruInstanceTemplate = {\r
+ATA_ATAPI_PASS_THRU_INSTANCE  gAtaAtapiPassThruInstanceTemplate = {\r
   ATA_ATAPI_PASS_THRU_SIGNATURE,\r
   0,                  // Controller Handle\r
   NULL,               // PciIo Protocol\r
@@ -78,8 +78,8 @@ ATA_ATAPI_PASS_THRU_INSTANCE gAtaAtapiPassThruInstanceTemplate = {
   },\r
   EfiAtaUnknownMode,  // Work Mode\r
   {                   // IdeRegisters\r
-    {0},\r
-    {0}\r
+    { 0 },\r
+    { 0 }\r
   },\r
   {                   // AhciRegisters\r
     0\r
@@ -101,13 +101,13 @@ ATA_ATAPI_PASS_THRU_INSTANCE gAtaAtapiPassThruInstanceTemplate = {
   }\r
 };\r
 \r
-ATAPI_DEVICE_PATH    mAtapiDevicePathTemplate = {\r
+ATAPI_DEVICE_PATH  mAtapiDevicePathTemplate = {\r
   {\r
     MESSAGING_DEVICE_PATH,\r
     MSG_ATAPI_DP,\r
     {\r
-      (UINT8) (sizeof (ATAPI_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (ATAPI_DEVICE_PATH)) >> 8)\r
+      (UINT8)(sizeof (ATAPI_DEVICE_PATH)),\r
+      (UINT8)((sizeof (ATAPI_DEVICE_PATH)) >> 8)\r
     }\r
   },\r
   0,\r
@@ -115,13 +115,13 @@ ATAPI_DEVICE_PATH    mAtapiDevicePathTemplate = {
   0\r
 };\r
 \r
-SATA_DEVICE_PATH    mSataDevicePathTemplate = {\r
+SATA_DEVICE_PATH  mSataDevicePathTemplate = {\r
   {\r
     MESSAGING_DEVICE_PATH,\r
     MSG_SATA_DP,\r
     {\r
-      (UINT8) (sizeof (SATA_DEVICE_PATH)),\r
-      (UINT8) ((sizeof (SATA_DEVICE_PATH)) >> 8)\r
+      (UINT8)(sizeof (SATA_DEVICE_PATH)),\r
+      (UINT8)((sizeof (SATA_DEVICE_PATH)) >> 8)\r
     }\r
   },\r
   0,\r
@@ -129,15 +129,15 @@ SATA_DEVICE_PATH    mSataDevicePathTemplate = {
   0\r
 };\r
 \r
-UINT8 mScsiId[TARGET_MAX_BYTES] = {\r
+UINT8  mScsiId[TARGET_MAX_BYTES] = {\r
   0xFF, 0xFF, 0xFF, 0xFF,\r
   0xFF, 0xFF, 0xFF, 0xFF,\r
   0xFF, 0xFF, 0xFF, 0xFF,\r
   0xFF, 0xFF, 0xFF, 0xFF\r
 };\r
 \r
-EDKII_ATA_ATAPI_POLICY_PROTOCOL *mAtaAtapiPolicy;\r
-EDKII_ATA_ATAPI_POLICY_PROTOCOL mDefaultAtaAtapiPolicy = {\r
+EDKII_ATA_ATAPI_POLICY_PROTOCOL  *mAtaAtapiPolicy;\r
+EDKII_ATA_ATAPI_POLICY_PROTOCOL  mDefaultAtaAtapiPolicy = {\r
   EDKII_ATA_ATAPI_POLICY_VERSION,\r
   2,  // PuisEnable\r
   0,  // DeviceSleepEnable\r
@@ -183,11 +183,11 @@ EDKII_ATA_ATAPI_POLICY_PROTOCOL mDefaultAtaAtapiPolicy = {
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruPassThruExecute (\r
-  IN     UINT16                           Port,\r
-  IN     UINT16                           PortMultiplierPort,\r
-  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET *Packet,\r
-  IN     ATA_ATAPI_PASS_THRU_INSTANCE     *Instance,\r
-  IN     ATA_NONBLOCK_TASK                *Task OPTIONAL\r
+  IN     UINT16                            Port,\r
+  IN     UINT16                            PortMultiplierPort,\r
+  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET  *Packet,\r
+  IN     ATA_ATAPI_PASS_THRU_INSTANCE      *Instance,\r
+  IN     ATA_NONBLOCK_TASK                 *Task OPTIONAL\r
   )\r
 {\r
   EFI_ATA_PASS_THRU_CMD_PROTOCOL  Protocol;\r
@@ -271,11 +271,12 @@ AtaPassThruPassThruExecute (
                      Task\r
                      );\r
           break;\r
-        default :\r
+        default:\r
           return EFI_UNSUPPORTED;\r
       }\r
+\r
       break;\r
-    case EfiAtaAhciMode :\r
+    case EfiAtaAhciMode:\r
       if (PortMultiplierPort == 0xFFFF) {\r
         //\r
         // If there is no port multiplier, PortMultiplierPort will be 0xFFFF\r
@@ -284,6 +285,7 @@ AtaPassThruPassThruExecute (
         //\r
         PortMultiplierPort = 0;\r
       }\r
+\r
       switch (Protocol) {\r
         case EFI_ATA_PASS_THRU_PROTOCOL_ATA_NON_DATA:\r
           Status = AhciNonDataTransfer (\r
@@ -367,9 +369,10 @@ AtaPassThruPassThruExecute (
                      Task\r
                      );\r
           break;\r
-        default :\r
+        default:\r
           return EFI_UNSUPPORTED;\r
       }\r
+\r
       break;\r
 \r
     default:\r
@@ -392,16 +395,16 @@ VOID
 EFIAPI\r
 AsyncNonBlockingTransferRoutine (\r
   EFI_EVENT  Event,\r
-  VOID*      Context\r
+  VOID       *Context\r
   )\r
 {\r
-  LIST_ENTRY                   *Entry;\r
-  LIST_ENTRY                   *EntryHeader;\r
-  ATA_NONBLOCK_TASK            *Task;\r
-  EFI_STATUS                   Status;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE *Instance;\r
+  LIST_ENTRY                    *Entry;\r
+  LIST_ENTRY                    *EntryHeader;\r
+  ATA_NONBLOCK_TASK             *Task;\r
+  EFI_STATUS                    Status;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
 \r
-  Instance   = (ATA_ATAPI_PASS_THRU_INSTANCE *) Context;\r
+  Instance    = (ATA_ATAPI_PASS_THRU_INSTANCE *)Context;\r
   EntryHeader = &Instance->NonBlockingTaskList;\r
   //\r
   // Get the Tasks from the Tasks List and execute it, until there is\r
@@ -459,11 +462,11 @@ AsyncNonBlockingTransferRoutine (
 EFI_STATUS\r
 EFIAPI\r
 InitializeAtaAtapiPassThru (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Install driver model protocol(s).\r
@@ -526,9 +529,9 @@ InitializeAtaAtapiPassThru (
 EFI_STATUS\r
 EFIAPI\r
 AtaAtapiPassThruSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL       *This,\r
-  IN EFI_HANDLE                        Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL          *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   EFI_STATUS                        Status;\r
@@ -544,7 +547,7 @@ AtaAtapiPassThruSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID *) &ParentDevicePath,\r
+                  (VOID *)&ParentDevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -555,20 +558,21 @@ AtaAtapiPassThruSupported (
     //\r
     return Status;\r
   }\r
+\r
   //\r
   // Close the protocol because we don't use it here\r
   //\r
   gBS->CloseProtocol (\r
-                  Controller,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  This->DriverBindingHandle,\r
-                  Controller\r
-                  );\r
+         Controller,\r
+         &gEfiDevicePathProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiIdeControllerInitProtocolGuid,\r
-                  (VOID **) &IdeControllerInit,\r
+                  (VOID **)&IdeControllerInit,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -585,11 +589,11 @@ AtaAtapiPassThruSupported (
   // Close the I/O Abstraction(s) used to perform the supported test\r
   //\r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiIdeControllerInitProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiIdeControllerInitProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   //\r
   // Now test the EfiPciIoProtocol\r
@@ -597,7 +601,7 @@ AtaAtapiPassThruSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -605,6 +609,7 @@ AtaAtapiPassThruSupported (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Now further check the PCI header: Base class (offset 0x0B) and\r
   // Sub Class (offset 0x0A). This controller should be an ATA controller\r
@@ -665,9 +670,9 @@ AtaAtapiPassThruSupported (
 EFI_STATUS\r
 EFIAPI\r
 AtaAtapiPassThruStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL        *This,\r
-  IN EFI_HANDLE                         Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL           *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   EFI_STATUS                        Status;\r
@@ -684,14 +689,14 @@ AtaAtapiPassThruStart (
 \r
   DEBUG ((DEBUG_INFO, "==AtaAtapiPassThru Start== Controller = %x\n", Controller));\r
 \r
-  Status  = gBS->OpenProtocol (\r
-                   Controller,\r
-                   &gEfiIdeControllerInitProtocolGuid,\r
-                   (VOID **) &IdeControllerInit,\r
-                   This->DriverBindingHandle,\r
-                   Controller,\r
-                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
-                   );\r
+  Status = gBS->OpenProtocol (\r
+                  Controller,\r
+                  &gEfiIdeControllerInitProtocolGuid,\r
+                  (VOID **)&IdeControllerInit,\r
+                  This->DriverBindingHandle,\r
+                  Controller,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "Open Ide_Controller_Init Error, Status=%r", Status));\r
@@ -701,7 +706,7 @@ AtaAtapiPassThruStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -730,12 +735,12 @@ AtaAtapiPassThruStart (
                     );\r
   if (!EFI_ERROR (Status)) {\r
     EnabledPciAttributes &= (UINT64)EFI_PCI_DEVICE_ENABLE;\r
-    Status = PciIo->Attributes (\r
-                      PciIo,\r
-                      EfiPciIoAttributeOperationEnable,\r
-                      EnabledPciAttributes,\r
-                      NULL\r
-                      );\r
+    Status                = PciIo->Attributes (\r
+                                     PciIo,\r
+                                     EfiPciIoAttributeOperationEnable,\r
+                                     EnabledPciAttributes,\r
+                                     NULL\r
+                                     );\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -765,8 +770,8 @@ AtaAtapiPassThruStart (
   Instance->OriginalPciAttributes = OriginalPciAttributes;\r
   Instance->AtaPassThru.Mode      = &Instance->AtaPassThruMode;\r
   Instance->ExtScsiPassThru.Mode  = &Instance->ExtScsiPassThruMode;\r
-  InitializeListHead(&Instance->DeviceList);\r
-  InitializeListHead(&Instance->NonBlockingTaskList);\r
+  InitializeListHead (&Instance->DeviceList);\r
+  InitializeListHead (&Instance->NonBlockingTaskList);\r
 \r
   Instance->TimerEvent = NULL;\r
 \r
@@ -799,8 +804,10 @@ AtaAtapiPassThruStart (
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Controller,\r
-                  &gEfiAtaPassThruProtocolGuid, &(Instance->AtaPassThru),\r
-                  &gEfiExtScsiPassThruProtocolGuid, &(Instance->ExtScsiPassThru),\r
+                  &gEfiAtaPassThruProtocolGuid,\r
+                  &(Instance->AtaPassThru),\r
+                  &gEfiExtScsiPassThruProtocolGuid,\r
+                  &(Instance->ExtScsiPassThru),\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
@@ -828,6 +835,7 @@ ErrorExit:
     DestroyDeviceInfoList (Instance);\r
     FreePool (Instance);\r
   }\r
+\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
@@ -860,24 +868,24 @@ ErrorExit:
 EFI_STATUS\r
 EFIAPI\r
 AtaAtapiPassThruStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL       *This,\r
-  IN  EFI_HANDLE                        Controller,\r
-  IN  UINTN                             NumberOfChildren,\r
-  IN  EFI_HANDLE                        *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE      *Instance;\r
-  EFI_ATA_PASS_THRU_PROTOCOL        *AtaPassThru;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  EFI_AHCI_REGISTERS                *AhciRegisters;\r
+  EFI_STATUS                    Status;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  EFI_ATA_PASS_THRU_PROTOCOL    *AtaPassThru;\r
+  EFI_PCI_IO_PROTOCOL           *PciIo;\r
+  EFI_AHCI_REGISTERS            *AhciRegisters;\r
 \r
   DEBUG ((DEBUG_INFO, "==AtaAtapiPassThru Stop== Controller = %x\n", Controller));\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiAtaPassThruProtocolGuid,\r
-                  (VOID **) &AtaPassThru,\r
+                  (VOID **)&AtaPassThru,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -891,8 +899,10 @@ AtaAtapiPassThruStop (
 \r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   Controller,\r
-                  &gEfiAtaPassThruProtocolGuid, &(Instance->AtaPassThru),\r
-                  &gEfiExtScsiPassThruProtocolGuid, &(Instance->ExtScsiPassThru),\r
+                  &gEfiAtaPassThruProtocolGuid,\r
+                  &(Instance->AtaPassThru),\r
+                  &gEfiExtScsiPassThruProtocolGuid,\r
+                  &(Instance->ExtScsiPassThru),\r
                   NULL\r
                   );\r
 \r
@@ -917,6 +927,7 @@ AtaAtapiPassThruStop (
     gBS->CloseEvent (Instance->TimerEvent);\r
     Instance->TimerEvent = NULL;\r
   }\r
+\r
   DestroyAsynTaskList (Instance, FALSE);\r
   //\r
   // Free allocated resource\r
@@ -947,7 +958,7 @@ AtaAtapiPassThruStop (
              );\r
     PciIo->FreeBuffer (\r
              PciIo,\r
-             EFI_SIZE_TO_PAGES ((UINTN) AhciRegisters->MaxCommandTableSize),\r
+             EFI_SIZE_TO_PAGES ((UINTN)AhciRegisters->MaxCommandTableSize),\r
              AhciRegisters->AhciCommandTable\r
              );\r
     PciIo->Unmap (\r
@@ -956,7 +967,7 @@ AtaAtapiPassThruStop (
              );\r
     PciIo->FreeBuffer (\r
              PciIo,\r
-             EFI_SIZE_TO_PAGES ((UINTN) AhciRegisters->MaxCommandListSize),\r
+             EFI_SIZE_TO_PAGES ((UINTN)AhciRegisters->MaxCommandListSize),\r
              AhciRegisters->AhciCmdList\r
              );\r
     PciIo->Unmap (\r
@@ -965,7 +976,7 @@ AtaAtapiPassThruStop (
              );\r
     PciIo->FreeBuffer (\r
              PciIo,\r
-             EFI_SIZE_TO_PAGES ((UINTN) AhciRegisters->MaxReceiveFisSize),\r
+             EFI_SIZE_TO_PAGES ((UINTN)AhciRegisters->MaxReceiveFisSize),\r
              AhciRegisters->AhciRFis\r
              );\r
   }\r
@@ -1002,9 +1013,9 @@ LIST_ENTRY *
 EFIAPI\r
 SearchDeviceInfoList (\r
   IN  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance,\r
-  IN  UINT16                         Port,\r
-  IN  UINT16                         PortMultiplier,\r
-  IN  EFI_ATA_DEVICE_TYPE            DeviceType\r
+  IN  UINT16                        Port,\r
+  IN  UINT16                        PortMultiplier,\r
+  IN  EFI_ATA_DEVICE_TYPE           DeviceType\r
   )\r
 {\r
   EFI_ATA_DEVICE_INFO  *DeviceInfo;\r
@@ -1022,13 +1033,15 @@ SearchDeviceInfoList (
     //\r
     if ((Instance->Mode == EfiAtaAhciMode) &&\r
         (DeviceInfo->Type == EfiIdeCdrom) &&\r
-        (PortMultiplier == 0xFF)) {\r
-        PortMultiplier = 0xFFFF;\r
+        (PortMultiplier == 0xFF))\r
+    {\r
+      PortMultiplier = 0xFFFF;\r
     }\r
 \r
     if ((DeviceInfo->Type == DeviceType) &&\r
         (Port == DeviceInfo->Port) &&\r
-        (PortMultiplier == DeviceInfo->PortMultiplier)) {\r
+        (PortMultiplier == DeviceInfo->PortMultiplier))\r
+    {\r
       return Node;\r
     }\r
 \r
@@ -1056,11 +1069,11 @@ SearchDeviceInfoList (
 EFI_STATUS\r
 EFIAPI\r
 CreateNewDeviceInfo (\r
-  IN  ATA_ATAPI_PASS_THRU_INSTANCE   *Instance,\r
-  IN  UINT16                         Port,\r
-  IN  UINT16                         PortMultiplier,\r
-  IN  EFI_ATA_DEVICE_TYPE            DeviceType,\r
-  IN  EFI_IDENTIFY_DATA              *IdentifyData\r
+  IN  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance,\r
+  IN  UINT16                        Port,\r
+  IN  UINT16                        PortMultiplier,\r
+  IN  EFI_ATA_DEVICE_TYPE           DeviceType,\r
+  IN  EFI_IDENTIFY_DATA             *IdentifyData\r
   )\r
 {\r
   EFI_ATA_DEVICE_INFO  *DeviceInfo;\r
@@ -1114,6 +1127,7 @@ DestroyDeviceInfoList (
     if (DeviceInfo->IdentifyData != NULL) {\r
       FreePool (DeviceInfo->IdentifyData);\r
     }\r
+\r
     FreePool (DeviceInfo);\r
   }\r
 }\r
@@ -1129,14 +1143,14 @@ DestroyDeviceInfoList (
 VOID\r
 EFIAPI\r
 DestroyAsynTaskList (\r
-  IN ATA_ATAPI_PASS_THRU_INSTANCE *Instance,\r
+  IN ATA_ATAPI_PASS_THRU_INSTANCE  *Instance,\r
   IN BOOLEAN                       IsSigEvent\r
   )\r
 {\r
-  LIST_ENTRY           *Entry;\r
-  LIST_ENTRY           *DelEntry;\r
-  ATA_NONBLOCK_TASK    *Task;\r
-  EFI_TPL              OldTpl;\r
+  LIST_ENTRY         *Entry;\r
+  LIST_ENTRY         *DelEntry;\r
+  ATA_NONBLOCK_TASK  *Task;\r
+  EFI_TPL            OldTpl;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   if (!IsListEmpty (&Instance->NonBlockingTaskList)) {\r
@@ -1144,8 +1158,9 @@ DestroyAsynTaskList (
     // Free the Subtask list.\r
     //\r
     for (Entry = (&Instance->NonBlockingTaskList)->ForwardLink;\r
-        Entry != (&Instance->NonBlockingTaskList);\r
-       ) {\r
+         Entry != (&Instance->NonBlockingTaskList);\r
+         )\r
+    {\r
       DelEntry = Entry;\r
       Entry    = Entry->ForwardLink;\r
       Task     = ATA_NON_BLOCK_TASK_FROM_ENTRY (DelEntry);\r
@@ -1155,9 +1170,11 @@ DestroyAsynTaskList (
         Task->Packet->Asb->AtaStatus = 0x01;\r
         gBS->SignalEvent (Task->Event);\r
       }\r
+\r
       FreePool (Task);\r
     }\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
 }\r
 \r
@@ -1175,12 +1192,12 @@ DestroyAsynTaskList (
 EFI_STATUS\r
 EFIAPI\r
 EnumerateAttachedDevice (\r
-  IN  ATA_ATAPI_PASS_THRU_INSTANCE      *Instance\r
+  IN  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  PCI_TYPE00                   PciData;\r
-  UINT8                        ClassCode;\r
+  EFI_STATUS  Status;\r
+  PCI_TYPE00  PciData;\r
+  UINT8       ClassCode;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1196,7 +1213,7 @@ EnumerateAttachedDevice (
   ClassCode = PciData.Hdr.ClassCode[1];\r
 \r
   switch (ClassCode) {\r
-    case PCI_CLASS_MASS_STORAGE_IDE :\r
+    case PCI_CLASS_MASS_STORAGE_IDE:\r
       //\r
       // The ATA controller is working at IDE mode\r
       //\r
@@ -1207,8 +1224,9 @@ EnumerateAttachedDevice (
         Status = EFI_DEVICE_ERROR;\r
         goto Done;\r
       }\r
+\r
       break;\r
-    case PCI_CLASS_MASS_STORAGE_SATADPA :\r
+    case PCI_CLASS_MASS_STORAGE_SATADPA:\r
       //\r
       // The ATA controller is working at AHCI mode\r
       //\r
@@ -1222,7 +1240,7 @@ EnumerateAttachedDevice (
       }\r
 \r
       break;\r
-    default :\r
+    default:\r
       Status = EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1262,41 +1280,41 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruPassThru (\r
-  IN     EFI_ATA_PASS_THRU_PROTOCOL       *This,\r
-  IN     UINT16                           Port,\r
-  IN     UINT16                           PortMultiplierPort,\r
-  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET *Packet,\r
-  IN     EFI_EVENT                        Event OPTIONAL\r
+  IN     EFI_ATA_PASS_THRU_PROTOCOL        *This,\r
+  IN     UINT16                            Port,\r
+  IN     UINT16                            PortMultiplierPort,\r
+  IN OUT EFI_ATA_PASS_THRU_COMMAND_PACKET  *Packet,\r
+  IN     EFI_EVENT                         Event OPTIONAL\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
-  EFI_ATA_DEVICE_INFO             *DeviceInfo;\r
-  EFI_IDENTIFY_DATA               *IdentifyData;\r
-  UINT64                          Capacity;\r
-  UINT32                          MaxSectorCount;\r
-  ATA_NONBLOCK_TASK               *Task;\r
-  EFI_TPL                         OldTpl;\r
-  UINT32                          BlockSize;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
+  EFI_ATA_DEVICE_INFO           *DeviceInfo;\r
+  EFI_IDENTIFY_DATA             *IdentifyData;\r
+  UINT64                        Capacity;\r
+  UINT32                        MaxSectorCount;\r
+  ATA_NONBLOCK_TASK             *Task;\r
+  EFI_TPL                       OldTpl;\r
+  UINT32                        BlockSize;\r
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED(Packet->InDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED(Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED(Packet->Asb, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->Asb, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Node = SearchDeviceInfoList (Instance, Port, PortMultiplierPort, EfiIdeHarddisk);\r
 \r
   if (Node == NULL) {\r
-    Node = SearchDeviceInfoList(Instance, Port, PortMultiplierPort, EfiIdeCdrom);\r
+    Node = SearchDeviceInfoList (Instance, Port, PortMultiplierPort, EfiIdeCdrom);\r
     if (Node == NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
@@ -1327,7 +1345,7 @@ AtaPassThruPassThru (
     // Check logical block size\r
     //\r
     if ((IdentifyData->AtaData.phy_logic_sector_support & BIT12) != 0) {\r
-      BlockSize = (UINT32) (((IdentifyData->AtaData.logic_sector_size_hi << 16) | IdentifyData->AtaData.logic_sector_size_lo) * sizeof (UINT16));\r
+      BlockSize = (UINT32)(((IdentifyData->AtaData.logic_sector_size_hi << 16) | IdentifyData->AtaData.logic_sector_size_lo) * sizeof (UINT16));\r
     }\r
   }\r
 \r
@@ -1335,7 +1353,8 @@ AtaPassThruPassThru (
   // convert the transfer length from sector count to byte.\r
   //\r
   if (((Packet->Length & EFI_ATA_PASS_THRU_LENGTH_BYTES) == 0) &&\r
-       (Packet->InTransferLength != 0)) {\r
+      (Packet->InTransferLength != 0))\r
+  {\r
     Packet->InTransferLength = Packet->InTransferLength * BlockSize;\r
   }\r
 \r
@@ -1343,7 +1362,8 @@ AtaPassThruPassThru (
   // convert the transfer length from sector count to byte.\r
   //\r
   if (((Packet->Length & EFI_ATA_PASS_THRU_LENGTH_BYTES) == 0) &&\r
-       (Packet->OutTransferLength != 0)) {\r
+      (Packet->OutTransferLength != 0))\r
+  {\r
     Packet->OutTransferLength = Packet->OutTransferLength * BlockSize;\r
   }\r
 \r
@@ -1353,7 +1373,8 @@ AtaPassThruPassThru (
   // is returned.\r
   //\r
   if (((Packet->InTransferLength != 0) && (Packet->InTransferLength > MaxSectorCount * BlockSize)) ||\r
-      ((Packet->OutTransferLength != 0) && (Packet->OutTransferLength > MaxSectorCount * BlockSize))) {\r
+      ((Packet->OutTransferLength != 0) && (Packet->OutTransferLength > MaxSectorCount * BlockSize)))\r
+  {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
@@ -1372,7 +1393,7 @@ AtaPassThruPassThru (
     Task->Packet         = Packet;\r
     Task->Event          = Event;\r
     Task->IsStart        = FALSE;\r
-    Task->RetryTimes     = DivU64x32(Packet->Timeout, 1000) + 1;\r
+    Task->RetryTimes     = DivU64x32 (Packet->Timeout, 1000) + 1;\r
     if (Packet->Timeout == 0) {\r
       Task->InfiniteWait = TRUE;\r
     } else {\r
@@ -1429,13 +1450,13 @@ AtaPassThruPassThru (
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruGetNextPort (\r
-  IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
-  IN OUT UINT16                 *Port\r
+  IN EFI_ATA_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT16                  *Port\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
-  EFI_ATA_DEVICE_INFO             *DeviceInfo;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
+  EFI_ATA_DEVICE_INFO           *DeviceInfo;\r
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
@@ -1468,7 +1489,8 @@ AtaPassThruGetNextPort (
       DeviceInfo = ATA_ATAPI_DEVICE_INFO_FROM_THIS (Node);\r
 \r
       if ((DeviceInfo->Type == EfiIdeHarddisk) &&\r
-           (DeviceInfo->Port > *Port)){\r
+          (DeviceInfo->Port > *Port))\r
+      {\r
         *Port = DeviceInfo->Port;\r
         goto Exit;\r
       }\r
@@ -1538,14 +1560,14 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruGetNextDevice (\r
-  IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
-  IN UINT16                     Port,\r
-  IN OUT UINT16                 *PortMultiplierPort\r
+  IN EFI_ATA_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT16                      Port,\r
+  IN OUT UINT16                  *PortMultiplierPort\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
-  EFI_ATA_DEVICE_INFO             *DeviceInfo;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
+  EFI_ATA_DEVICE_INFO           *DeviceInfo;\r
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
@@ -1570,8 +1592,9 @@ AtaPassThruGetNextDevice (
       DeviceInfo = ATA_ATAPI_DEVICE_INFO_FROM_THIS (Node);\r
 \r
       if ((DeviceInfo->Type == EfiIdeHarddisk) &&\r
-           (DeviceInfo->Port == Port) &&\r
-           (DeviceInfo->PortMultiplier > *PortMultiplierPort)){\r
+          (DeviceInfo->Port == Port) &&\r
+          (DeviceInfo->PortMultiplier > *PortMultiplierPort))\r
+      {\r
         *PortMultiplierPort = DeviceInfo->PortMultiplier;\r
         goto Exit;\r
       }\r
@@ -1590,7 +1613,8 @@ AtaPassThruGetNextDevice (
       DeviceInfo = ATA_ATAPI_DEVICE_INFO_FROM_THIS (Node);\r
 \r
       if ((DeviceInfo->Type == EfiIdeHarddisk) &&\r
-           (DeviceInfo->Port == Port)){\r
+          (DeviceInfo->Port == Port))\r
+      {\r
         *PortMultiplierPort = DeviceInfo->PortMultiplier;\r
         goto Exit;\r
       }\r
@@ -1650,15 +1674,15 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruBuildDevicePath (\r
-  IN     EFI_ATA_PASS_THRU_PROTOCOL *This,\r
-  IN     UINT16                     Port,\r
-  IN     UINT16                     PortMultiplierPort,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL   **DevicePath\r
+  IN     EFI_ATA_PASS_THRU_PROTOCOL  *This,\r
+  IN     UINT16                      Port,\r
+  IN     UINT16                      PortMultiplierPort,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL    **DevicePath\r
   )\r
 {\r
-  EFI_DEV_PATH                    *DevicePathNode;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
+  EFI_DEV_PATH                  *DevicePathNode;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
@@ -1669,7 +1693,7 @@ AtaPassThruBuildDevicePath (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Node = SearchDeviceInfoList(Instance, Port, PortMultiplierPort, EfiIdeHarddisk);\r
+  Node = SearchDeviceInfoList (Instance, Port, PortMultiplierPort, EfiIdeHarddisk);\r
   if (Node == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -1679,8 +1703,9 @@ AtaPassThruBuildDevicePath (
     if (DevicePathNode == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    DevicePathNode->Atapi.PrimarySecondary = (UINT8) Port;\r
-    DevicePathNode->Atapi.SlaveMaster      = (UINT8) PortMultiplierPort;\r
+\r
+    DevicePathNode->Atapi.PrimarySecondary = (UINT8)Port;\r
+    DevicePathNode->Atapi.SlaveMaster      = (UINT8)PortMultiplierPort;\r
     DevicePathNode->Atapi.Lun              = 0;\r
   } else {\r
     DevicePathNode = AllocateCopyPool (sizeof (SATA_DEVICE_PATH), &mSataDevicePathTemplate);\r
@@ -1693,7 +1718,7 @@ AtaPassThruBuildDevicePath (
     DevicePathNode->Sata.Lun                      = 0;\r
   }\r
 \r
-  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) DevicePathNode;\r
+  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)DevicePathNode;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1737,22 +1762,22 @@ AtaPassThruBuildDevicePath (
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruGetDevice (\r
-  IN  EFI_ATA_PASS_THRU_PROTOCOL *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
-  OUT UINT16                     *Port,\r
-  OUT UINT16                     *PortMultiplierPort\r
+  IN  EFI_ATA_PASS_THRU_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL    *DevicePath,\r
+  OUT UINT16                      *Port,\r
+  OUT UINT16                      *PortMultiplierPort\r
   )\r
 {\r
-  EFI_DEV_PATH                    *DevicePathNode;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
+  EFI_DEV_PATH                  *DevicePathNode;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   //\r
   // Validate parameters passed in.\r
   //\r
-  if (DevicePath == NULL || Port == NULL || PortMultiplierPort == NULL) {\r
+  if ((DevicePath == NULL) || (Port == NULL) || (PortMultiplierPort == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1761,13 +1786,14 @@ AtaPassThruGetDevice (
   //\r
   if ((DevicePath->Type != MESSAGING_DEVICE_PATH) ||\r
       ((DevicePath->SubType != MSG_SATA_DP) &&\r
-      (DevicePath->SubType != MSG_ATAPI_DP)) ||\r
-      ((DevicePathNodeLength(DevicePath) != sizeof(ATAPI_DEVICE_PATH)) &&\r
-      (DevicePathNodeLength(DevicePath) != sizeof(SATA_DEVICE_PATH)))) {\r
+       (DevicePath->SubType != MSG_ATAPI_DP)) ||\r
+      ((DevicePathNodeLength (DevicePath) != sizeof (ATAPI_DEVICE_PATH)) &&\r
+       (DevicePathNodeLength (DevicePath) != sizeof (SATA_DEVICE_PATH))))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  DevicePathNode = (EFI_DEV_PATH *) DevicePath;\r
+  DevicePathNode = (EFI_DEV_PATH *)DevicePath;\r
 \r
   if (Instance->Mode == EfiAtaIdeMode) {\r
     *Port               = DevicePathNode->Atapi.PrimarySecondary;\r
@@ -1777,7 +1803,7 @@ AtaPassThruGetDevice (
     *PortMultiplierPort = DevicePathNode->Sata.PortMultiplierPortNumber;\r
   }\r
 \r
-  Node = SearchDeviceInfoList(Instance, *Port, *PortMultiplierPort, EfiIdeHarddisk);\r
+  Node = SearchDeviceInfoList (Instance, *Port, *PortMultiplierPort, EfiIdeHarddisk);\r
 \r
   if (Node == NULL) {\r
     return EFI_NOT_FOUND;\r
@@ -1813,8 +1839,8 @@ AtaPassThruGetDevice (
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruResetPort (\r
-  IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
-  IN UINT16                     Port\r
+  IN EFI_ATA_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT16                      Port\r
   )\r
 {\r
   //\r
@@ -1857,13 +1883,13 @@ AtaPassThruResetPort (
 EFI_STATUS\r
 EFIAPI\r
 AtaPassThruResetDevice (\r
-  IN EFI_ATA_PASS_THRU_PROTOCOL *This,\r
-  IN UINT16                     Port,\r
-  IN UINT16                     PortMultiplierPort\r
+  IN EFI_ATA_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT16                      Port,\r
+  IN UINT16                      PortMultiplierPort\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
 \r
   Instance = ATA_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
@@ -1900,12 +1926,12 @@ AtaPassThruResetDevice (
 EFI_STATUS\r
 EFIAPI\r
 AtaPacketRequestSense (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL         *This,\r
-  IN  UINT8                                   *Target,\r
-  IN  UINT64                                  Lun,\r
-  IN  VOID                                    *SenseData,\r
-  IN  UINT8                                   SenseDataLength,\r
-  IN  UINT64                                  Timeout\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN  UINT8                            *Target,\r
+  IN  UINT64                           Lun,\r
+  IN  VOID                             *SenseData,\r
+  IN  UINT8                            SenseDataLength,\r
+  IN  UINT64                           Timeout\r
   )\r
 {\r
   EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  Packet;\r
@@ -1974,24 +2000,24 @@ AtaPacketRequestSense (
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruPassThru (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                    *This,\r
-  IN UINT8                                              *Target,\r
-  IN UINT64                                             Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET     *Packet,\r
-  IN EFI_EVENT                                          Event OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  UINT8                           Port;\r
-  UINT8                           PortMultiplier;\r
-  EFI_ATA_HC_WORK_MODE            Mode;\r
-  LIST_ENTRY                      *Node;\r
-  EFI_ATA_DEVICE_INFO             *DeviceInfo;\r
-  BOOLEAN                         SenseReq;\r
-  EFI_SCSI_SENSE_DATA             *PtrSenseData;\r
-  UINTN                           SenseDataLen;\r
-  EFI_STATUS                      SenseStatus;\r
+  EFI_STATUS                    Status;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  UINT8                         Port;\r
+  UINT8                         PortMultiplier;\r
+  EFI_ATA_HC_WORK_MODE          Mode;\r
+  LIST_ENTRY                    *Node;\r
+  EFI_ATA_DEVICE_INFO           *DeviceInfo;\r
+  BOOLEAN                       SenseReq;\r
+  EFI_SCSI_SENSE_DATA           *PtrSenseData;\r
+  UINTN                         SenseDataLen;\r
+  EFI_STATUS                    SenseStatus;\r
 \r
   SenseDataLen = 0;\r
   Instance     = EXT_SCSI_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
@@ -2004,7 +2030,8 @@ ExtScsiPassThruPassThru (
   // Don't support variable length CDB\r
   //\r
   if ((Packet->CdbLength != 6) && (Packet->CdbLength != 10) &&\r
-      (Packet->CdbLength != 12) && (Packet->CdbLength != 16)) {\r
+      (Packet->CdbLength != 12) && (Packet->CdbLength != 16))\r
+  {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2012,15 +2039,15 @@ ExtScsiPassThruPassThru (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED(Packet->InDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->InDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED(Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->OutDataBuffer, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED(Packet->SenseData, This->Mode->IoAlign)) {\r
+  if ((This->Mode->IoAlign > 1) && !IS_ALIGNED (Packet->SenseData, This->Mode->IoAlign)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2045,7 +2072,7 @@ ExtScsiPassThruPassThru (
   Port           = Target[0];\r
   PortMultiplier = Target[1];\r
 \r
-  Node = SearchDeviceInfoList(Instance, Port, PortMultiplier, EfiIdeCdrom);\r
+  Node = SearchDeviceInfoList (Instance, Port, PortMultiplier, EfiIdeCdrom);\r
   if (Node == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -2057,7 +2084,7 @@ ExtScsiPassThruPassThru (
   // Normally it should NOT be passed down through ExtScsiPassThru protocol interface.\r
   // But to response EFI_DISK_INFO.Identify() request from ScsiDisk, we should handle this command.\r
   //\r
-  if (*((UINT8*)Packet->Cdb) == ATA_CMD_IDENTIFY_DEVICE) {\r
+  if (*((UINT8 *)Packet->Cdb) == ATA_CMD_IDENTIFY_DEVICE) {\r
     CopyMem (Packet->InDataBuffer, DeviceInfo->IdentifyData, sizeof (EFI_IDENTIFY_DATA));\r
     //\r
     // For IDENTIFY DEVICE cmd, we don't need to get sense data.\r
@@ -2088,9 +2115,10 @@ ExtScsiPassThruPassThru (
         //\r
         PortMultiplier = 0;\r
       }\r
+\r
       Status = AhciPacketCommandExecute (Instance->PciIo, &Instance->AhciRegisters, Port, PortMultiplier, Packet);\r
       break;\r
-    default :\r
+    default:\r
       Status = EFI_DEVICE_ERROR;\r
       break;\r
   }\r
@@ -2098,7 +2126,7 @@ ExtScsiPassThruPassThru (
   //\r
   // If the cmd doesn't get executed correctly, then check sense data.\r
   //\r
-  if (EFI_ERROR (Status) && (Packet->SenseDataLength != 0) && (*((UINT8*)Packet->Cdb) != ATA_CMD_REQUEST_SENSE)) {\r
+  if (EFI_ERROR (Status) && (Packet->SenseDataLength != 0) && (*((UINT8 *)Packet->Cdb) != ATA_CMD_REQUEST_SENSE)) {\r
     PtrSenseData = AllocateAlignedPages (EFI_SIZE_TO_PAGES (sizeof (EFI_SCSI_SENSE_DATA)), This->Mode->IoAlign);\r
     if (PtrSenseData == NULL) {\r
       return EFI_DEVICE_ERROR;\r
@@ -2117,7 +2145,7 @@ ExtScsiPassThruPassThru (
         break;\r
       }\r
 \r
-      CopyMem ((UINT8*)Packet->SenseData + SenseDataLen, PtrSenseData, sizeof (EFI_SCSI_SENSE_DATA));\r
+      CopyMem ((UINT8 *)Packet->SenseData + SenseDataLen, PtrSenseData, sizeof (EFI_SCSI_SENSE_DATA));\r
       SenseDataLen += sizeof (EFI_SCSI_SENSE_DATA);\r
 \r
       //\r
@@ -2125,12 +2153,15 @@ ExtScsiPassThruPassThru (
       // skip the loop.\r
       //\r
       if ((PtrSenseData->Sense_Key == EFI_SCSI_SK_NO_SENSE) ||\r
-          (SenseDataLen + sizeof (EFI_SCSI_SENSE_DATA) > Packet->SenseDataLength)) {\r
+          (SenseDataLen + sizeof (EFI_SCSI_SENSE_DATA) > Packet->SenseDataLength))\r
+      {\r
         SenseReq = FALSE;\r
       }\r
     }\r
+\r
     FreeAlignedPages (PtrSenseData, EFI_SIZE_TO_PAGES (sizeof (EFI_SCSI_SENSE_DATA)));\r
   }\r
+\r
   //\r
   // Update the SenseDataLength field to the data length received.\r
   //\r
@@ -2167,20 +2198,20 @@ ExtScsiPassThruPassThru (
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruGetNextTargetLun (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *This,\r
-  IN OUT UINT8                           **Target,\r
-  IN OUT UINT64                          *Lun\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                         **Target,\r
+  IN OUT UINT64                        *Lun\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
-  EFI_ATA_DEVICE_INFO             *DeviceInfo;\r
-  UINT8                           *Target8;\r
-  UINT16                          *Target16;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
+  EFI_ATA_DEVICE_INFO           *DeviceInfo;\r
+  UINT8                         *Target8;\r
+  UINT16                        *Target16;\r
 \r
   Instance = EXT_SCSI_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  if (Target == NULL || Lun == NULL) {\r
+  if ((Target == NULL) || (Lun == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -2191,7 +2222,7 @@ ExtScsiPassThruGetNextTargetLun (
   Target8  = *Target;\r
   Target16 = (UINT16 *)*Target;\r
 \r
-  if (CompareMem(Target8, mScsiId, TARGET_MAX_BYTES) != 0) {\r
+  if (CompareMem (Target8, mScsiId, TARGET_MAX_BYTES) != 0) {\r
     //\r
     // For ATAPI device, we use 2 least significant bytes to represent the location of SCSI device.\r
     // So the higher bytes in Target array should be 0xFF.\r
@@ -2205,7 +2236,8 @@ ExtScsiPassThruGetNextTargetLun (
     // previous target id to see if it is returned by previous call.\r
     //\r
     if ((*Target16 != Instance->PreviousTargetId) ||\r
-        (*Lun != Instance->PreviousLun)) {\r
+        (*Lun != Instance->PreviousLun))\r
+    {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -2223,9 +2255,10 @@ ExtScsiPassThruGetNextTargetLun (
       DeviceInfo = ATA_ATAPI_DEVICE_INFO_FROM_THIS (Node);\r
 \r
       if ((DeviceInfo->Type == EfiIdeCdrom) &&\r
-         ((Target8[0] < DeviceInfo->Port) ||\r
-          ((Target8[0] == DeviceInfo->Port) &&\r
-           (Target8[1] < (UINT8)DeviceInfo->PortMultiplier)))) {\r
+          ((Target8[0] < DeviceInfo->Port) ||\r
+           ((Target8[0] == DeviceInfo->Port) &&\r
+            (Target8[1] < (UINT8)DeviceInfo->PortMultiplier))))\r
+      {\r
         Target8[0] = (UINT8)DeviceInfo->Port;\r
         Target8[1] = (UINT8)DeviceInfo->PortMultiplier;\r
         goto Exit;\r
@@ -2297,16 +2330,16 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruBuildDevicePath (\r
-  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *This,\r
-  IN     UINT8                              *Target,\r
-  IN     UINT64                             Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL           **DevicePath\r
+  IN     EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN     UINT8                            *Target,\r
+  IN     UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL         **DevicePath\r
   )\r
 {\r
-  EFI_DEV_PATH                    *DevicePathNode;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  UINT8                           Port;\r
-  UINT8                           PortMultiplier;\r
+  EFI_DEV_PATH                  *DevicePathNode;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  UINT8                         Port;\r
+  UINT8                         PortMultiplier;\r
 \r
   Instance = EXT_SCSI_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
@@ -2327,7 +2360,7 @@ ExtScsiPassThruBuildDevicePath (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (SearchDeviceInfoList(Instance, Port, PortMultiplier, EfiIdeCdrom) == NULL) {\r
+  if (SearchDeviceInfoList (Instance, Port, PortMultiplier, EfiIdeCdrom) == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -2339,14 +2372,14 @@ ExtScsiPassThruBuildDevicePath (
 \r
     DevicePathNode->Atapi.PrimarySecondary = Port;\r
     DevicePathNode->Atapi.SlaveMaster      = PortMultiplier;\r
-    DevicePathNode->Atapi.Lun              = (UINT16) Lun;\r
+    DevicePathNode->Atapi.Lun              = (UINT16)Lun;\r
   } else {\r
     DevicePathNode = AllocateCopyPool (sizeof (SATA_DEVICE_PATH), &mSataDevicePathTemplate);\r
     if (DevicePathNode == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    DevicePathNode->Sata.HBAPortNumber            = Port;\r
+    DevicePathNode->Sata.HBAPortNumber = Port;\r
     //\r
     // For CD-ROM working in the AHCI mode, only 8 bits are used to record\r
     // the PortMultiplier information. If the CD-ROM is directly attached\r
@@ -2354,10 +2387,10 @@ ExtScsiPassThruBuildDevicePath (
     // to 0xFFFF according to the UEFI spec.\r
     //\r
     DevicePathNode->Sata.PortMultiplierPortNumber = PortMultiplier == 0xFF ? 0xFFFF : PortMultiplier;\r
-    DevicePathNode->Sata.Lun                      = (UINT16) Lun;\r
+    DevicePathNode->Sata.Lun                      = (UINT16)Lun;\r
   }\r
 \r
-  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) DevicePathNode;\r
+  *DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)DevicePathNode;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -2384,54 +2417,56 @@ ExtScsiPassThruBuildDevicePath (
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruGetTargetLun (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *This,\r
-  IN  EFI_DEVICE_PATH_PROTOCOL           *DevicePath,\r
-  OUT UINT8                              **Target,\r
-  OUT UINT64                             *Lun\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN  EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                            **Target,\r
+  OUT UINT64                           *Lun\r
   )\r
 {\r
-  EFI_DEV_PATH                    *DevicePathNode;\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
+  EFI_DEV_PATH                  *DevicePathNode;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
 \r
   Instance = EXT_SCSI_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   //\r
   // Validate parameters passed in.\r
   //\r
-  if (DevicePath == NULL || Target == NULL || Lun == NULL) {\r
+  if ((DevicePath == NULL) || (Target == NULL) || (Lun == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   if (*Target == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // Check whether the DevicePath belongs to SCSI_DEVICE_PATH\r
   //\r
   if ((DevicePath->Type != MESSAGING_DEVICE_PATH) ||\r
       ((DevicePath->SubType != MSG_ATAPI_DP) &&\r
-      (DevicePath->SubType != MSG_SATA_DP)) ||\r
-      ((DevicePathNodeLength(DevicePath) != sizeof(ATAPI_DEVICE_PATH)) &&\r
-      (DevicePathNodeLength(DevicePath) != sizeof(SATA_DEVICE_PATH)))) {\r
+       (DevicePath->SubType != MSG_SATA_DP)) ||\r
+      ((DevicePathNodeLength (DevicePath) != sizeof (ATAPI_DEVICE_PATH)) &&\r
+       (DevicePathNodeLength (DevicePath) != sizeof (SATA_DEVICE_PATH))))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   SetMem (*Target, TARGET_MAX_BYTES, 0xFF);\r
 \r
-  DevicePathNode = (EFI_DEV_PATH *) DevicePath;\r
+  DevicePathNode = (EFI_DEV_PATH *)DevicePath;\r
 \r
   if (Instance->Mode == EfiAtaIdeMode) {\r
-    (*Target)[0] = (UINT8) DevicePathNode->Atapi.PrimarySecondary;\r
-    (*Target)[1] = (UINT8) DevicePathNode->Atapi.SlaveMaster;\r
-    *Lun         = (UINT8) DevicePathNode->Atapi.Lun;\r
+    (*Target)[0] = (UINT8)DevicePathNode->Atapi.PrimarySecondary;\r
+    (*Target)[1] = (UINT8)DevicePathNode->Atapi.SlaveMaster;\r
+    *Lun         = (UINT8)DevicePathNode->Atapi.Lun;\r
   } else {\r
-    (*Target)[0] = (UINT8) DevicePathNode->Sata.HBAPortNumber;\r
-    (*Target)[1] = (UINT8) DevicePathNode->Sata.PortMultiplierPortNumber;\r
-    *Lun         = (UINT8) DevicePathNode->Sata.Lun;\r
+    (*Target)[0] = (UINT8)DevicePathNode->Sata.HBAPortNumber;\r
+    (*Target)[1] = (UINT8)DevicePathNode->Sata.PortMultiplierPortNumber;\r
+    *Lun         = (UINT8)DevicePathNode->Sata.Lun;\r
   }\r
 \r
-  Node = SearchDeviceInfoList(Instance, (*Target)[0], (*Target)[1], EfiIdeCdrom);\r
+  Node = SearchDeviceInfoList (Instance, (*Target)[0], (*Target)[1], EfiIdeCdrom);\r
 \r
   if (Node == NULL) {\r
     return EFI_NOT_FOUND;\r
@@ -2458,7 +2493,7 @@ ExtScsiPassThruGetTargetLun (
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruResetChannel (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL   *This\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   )\r
 {\r
   //\r
@@ -2489,15 +2524,15 @@ ExtScsiPassThruResetChannel (
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *This,\r
-  IN UINT8                              *Target,\r
-  IN UINT64                             Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
-  UINT8                           Port;\r
-  UINT8                           PortMultiplier;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
+  UINT8                         Port;\r
+  UINT8                         PortMultiplier;\r
 \r
   Instance = EXT_SCSI_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
   //\r
@@ -2506,6 +2541,7 @@ ExtScsiPassThruResetTargetLun (
   if (Lun != 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // The layout of Target array:\r
   //  ________________________________________________________________________\r
@@ -2520,7 +2556,7 @@ ExtScsiPassThruResetTargetLun (
   Port           = Target[0];\r
   PortMultiplier = Target[1];\r
 \r
-  Node = SearchDeviceInfoList(Instance, Port, PortMultiplier, EfiIdeCdrom);\r
+  Node = SearchDeviceInfoList (Instance, Port, PortMultiplier, EfiIdeCdrom);\r
   if (Node == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -2556,26 +2592,26 @@ ExtScsiPassThruResetTargetLun (
 EFI_STATUS\r
 EFIAPI\r
 ExtScsiPassThruGetNextTarget (\r
-  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL    *This,\r
-  IN OUT UINT8                           **Target\r
+  IN  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                         **Target\r
   )\r
 {\r
-  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance;\r
-  LIST_ENTRY                      *Node;\r
-  EFI_ATA_DEVICE_INFO             *DeviceInfo;\r
-  UINT8                           *Target8;\r
-  UINT16                          *Target16;\r
+  ATA_ATAPI_PASS_THRU_INSTANCE  *Instance;\r
+  LIST_ENTRY                    *Node;\r
+  EFI_ATA_DEVICE_INFO           *DeviceInfo;\r
+  UINT8                         *Target8;\r
+  UINT16                        *Target16;\r
 \r
   Instance = EXT_SCSI_PASS_THRU_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  if (Target == NULL || *Target == NULL) {\r
+  if ((Target == NULL) || (*Target == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Target8  = *Target;\r
   Target16 = (UINT16 *)*Target;\r
 \r
-  if (CompareMem(Target8, mScsiId, TARGET_MAX_BYTES) != 0) {\r
+  if (CompareMem (Target8, mScsiId, TARGET_MAX_BYTES) != 0) {\r
     //\r
     // For ATAPI device, we use 2 least significant bytes to represent the location of SCSI device.\r
     // So the higher bytes in Target array should be 0xFF.\r
@@ -2605,9 +2641,10 @@ ExtScsiPassThruGetNextTarget (
       DeviceInfo = ATA_ATAPI_DEVICE_INFO_FROM_THIS (Node);\r
 \r
       if ((DeviceInfo->Type == EfiIdeCdrom) &&\r
-         ((Target8[0] < DeviceInfo->Port) ||\r
-          ((Target8[0] == DeviceInfo->Port) &&\r
-           (Target8[1] < (UINT8)DeviceInfo->PortMultiplier)))) {\r
+          ((Target8[0] < DeviceInfo->Port) ||\r
+           ((Target8[0] == DeviceInfo->Port) &&\r
+            (Target8[1] < (UINT8)DeviceInfo->PortMultiplier))))\r
+      {\r
         Target8[0] = (UINT8)DeviceInfo->Port;\r
         Target8[1] = (UINT8)DeviceInfo->PortMultiplier;\r
         goto Exit;\r