]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Bus / Ata / AtaBusDxe / AtaBus.c
index 6c3268896b68a51a6e99840281415a1d40e47b22..a729c087ff5a89be9ddda7005cf55af0a9121fb2 100644 (file)
@@ -15,7 +15,7 @@
 //\r
 // ATA Bus Driver Binding Protocol Instance\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gAtaBusDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gAtaBusDriverBinding = {\r
   AtaBusDriverBindingSupported,\r
   AtaBusDriverBindingStart,\r
   AtaBusDriverBindingStop,\r
@@ -27,9 +27,9 @@ EFI_DRIVER_BINDING_PROTOCOL gAtaBusDriverBinding = {
 //\r
 // Template for ATA Child Device.\r
 //\r
-ATA_DEVICE gAtaDeviceTemplate = {\r
-  ATA_DEVICE_SIGNATURE,        // Signature\r
-  NULL,                        // Handle\r
+ATA_DEVICE  gAtaDeviceTemplate = {\r
+  ATA_DEVICE_SIGNATURE,              // Signature\r
+  NULL,                              // Handle\r
   {                            // BlockIo\r
     EFI_BLOCK_IO_PROTOCOL_REVISION,\r
     NULL,\r
@@ -65,25 +65,27 @@ ATA_DEVICE gAtaDeviceTemplate = {
     AtaDiskInfoSenseData,\r
     AtaDiskInfoWhichIde\r
   },\r
-  NULL,                        // DevicePath\r
+  NULL,                              // DevicePath\r
   {\r
     AtaStorageSecurityReceiveData,\r
     AtaStorageSecuritySendData\r
   },\r
-  NULL,                        // AtaBusDriverData\r
-  0,                           // Port\r
-  0,                           // PortMultiplierPort\r
-  { 0, },                      // Packet\r
-  {{ 0}, },                    // Acb\r
-  NULL,                        // Asb\r
-  FALSE,                       // UdmaValid\r
-  FALSE,                       // Lba48Bit\r
-  NULL,                        // IdentifyData\r
-  NULL,                        // ControllerNameTable\r
-  {L'\0', },                   // ModelName\r
-  {NULL, NULL},                // AtaTaskList\r
-  {NULL, NULL},                // AtaSubTaskList\r
-  FALSE                        // Abort\r
+  NULL,                                       // AtaBusDriverData\r
+  0,                                          // Port\r
+  0,                                          // PortMultiplierPort\r
+  { 0,                                     }, // Packet\r
+  {\r
+    { 0 },\r
+  },                                          // Acb\r
+  NULL,                                       // Asb\r
+  FALSE,                                      // UdmaValid\r
+  FALSE,                                      // Lba48Bit\r
+  NULL,                                       // IdentifyData\r
+  NULL,                                       // ControllerNameTable\r
+  { L'\0',                                 }, // ModelName\r
+  { NULL,                            NULL  }, // AtaTaskList\r
+  { NULL,                            NULL  }, // AtaSubTaskList\r
+  FALSE                                       // Abort\r
 };\r
 \r
 /**\r
@@ -101,8 +103,8 @@ ATA_DEVICE gAtaDeviceTemplate = {
 **/\r
 VOID *\r
 AllocateAlignedBuffer (\r
-  IN ATA_DEVICE               *AtaDevice,\r
-  IN UINTN                    BufferSize\r
+  IN ATA_DEVICE  *AtaDevice,\r
+  IN UINTN       BufferSize\r
   )\r
 {\r
   return AllocateAlignedPages (EFI_SIZE_TO_PAGES (BufferSize), AtaDevice->AtaBusDriverData->AtaPassThru->Mode->IoAlign);\r
@@ -120,8 +122,8 @@ AllocateAlignedBuffer (
 **/\r
 VOID\r
 FreeAlignedBuffer (\r
-  IN VOID                     *Buffer,\r
-  IN UINTN                    BufferSize\r
+  IN VOID   *Buffer,\r
+  IN UINTN  BufferSize\r
   )\r
 {\r
   if (Buffer != NULL) {\r
@@ -129,7 +131,6 @@ FreeAlignedBuffer (
   }\r
 }\r
 \r
-\r
 /**\r
   Release all the resources allocated for the ATA device.\r
 \r
@@ -143,11 +144,11 @@ ReleaseAtaResources (
   IN ATA_DEVICE  *AtaDevice\r
   )\r
 {\r
-  ATA_BUS_ASYN_SUB_TASK *SubTask;\r
-  ATA_BUS_ASYN_TASK     *AtaTask;\r
-  LIST_ENTRY            *Entry;\r
-  LIST_ENTRY            *DelEntry;\r
-  EFI_TPL               OldTpl;\r
+  ATA_BUS_ASYN_SUB_TASK  *SubTask;\r
+  ATA_BUS_ASYN_TASK      *AtaTask;\r
+  LIST_ENTRY             *Entry;\r
+  LIST_ENTRY             *DelEntry;\r
+  EFI_TPL                OldTpl;\r
 \r
   FreeUnicodeStringTable (AtaDevice->ControllerNameTable);\r
   FreeAlignedBuffer (AtaDevice->Asb, sizeof (EFI_ATA_STATUS_BLOCK));\r
@@ -155,14 +156,16 @@ ReleaseAtaResources (
   if (AtaDevice->DevicePath != NULL) {\r
     FreePool (AtaDevice->DevicePath);\r
   }\r
+\r
   OldTpl = gBS->RaiseTPL (TPL_NOTIFY);\r
   if (!IsListEmpty (&AtaDevice->AtaSubTaskList)) {\r
     //\r
     // Free the Subtask list.\r
     //\r
-    for(Entry = AtaDevice->AtaSubTaskList.ForwardLink;\r
-        Entry != (&AtaDevice->AtaSubTaskList);\r
-       ) {\r
+    for (Entry = AtaDevice->AtaSubTaskList.ForwardLink;\r
+         Entry != (&AtaDevice->AtaSubTaskList);\r
+         )\r
+    {\r
       DelEntry = Entry;\r
       Entry    = Entry->ForwardLink;\r
       SubTask  = ATA_ASYN_SUB_TASK_FROM_ENTRY (DelEntry);\r
@@ -171,13 +174,15 @@ ReleaseAtaResources (
       FreeAtaSubTask (SubTask);\r
     }\r
   }\r
+\r
   if (!IsListEmpty (&AtaDevice->AtaTaskList)) {\r
     //\r
     // Free the Subtask list.\r
     //\r
-    for(Entry = AtaDevice->AtaTaskList.ForwardLink;\r
-        Entry != (&AtaDevice->AtaTaskList);\r
-       ) {\r
+    for (Entry = AtaDevice->AtaTaskList.ForwardLink;\r
+         Entry != (&AtaDevice->AtaTaskList);\r
+         )\r
+    {\r
       DelEntry = Entry;\r
       Entry    = Entry->ForwardLink;\r
       AtaTask  = ATA_ASYN_TASK_FROM_ENTRY (DelEntry);\r
@@ -186,11 +191,11 @@ ReleaseAtaResources (
       FreePool (AtaTask);\r
     }\r
   }\r
+\r
   gBS->RestoreTPL (OldTpl);\r
   FreePool (AtaDevice);\r
 }\r
 \r
-\r
 /**\r
   Registers an ATA device.\r
 \r
@@ -210,29 +215,29 @@ ReleaseAtaResources (
 **/\r
 EFI_STATUS\r
 RegisterAtaDevice (\r
-  IN OUT ATA_BUS_DRIVER_DATA        *AtaBusDriverData,\r
-  IN     UINT16                     Port,\r
-  IN     UINT16                     PortMultiplierPort\r
+  IN OUT ATA_BUS_DRIVER_DATA  *AtaBusDriverData,\r
+  IN     UINT16               Port,\r
+  IN     UINT16               PortMultiplierPort\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  ATA_DEVICE                        *AtaDevice;\r
-  EFI_ATA_PASS_THRU_PROTOCOL        *AtaPassThru;\r
-  EFI_DEVICE_PATH_PROTOCOL          *NewDevicePathNode;\r
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL          *RemainingDevicePath;\r
-  EFI_HANDLE                        DeviceHandle;\r
-\r
-  AtaDevice         = NULL;\r
-  NewDevicePathNode = NULL;\r
-  DevicePath        = NULL;\r
+  EFI_STATUS                  Status;\r
+  ATA_DEVICE                  *AtaDevice;\r
+  EFI_ATA_PASS_THRU_PROTOCOL  *AtaPassThru;\r
+  EFI_DEVICE_PATH_PROTOCOL    *NewDevicePathNode;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath;\r
+  EFI_HANDLE                  DeviceHandle;\r
+\r
+  AtaDevice           = NULL;\r
+  NewDevicePathNode   = NULL;\r
+  DevicePath          = NULL;\r
   RemainingDevicePath = NULL;\r
 \r
   //\r
   // Build device path\r
   //\r
   AtaPassThru = AtaBusDriverData->AtaPassThru;\r
-  Status = AtaPassThru->BuildDevicePath (AtaPassThru, Port, PortMultiplierPort, &NewDevicePathNode);\r
+  Status      = AtaPassThru->BuildDevicePath (AtaPassThru, Port, PortMultiplierPort, &NewDevicePathNode);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -243,10 +248,10 @@ RegisterAtaDevice (
     goto Done;\r
   }\r
 \r
-  DeviceHandle = NULL;\r
+  DeviceHandle        = NULL;\r
   RemainingDevicePath = DevicePath;\r
-  Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &RemainingDevicePath, &DeviceHandle);\r
-  if (!EFI_ERROR (Status) && (DeviceHandle != NULL) && IsDevicePathEnd(RemainingDevicePath)) {\r
+  Status              = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &RemainingDevicePath, &DeviceHandle);\r
+  if (!EFI_ERROR (Status) && (DeviceHandle != NULL) && IsDevicePathEnd (RemainingDevicePath)) {\r
     Status = EFI_ALREADY_STARTED;\r
     FreePool (DevicePath);\r
     goto Done;\r
@@ -270,11 +275,12 @@ RegisterAtaDevice (
   AtaDevice->DevicePath         = DevicePath;\r
   AtaDevice->Port               = Port;\r
   AtaDevice->PortMultiplierPort = PortMultiplierPort;\r
-  AtaDevice->Asb = AllocateAlignedBuffer (AtaDevice, sizeof (EFI_ATA_STATUS_BLOCK));\r
+  AtaDevice->Asb                = AllocateAlignedBuffer (AtaDevice, sizeof (EFI_ATA_STATUS_BLOCK));\r
   if (AtaDevice->Asb == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
+\r
   AtaDevice->IdentifyData = AllocateAlignedBuffer (AtaDevice, sizeof (ATA_IDENTIFY_DATA));\r
   if (AtaDevice->IdentifyData == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -368,13 +374,14 @@ RegisterAtaDevice (
     if (EFI_ERROR (Status)) {\r
       goto Done;\r
     }\r
+\r
     DEBUG ((DEBUG_INFO, "Successfully Install Storage Security Protocol on the ATA device\n"));\r
   }\r
 \r
   gBS->OpenProtocol (\r
          AtaBusDriverData->Controller,\r
          &gEfiAtaPassThruProtocolGuid,\r
-         (VOID **) &AtaPassThru,\r
+         (VOID **)&AtaPassThru,\r
          AtaBusDriverData->DriverBindingHandle,\r
          AtaDevice->Handle,\r
          EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -389,10 +396,10 @@ Done:
     ReleaseAtaResources (AtaDevice);\r
     DEBUG ((DEBUG_ERROR | DEBUG_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Unregisters an ATA device.\r
 \r
@@ -409,25 +416,25 @@ Done:
 **/\r
 EFI_STATUS\r
 UnregisterAtaDevice (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     Controller,\r
-  IN  EFI_HANDLE                     Handle\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   Controller,\r
+  IN  EFI_HANDLE                   Handle\r
   )\r
 {\r
-  EFI_STATUS                               Status;\r
-  EFI_BLOCK_IO_PROTOCOL                    *BlockIo;\r
-  EFI_BLOCK_IO2_PROTOCOL                   *BlockIo2;\r
-  ATA_DEVICE                               *AtaDevice;\r
-  EFI_ATA_PASS_THRU_PROTOCOL               *AtaPassThru;\r
-  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *StorageSecurity;\r
+  EFI_STATUS                             Status;\r
+  EFI_BLOCK_IO_PROTOCOL                  *BlockIo;\r
+  EFI_BLOCK_IO2_PROTOCOL                 *BlockIo2;\r
+  ATA_DEVICE                             *AtaDevice;\r
+  EFI_ATA_PASS_THRU_PROTOCOL             *AtaPassThru;\r
+  EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *StorageSecurity;\r
 \r
-  BlockIo2             =     NULL;\r
-  BlockIo              =     NULL;\r
+  BlockIo2 =     NULL;\r
+  BlockIo  =     NULL;\r
 \r
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiBlockIoProtocolGuid,\r
-                  (VOID **) &BlockIo,\r
+                  (VOID **)&BlockIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -439,7 +446,7 @@ UnregisterAtaDevice (
     Status = gBS->OpenProtocol (\r
                     Handle,\r
                     &gEfiBlockIo2ProtocolGuid,\r
-                    (VOID **) &BlockIo2,\r
+                    (VOID **)&BlockIo2,\r
                     This->DriverBindingHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -488,13 +495,13 @@ UnregisterAtaDevice (
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->OpenProtocol (\r
-          Controller,\r
-          &gEfiAtaPassThruProtocolGuid,\r
-          (VOID **) &AtaPassThru,\r
-          This->DriverBindingHandle,\r
-          Handle,\r
-          EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-          );\r
+           Controller,\r
+           &gEfiAtaPassThruProtocolGuid,\r
+           (VOID **)&AtaPassThru,\r
+           This->DriverBindingHandle,\r
+           Handle,\r
+           EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+           );\r
     return Status;\r
   }\r
 \r
@@ -504,7 +511,7 @@ UnregisterAtaDevice (
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiStorageSecurityCommandProtocolGuid,\r
-                  (VOID **) &StorageSecurity,\r
+                  (VOID **)&StorageSecurity,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -518,13 +525,13 @@ UnregisterAtaDevice (
                     );\r
     if (EFI_ERROR (Status)) {\r
       gBS->OpenProtocol (\r
-        Controller,\r
-        &gEfiAtaPassThruProtocolGuid,\r
-        (VOID **) &AtaPassThru,\r
-        This->DriverBindingHandle,\r
-        Handle,\r
-        EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-        );\r
+             Controller,\r
+             &gEfiAtaPassThruProtocolGuid,\r
+             (VOID **)&AtaPassThru,\r
+             This->DriverBindingHandle,\r
+             Handle,\r
+             EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+             );\r
       return Status;\r
     }\r
   }\r
@@ -533,8 +540,6 @@ UnregisterAtaDevice (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
-\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
@@ -585,11 +590,11 @@ AtaBusDriverBindingSupported (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_DEVICE_PATH_PROTOCOL          *ParentDevicePath;\r
-  EFI_ATA_PASS_THRU_PROTOCOL        *AtaPassThru;\r
-  UINT16                            Port;\r
-  UINT16                            PortMultiplierPort;\r
+  EFI_STATUS                  Status;\r
+  EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath;\r
+  EFI_ATA_PASS_THRU_PROTOCOL  *AtaPassThru;\r
+  UINT16                      Port;\r
+  UINT16                      PortMultiplierPort;\r
 \r
   //\r
   // Test EFI_ATA_PASS_THRU_PROTOCOL on controller handle.\r
@@ -597,7 +602,7 @@ AtaBusDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiAtaPassThruProtocolGuid,\r
-                  (VOID **) &AtaPassThru,\r
+                  (VOID **)&AtaPassThru,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -619,11 +624,11 @@ AtaBusDriverBindingSupported (
     // Close the I/O Abstraction(s) used to perform the supported test\r
     //\r
     gBS->CloseProtocol (\r
-          Controller,\r
-          &gEfiAtaPassThruProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Controller\r
-          );\r
+           Controller,\r
+           &gEfiAtaPassThruProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Controller\r
+           );\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -637,11 +642,11 @@ AtaBusDriverBindingSupported (
       // Close the I/O Abstraction(s) used to perform the supported test\r
       //\r
       gBS->CloseProtocol (\r
-            Controller,\r
-            &gEfiAtaPassThruProtocolGuid,\r
-            This->DriverBindingHandle,\r
-            Controller\r
-            );\r
+             Controller,\r
+             &gEfiAtaPassThruProtocolGuid,\r
+             This->DriverBindingHandle,\r
+             Controller\r
+             );\r
       return Status;\r
     }\r
   }\r
@@ -650,11 +655,11 @@ AtaBusDriverBindingSupported (
   // Close the I/O Abstraction(s) used to perform the supported test\r
   //\r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiAtaPassThruProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiAtaPassThruProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   //\r
   // Open the EFI Device Path protocol needed to perform the supported test\r
@@ -662,7 +667,7 @@ AtaBusDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath,\r
+                  (VOID **)&ParentDevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -670,7 +675,6 @@ AtaBusDriverBindingSupported (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Starts a device controller or a bus controller.\r
 \r
@@ -714,19 +718,19 @@ AtaBusDriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_ATA_PASS_THRU_PROTOCOL        *AtaPassThru;\r
-  EFI_DEVICE_PATH_PROTOCOL          *ParentDevicePath;\r
-  ATA_BUS_DRIVER_DATA               *AtaBusDriverData;\r
-  UINT16                            Port;\r
-  UINT16                            PortMultiplierPort;\r
+  EFI_STATUS                  Status;\r
+  EFI_ATA_PASS_THRU_PROTOCOL  *AtaPassThru;\r
+  EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath;\r
+  ATA_BUS_DRIVER_DATA         *AtaBusDriverData;\r
+  UINT16                      Port;\r
+  UINT16                      PortMultiplierPort;\r
 \r
   AtaBusDriverData = NULL;\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &ParentDevicePath,\r
+                  (VOID **)&ParentDevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -747,7 +751,7 @@ AtaBusDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiAtaPassThruProtocolGuid,\r
-                  (VOID **) &AtaPassThru,\r
+                  (VOID **)&AtaPassThru,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -766,9 +770,9 @@ AtaBusDriverBindingStart (
       goto ErrorExit;\r
     }\r
 \r
-    AtaBusDriverData->AtaPassThru = AtaPassThru;\r
-    AtaBusDriverData->Controller  = Controller;\r
-    AtaBusDriverData->ParentDevicePath = ParentDevicePath;\r
+    AtaBusDriverData->AtaPassThru         = AtaPassThru;\r
+    AtaBusDriverData->Controller          = Controller;\r
+    AtaBusDriverData->ParentDevicePath    = ParentDevicePath;\r
     AtaBusDriverData->DriverBindingHandle = This->DriverBindingHandle;\r
 \r
     Status = gBS->InstallMultipleProtocolInterfaces (\r
@@ -780,12 +784,11 @@ AtaBusDriverBindingStart (
     if (EFI_ERROR (Status)) {\r
       goto ErrorExit;\r
     }\r
-\r
   } else {\r
     Status = gBS->OpenProtocol (\r
                     Controller,\r
                     &gEfiCallerIdGuid,\r
-                    (VOID **) &AtaBusDriverData,\r
+                    (VOID **)&AtaBusDriverData,\r
                     This->DriverBindingHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -826,14 +829,16 @@ AtaBusDriverBindingStart (
           //\r
           break;\r
         }\r
+\r
         RegisterAtaDevice (AtaBusDriverData, Port, PortMultiplierPort);\r
       }\r
     }\r
+\r
     Status = EFI_SUCCESS;\r
   } else if (!IsDevicePathEnd (RemainingDevicePath)) {\r
     Status = AtaPassThru->GetDevice (AtaPassThru, RemainingDevicePath, &Port, &PortMultiplierPort);\r
     if (!EFI_ERROR (Status)) {\r
-      Status = RegisterAtaDevice (AtaBusDriverData,Port, PortMultiplierPort);\r
+      Status = RegisterAtaDevice (AtaBusDriverData, Port, PortMultiplierPort);\r
     }\r
   }\r
 \r
@@ -852,17 +857,15 @@ ErrorExit:
   }\r
 \r
   gBS->CloseProtocol (\r
-        Controller,\r
-        &gEfiAtaPassThruProtocolGuid,\r
-        This->DriverBindingHandle,\r
-        Controller\r
-        );\r
+         Controller,\r
+         &gEfiAtaPassThruProtocolGuid,\r
+         This->DriverBindingHandle,\r
+         Controller\r
+         );\r
 \r
   return Status;\r
-\r
 }\r
 \r
-\r
 /**\r
   Stops a device controller or a bus controller.\r
 \r
@@ -892,42 +895,42 @@ ErrorExit:
 EFI_STATUS\r
 EFIAPI\r
 AtaBusDriverBindingStop (\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
-  BOOLEAN                     AllChildrenStopped;\r
-  UINTN                       Index;\r
-  ATA_BUS_DRIVER_DATA         *AtaBusDriverData;\r
+  EFI_STATUS           Status;\r
+  BOOLEAN              AllChildrenStopped;\r
+  UINTN                Index;\r
+  ATA_BUS_DRIVER_DATA  *AtaBusDriverData;\r
 \r
   if (NumberOfChildren == 0) {\r
     Status = gBS->OpenProtocol (\r
                     Controller,\r
                     &gEfiCallerIdGuid,\r
-                    (VOID **) &AtaBusDriverData,\r
+                    (VOID **)&AtaBusDriverData,\r
                     This->DriverBindingHandle,\r
                     Controller,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
       gBS->UninstallMultipleProtocolInterfaces (\r
-            Controller,\r
-            &gEfiCallerIdGuid,\r
-            AtaBusDriverData,\r
-            NULL\r
-            );\r
+             Controller,\r
+             &gEfiCallerIdGuid,\r
+             AtaBusDriverData,\r
+             NULL\r
+             );\r
       FreePool (AtaBusDriverData);\r
     }\r
 \r
     gBS->CloseProtocol (\r
-          Controller,\r
-          &gEfiAtaPassThruProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          Controller\r
-          );\r
+           Controller,\r
+           &gEfiAtaPassThruProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           Controller\r
+           );\r
 \r
     return EFI_SUCCESS;\r
   }\r
@@ -935,7 +938,6 @@ AtaBusDriverBindingStop (
   AllChildrenStopped = TRUE;\r
 \r
   for (Index = 0; Index < NumberOfChildren; Index++) {\r
-\r
     Status = UnregisterAtaDevice (This, Controller, ChildHandleBuffer[Index]);\r
     if (EFI_ERROR (Status)) {\r
       AllChildrenStopped = FALSE;\r
@@ -949,7 +951,6 @@ AtaBusDriverBindingStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Reset the Block Device.\r
 \r
@@ -964,13 +965,13 @@ AtaBusDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 AtaBlockIoReset (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  BOOLEAN                 ExtendedVerification\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  BOOLEAN                ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  ATA_DEVICE      *AtaDevice;\r
-  EFI_TPL         OldTpl;\r
+  EFI_STATUS  Status;\r
+  ATA_DEVICE  *AtaDevice;\r
+  EFI_TPL     OldTpl;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -986,7 +987,6 @@ AtaBlockIoReset (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Read/Write BufferSize bytes from Lba from/into Buffer.\r
 \r
@@ -1015,30 +1015,30 @@ AtaBlockIoReset (
 **/\r
 EFI_STATUS\r
 BlockIoReadWrite (\r
-  IN     VOID                    *This,\r
-  IN     UINT32                  MediaId,\r
-  IN     EFI_LBA                 Lba,\r
-  IN OUT EFI_BLOCK_IO2_TOKEN     *Token,\r
-  IN     UINTN                   BufferSize,\r
-  OUT    VOID                    *Buffer,\r
-  IN     BOOLEAN                 IsBlockIo2,\r
-  IN     BOOLEAN                 IsWrite\r
+  IN     VOID                 *This,\r
+  IN     UINT32               MediaId,\r
+  IN     EFI_LBA              Lba,\r
+  IN OUT EFI_BLOCK_IO2_TOKEN  *Token,\r
+  IN     UINTN                BufferSize,\r
+  OUT    VOID                 *Buffer,\r
+  IN     BOOLEAN              IsBlockIo2,\r
+  IN     BOOLEAN              IsWrite\r
   )\r
 {\r
-  ATA_DEVICE                        *AtaDevice;\r
-  EFI_STATUS                        Status;\r
-  EFI_TPL                           OldTpl;\r
-  EFI_BLOCK_IO_MEDIA                *Media;\r
-  UINTN                             BlockSize;\r
-  UINTN                             NumberOfBlocks;\r
-  UINTN                             IoAlign;\r
+  ATA_DEVICE          *AtaDevice;\r
+  EFI_STATUS          Status;\r
+  EFI_TPL             OldTpl;\r
+  EFI_BLOCK_IO_MEDIA  *Media;\r
+  UINTN               BlockSize;\r
+  UINTN               NumberOfBlocks;\r
+  UINTN               IoAlign;\r
 \r
   if (IsBlockIo2) {\r
-   Media     = ((EFI_BLOCK_IO2_PROTOCOL *) This)->Media;\r
-   AtaDevice = ATA_DEVICE_FROM_BLOCK_IO2 (This);\r
+    Media     = ((EFI_BLOCK_IO2_PROTOCOL *)This)->Media;\r
+    AtaDevice = ATA_DEVICE_FROM_BLOCK_IO2 (This);\r
   } else {\r
-   Media     = ((EFI_BLOCK_IO_PROTOCOL *) This)->Media;\r
-   AtaDevice = ATA_DEVICE_FROM_BLOCK_IO (This);\r
+    Media     = ((EFI_BLOCK_IO_PROTOCOL *)This)->Media;\r
+    AtaDevice = ATA_DEVICE_FROM_BLOCK_IO (This);\r
   }\r
 \r
   if (MediaId != Media->MediaId) {\r
@@ -1057,6 +1057,7 @@ BlockIoReadWrite (
       Token->TransactionStatus = EFI_SUCCESS;\r
       gBS->SignalEvent (Token->Event);\r
     }\r
+\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1065,13 +1066,13 @@ BlockIoReadWrite (
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  NumberOfBlocks  = BufferSize / BlockSize;\r
+  NumberOfBlocks = BufferSize / BlockSize;\r
   if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   IoAlign = Media->IoAlign;\r
-  if (IoAlign > 0 && (((UINTN) Buffer & (IoAlign - 1)) != 0)) {\r
+  if ((IoAlign > 0) && (((UINTN)Buffer & (IoAlign - 1)) != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1087,7 +1088,6 @@ BlockIoReadWrite (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Read BufferSize bytes from Lba into Buffer.\r
 \r
@@ -1110,17 +1110,16 @@ BlockIoReadWrite (
 EFI_STATUS\r
 EFIAPI\r
 AtaBlockIoReadBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  UINT32                  MediaId,\r
-  IN  EFI_LBA                 Lba,\r
-  IN  UINTN                   BufferSize,\r
-  OUT VOID                    *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  OUT VOID                   *Buffer\r
   )\r
 {\r
-  return BlockIoReadWrite ((VOID *) This, MediaId, Lba, NULL, BufferSize, Buffer, FALSE, FALSE);\r
+  return BlockIoReadWrite ((VOID *)This, MediaId, Lba, NULL, BufferSize, Buffer, FALSE, FALSE);\r
 }\r
 \r
-\r
 /**\r
   Write BufferSize bytes from Lba into Buffer.\r
 \r
@@ -1144,17 +1143,16 @@ AtaBlockIoReadBlocks (
 EFI_STATUS\r
 EFIAPI\r
 AtaBlockIoWriteBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This,\r
-  IN  UINT32                  MediaId,\r
-  IN  EFI_LBA                 Lba,\r
-  IN  UINTN                   BufferSize,\r
-  IN  VOID                    *Buffer\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,\r
+  IN  UINT32                 MediaId,\r
+  IN  EFI_LBA                Lba,\r
+  IN  UINTN                  BufferSize,\r
+  IN  VOID                   *Buffer\r
   )\r
 {\r
-  return BlockIoReadWrite ((VOID *) This, MediaId, Lba, NULL, BufferSize, Buffer, FALSE, TRUE);\r
+  return BlockIoReadWrite ((VOID *)This, MediaId, Lba, NULL, BufferSize, Buffer, FALSE, TRUE);\r
 }\r
 \r
-\r
 /**\r
   Flush the Block Device.\r
 \r
@@ -1168,7 +1166,7 @@ AtaBlockIoWriteBlocks (
 EFI_STATUS\r
 EFIAPI\r
 AtaBlockIoFlushBlocks (\r
-  IN  EFI_BLOCK_IO_PROTOCOL   *This\r
+  IN  EFI_BLOCK_IO_PROTOCOL  *This\r
   )\r
 {\r
   //\r
@@ -1195,9 +1193,9 @@ AtaBlockIoResetEx (
   IN  BOOLEAN                 ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  ATA_DEVICE      *AtaDevice;\r
-  EFI_TPL         OldTpl;\r
+  EFI_STATUS  Status;\r
+  ATA_DEVICE  *AtaDevice;\r
+  EFI_TPL     OldTpl;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -1252,10 +1250,9 @@ AtaBlockIoReadBlocksEx (
   OUT VOID                    *Buffer\r
   )\r
 {\r
-  return BlockIoReadWrite ((VOID *) This, MediaId, Lba, Token, BufferSize, Buffer, TRUE, FALSE);\r
+  return BlockIoReadWrite ((VOID *)This, MediaId, Lba, Token, BufferSize, Buffer, TRUE, FALSE);\r
 }\r
 \r
-\r
 /**\r
   Write BufferSize bytes from Lba into Buffer.\r
 \r
@@ -1289,10 +1286,9 @@ AtaBlockIoWriteBlocksEx (
   IN  VOID                    *Buffer\r
   )\r
 {\r
-  return BlockIoReadWrite ((VOID *) This, MediaId, Lba, Token, BufferSize, Buffer, TRUE, TRUE);\r
+  return BlockIoReadWrite ((VOID *)This, MediaId, Lba, Token, BufferSize, Buffer, TRUE, TRUE);\r
 }\r
 \r
-\r
 /**\r
   Flush the Block Device.\r
 \r
@@ -1314,12 +1310,14 @@ AtaBlockIoFlushBlocksEx (
   //\r
   // Signal event and return directly.\r
   //\r
-  if (Token != NULL && Token->Event != NULL) {\r
+  if ((Token != NULL) && (Token->Event != NULL)) {\r
     Token->TransactionStatus = EFI_SUCCESS;\r
     gBS->SignalEvent (Token->Event);\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
+\r
 /**\r
   Provides inquiry information for the controller type.\r
 \r
@@ -1339,15 +1337,14 @@ AtaBlockIoFlushBlocksEx (
 EFI_STATUS\r
 EFIAPI\r
 AtaDiskInfoInquiry (\r
-  IN     EFI_DISK_INFO_PROTOCOL   *This,\r
-  IN OUT VOID                     *InquiryData,\r
-  IN OUT UINT32                   *InquiryDataSize\r
+  IN     EFI_DISK_INFO_PROTOCOL  *This,\r
+  IN OUT VOID                    *InquiryData,\r
+  IN OUT UINT32                  *InquiryDataSize\r
   )\r
 {\r
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Provides identify information for the controller type.\r
 \r
@@ -1369,13 +1366,13 @@ AtaDiskInfoInquiry (
 EFI_STATUS\r
 EFIAPI\r
 AtaDiskInfoIdentify (\r
-  IN     EFI_DISK_INFO_PROTOCOL   *This,\r
-  IN OUT VOID                     *IdentifyData,\r
-  IN OUT UINT32                   *IdentifyDataSize\r
+  IN     EFI_DISK_INFO_PROTOCOL  *This,\r
+  IN OUT VOID                    *IdentifyData,\r
+  IN OUT UINT32                  *IdentifyDataSize\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  ATA_DEVICE                      *AtaDevice;\r
+  EFI_STATUS  Status;\r
+  ATA_DEVICE  *AtaDevice;\r
 \r
   AtaDevice = ATA_DEVICE_FROM_DISK_INFO (This);\r
 \r
@@ -1384,12 +1381,12 @@ AtaDiskInfoIdentify (
     Status = EFI_SUCCESS;\r
     CopyMem (IdentifyData, AtaDevice->IdentifyData, sizeof (ATA_IDENTIFY_DATA));\r
   }\r
+\r
   *IdentifyDataSize = sizeof (ATA_IDENTIFY_DATA);\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Provides sense data information for the controller type.\r
 \r
@@ -1410,16 +1407,15 @@ AtaDiskInfoIdentify (
 EFI_STATUS\r
 EFIAPI\r
 AtaDiskInfoSenseData (\r
-  IN     EFI_DISK_INFO_PROTOCOL   *This,\r
-  IN OUT VOID                     *SenseData,\r
-  IN OUT UINT32                   *SenseDataSize,\r
-  OUT    UINT8                    *SenseDataNumber\r
+  IN     EFI_DISK_INFO_PROTOCOL  *This,\r
+  IN OUT VOID                    *SenseData,\r
+  IN OUT UINT32                  *SenseDataSize,\r
+  OUT    UINT8                   *SenseDataNumber\r
   )\r
 {\r
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   This function is used by the IDE bus driver to get controller information.\r
 \r
@@ -1434,16 +1430,16 @@ AtaDiskInfoSenseData (
 EFI_STATUS\r
 EFIAPI\r
 AtaDiskInfoWhichIde (\r
-  IN  EFI_DISK_INFO_PROTOCOL   *This,\r
-  OUT UINT32                   *IdeChannel,\r
-  OUT UINT32                   *IdeDevice\r
+  IN  EFI_DISK_INFO_PROTOCOL  *This,\r
+  OUT UINT32                  *IdeChannel,\r
+  OUT UINT32                  *IdeDevice\r
   )\r
 {\r
-  ATA_DEVICE                   *AtaDevice;\r
+  ATA_DEVICE  *AtaDevice;\r
 \r
-  AtaDevice       = ATA_DEVICE_FROM_DISK_INFO (This);\r
-  *IdeChannel     = AtaDevice->Port;\r
-  *IdeDevice      = AtaDevice->PortMultiplierPort;\r
+  AtaDevice   = ATA_DEVICE_FROM_DISK_INFO (This);\r
+  *IdeChannel = AtaDevice->Port;\r
+  *IdeDevice  = AtaDevice->PortMultiplierPort;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1523,22 +1519,22 @@ AtaDiskInfoWhichIde (
 EFI_STATUS\r
 EFIAPI\r
 AtaStorageSecurityReceiveData (\r
-  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *This,\r
-  IN UINT32                                   MediaId,\r
-  IN UINT64                                   Timeout,\r
-  IN UINT8                                    SecurityProtocolId,\r
-  IN UINT16                                   SecurityProtocolSpecificData,\r
-  IN UINTN                                    PayloadBufferSize,\r
-  OUT VOID                                    *PayloadBuffer,\r
-  OUT UINTN                                   *PayloadTransferSize\r
+  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *This,\r
+  IN UINT32                                 MediaId,\r
+  IN UINT64                                 Timeout,\r
+  IN UINT8                                  SecurityProtocolId,\r
+  IN UINT16                                 SecurityProtocolSpecificData,\r
+  IN UINTN                                  PayloadBufferSize,\r
+  OUT VOID                                  *PayloadBuffer,\r
+  OUT UINTN                                 *PayloadTransferSize\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  ATA_DEVICE                       *Private;\r
-  EFI_TPL                          OldTpl;\r
+  EFI_STATUS  Status;\r
+  ATA_DEVICE  *Private;\r
+  EFI_TPL     OldTpl;\r
 \r
   DEBUG ((DEBUG_INFO, "EFI Storage Security Protocol - Read\n"));\r
-  if ((PayloadBuffer == NULL || PayloadTransferSize == NULL) && PayloadBufferSize != 0) {\r
+  if (((PayloadBuffer == NULL) || (PayloadTransferSize == NULL)) && (PayloadBufferSize != 0)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1634,18 +1630,18 @@ AtaStorageSecurityReceiveData (
 EFI_STATUS\r
 EFIAPI\r
 AtaStorageSecuritySendData (\r
-  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL    *This,\r
-  IN UINT32                                   MediaId,\r
-  IN UINT64                                   Timeout,\r
-  IN UINT8                                    SecurityProtocolId,\r
-  IN UINT16                                   SecurityProtocolSpecificData,\r
-  IN UINTN                                    PayloadBufferSize,\r
-  IN VOID                                     *PayloadBuffer\r
+  IN EFI_STORAGE_SECURITY_COMMAND_PROTOCOL  *This,\r
+  IN UINT32                                 MediaId,\r
+  IN UINT64                                 Timeout,\r
+  IN UINT8                                  SecurityProtocolId,\r
+  IN UINT16                                 SecurityProtocolSpecificData,\r
+  IN UINTN                                  PayloadBufferSize,\r
+  IN VOID                                   *PayloadBuffer\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  ATA_DEVICE                       *Private;\r
-  EFI_TPL                          OldTpl;\r
+  EFI_STATUS  Status;\r
+  ATA_DEVICE  *Private;\r
+  EFI_TPL     OldTpl;\r
 \r
   DEBUG ((DEBUG_INFO, "EFI Storage Security Protocol - Send\n"));\r
   if ((PayloadBuffer == NULL) && (PayloadBufferSize != 0)) {\r
@@ -1687,12 +1683,12 @@ AtaStorageSecuritySendData (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-InitializeAtaBus(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+InitializeAtaBus (\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