]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Bus / Pci / XhciDxe / XhciSched.c
index 92f63c29fce11886991f4a113be2d10b2f452e3f..c2906e06fd8478a7b77519e6855bf3c2d46bab05 100644 (file)
@@ -19,25 +19,25 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
   @return Created URB or NULL.\r
 \r
 **/\r
-URB*\r
+URB *\r
 XhcCreateCmdTrb (\r
   IN USB_XHCI_INSTANCE  *Xhc,\r
   IN TRB_TEMPLATE       *CmdTrb\r
   )\r
 {\r
-  URB    *Urb;\r
+  URB  *Urb;\r
 \r
   Urb = AllocateZeroPool (sizeof (URB));\r
   if (Urb == NULL) {\r
     return NULL;\r
   }\r
 \r
-  Urb->Signature  = XHC_URB_SIG;\r
+  Urb->Signature = XHC_URB_SIG;\r
 \r
-  Urb->Ring       = &Xhc->CmdRing;\r
+  Urb->Ring = &Xhc->CmdRing;\r
   XhcSyncTrsRing (Xhc, Urb->Ring);\r
-  Urb->TrbNum     = 1;\r
-  Urb->TrbStart   = Urb->Ring->RingEnqueue;\r
+  Urb->TrbNum   = 1;\r
+  Urb->TrbStart = Urb->Ring->RingEnqueue;\r
   CopyMem (Urb->TrbStart, CmdTrb, sizeof (TRB_TEMPLATE));\r
   Urb->TrbStart->CycleBit = Urb->Ring->RingPCS & BIT0;\r
   Urb->TrbEnd             = Urb->TrbStart;\r
@@ -63,14 +63,14 @@ XhcCreateCmdTrb (
 EFI_STATUS\r
 EFIAPI\r
 XhcCmdTransfer (\r
-  IN  USB_XHCI_INSTANCE     *Xhc,\r
-  IN  TRB_TEMPLATE          *CmdTrb,\r
-  IN  UINTN                 Timeout,\r
-  OUT TRB_TEMPLATE          **EvtTrb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  TRB_TEMPLATE       *CmdTrb,\r
+  IN  UINTN              Timeout,\r
+  OUT TRB_TEMPLATE       **EvtTrb\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  URB             *Urb;\r
+  EFI_STATUS  Status;\r
+  URB         *Urb;\r
 \r
   //\r
   // Validate the parameters\r
@@ -128,24 +128,24 @@ ON_EXIT:
   @return Created URB or NULL\r
 \r
 **/\r
-URB*\r
+URB *\r
 XhcCreateUrb (\r
-  IN USB_XHCI_INSTANCE                  *Xhc,\r
-  IN UINT8                              BusAddr,\r
-  IN UINT8                              EpAddr,\r
-  IN UINT8                              DevSpeed,\r
-  IN UINTN                              MaxPacket,\r
-  IN UINTN                              Type,\r
-  IN EFI_USB_DEVICE_REQUEST             *Request,\r
-  IN VOID                               *Data,\r
-  IN UINTN                              DataLen,\r
-  IN EFI_ASYNC_USB_TRANSFER_CALLBACK    Callback,\r
-  IN VOID                               *Context\r
+  IN USB_XHCI_INSTANCE                *Xhc,\r
+  IN UINT8                            BusAddr,\r
+  IN UINT8                            EpAddr,\r
+  IN UINT8                            DevSpeed,\r
+  IN UINTN                            MaxPacket,\r
+  IN UINTN                            Type,\r
+  IN EFI_USB_DEVICE_REQUEST           *Request,\r
+  IN VOID                             *Data,\r
+  IN UINTN                            DataLen,\r
+  IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,\r
+  IN VOID                             *Context\r
   )\r
 {\r
-  USB_ENDPOINT                  *Ep;\r
-  EFI_STATUS                    Status;\r
-  URB                           *Urb;\r
+  USB_ENDPOINT  *Ep;\r
+  EFI_STATUS    Status;\r
+  URB           *Urb;\r
 \r
   Urb = AllocateZeroPool (sizeof (URB));\r
   if (Urb == NULL) {\r
@@ -189,8 +189,8 @@ XhcCreateUrb (
 **/\r
 VOID\r
 XhcFreeUrb (\r
-  IN USB_XHCI_INSTANCE    *Xhc,\r
-  IN URB                  *Urb\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN URB                *Urb\r
   )\r
 {\r
   if ((Xhc == NULL) || (Urb == NULL)) {\r
@@ -215,23 +215,23 @@ XhcFreeUrb (
 **/\r
 EFI_STATUS\r
 XhcCreateTransferTrb (\r
-  IN USB_XHCI_INSTANCE          *Xhc,\r
-  IN URB                        *Urb\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN URB                *Urb\r
   )\r
 {\r
-  VOID                          *OutputContext;\r
-  TRANSFER_RING                 *EPRing;\r
-  UINT8                         EPType;\r
-  UINT8                         SlotId;\r
-  UINT8                         Dci;\r
-  TRB                           *TrbStart;\r
-  UINTN                         TotalLen;\r
-  UINTN                         Len;\r
-  UINTN                         TrbNum;\r
-  EFI_PCI_IO_PROTOCOL_OPERATION MapOp;\r
-  EFI_PHYSICAL_ADDRESS          PhyAddr;\r
-  VOID                          *Map;\r
-  EFI_STATUS                    Status;\r
+  VOID                           *OutputContext;\r
+  TRANSFER_RING                  *EPRing;\r
+  UINT8                          EPType;\r
+  UINT8                          SlotId;\r
+  UINT8                          Dci;\r
+  TRB                            *TrbStart;\r
+  UINTN                          TotalLen;\r
+  UINTN                          Len;\r
+  UINTN                          TrbNum;\r
+  EFI_PCI_IO_PROTOCOL_OPERATION  MapOp;\r
+  EFI_PHYSICAL_ADDRESS           PhyAddr;\r
+  VOID                           *Map;\r
+  EFI_STATUS                     Status;\r
 \r
   SlotId = XhcBusDevAddrToSlotId (Xhc, Urb->Ep.BusAddr);\r
   if (SlotId == 0) {\r
@@ -244,37 +244,37 @@ XhcCreateTransferTrb (
   Urb->Completed = 0;\r
   Urb->Result    = EFI_USB_NOERROR;\r
 \r
-  Dci       = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
+  Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r
-  EPRing    = (TRANSFER_RING *)(UINTN) Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1];\r
-  Urb->Ring = EPRing;\r
+  EPRing        = (TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1];\r
+  Urb->Ring     = EPRing;\r
   OutputContext = Xhc->UsbDevContext[SlotId].OutputContext;\r
   if (Xhc->HcCParams.Data.Csz == 0) {\r
-    EPType  = (UINT8) ((DEVICE_CONTEXT *)OutputContext)->EP[Dci-1].EPType;\r
+    EPType = (UINT8)((DEVICE_CONTEXT *)OutputContext)->EP[Dci-1].EPType;\r
   } else {\r
-    EPType  = (UINT8) ((DEVICE_CONTEXT_64 *)OutputContext)->EP[Dci-1].EPType;\r
+    EPType = (UINT8)((DEVICE_CONTEXT_64 *)OutputContext)->EP[Dci-1].EPType;\r
   }\r
 \r
   //\r
   // No need to remap.\r
   //\r
   if ((Urb->Data != NULL) && (Urb->DataMap == NULL)) {\r
-    if (((UINT8) (Urb->Ep.Direction)) == EfiUsbDataIn) {\r
+    if (((UINT8)(Urb->Ep.Direction)) == EfiUsbDataIn) {\r
       MapOp = EfiPciIoOperationBusMasterWrite;\r
     } else {\r
       MapOp = EfiPciIoOperationBusMasterRead;\r
     }\r
 \r
-    Len = Urb->DataLen;\r
-    Status  = Xhc->PciIo->Map (Xhc->PciIo, MapOp, Urb->Data, &Len, &PhyAddr, &Map);\r
+    Len    = Urb->DataLen;\r
+    Status = Xhc->PciIo->Map (Xhc->PciIo, MapOp, Urb->Data, &Len, &PhyAddr, &Map);\r
 \r
     if (EFI_ERROR (Status) || (Len != Urb->DataLen)) {\r
       DEBUG ((DEBUG_ERROR, "XhcCreateTransferTrb: Fail to map Urb->Data.\n"));\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    Urb->DataPhy  = (VOID *) ((UINTN) PhyAddr);\r
-    Urb->DataMap  = Map;\r
+    Urb->DataPhy = (VOID *)((UINTN)PhyAddr);\r
+    Urb->DataMap = Map;\r
   }\r
 \r
   //\r
@@ -287,7 +287,7 @@ XhcCreateTransferTrb (
       //\r
       // For control transfer, create SETUP_STAGE_TRB first.\r
       //\r
-      TrbStart = (TRB *)(UINTN)EPRing->RingEnqueue;\r
+      TrbStart                            = (TRB *)(UINTN)EPRing->RingEnqueue;\r
       TrbStart->TrbCtrSetup.bmRequestType = Urb->Request->RequestType;\r
       TrbStart->TrbCtrSetup.bRequest      = Urb->Request->Request;\r
       TrbStart->TrbCtrSetup.wValue        = Urb->Request->Value;\r
@@ -310,6 +310,7 @@ XhcCreateTransferTrb (
       } else {\r
         TrbStart->TrbCtrSetup.TRT = 0;\r
       }\r
+\r
       //\r
       // Update the cycle bit\r
       //\r
@@ -321,10 +322,10 @@ XhcCreateTransferTrb (
       //\r
       if (Urb->DataLen > 0) {\r
         XhcSyncTrsRing (Xhc, EPRing);\r
-        TrbStart = (TRB *)(UINTN)EPRing->RingEnqueue;\r
-        TrbStart->TrbCtrData.TRBPtrLo  = XHC_LOW_32BIT(Urb->DataPhy);\r
-        TrbStart->TrbCtrData.TRBPtrHi  = XHC_HIGH_32BIT(Urb->DataPhy);\r
-        TrbStart->TrbCtrData.Length    = (UINT32) Urb->DataLen;\r
+        TrbStart                       = (TRB *)(UINTN)EPRing->RingEnqueue;\r
+        TrbStart->TrbCtrData.TRBPtrLo  = XHC_LOW_32BIT (Urb->DataPhy);\r
+        TrbStart->TrbCtrData.TRBPtrHi  = XHC_HIGH_32BIT (Urb->DataPhy);\r
+        TrbStart->TrbCtrData.Length    = (UINT32)Urb->DataLen;\r
         TrbStart->TrbCtrData.TDSize    = 0;\r
         TrbStart->TrbCtrData.IntTarget = 0;\r
         TrbStart->TrbCtrData.ISP       = 1;\r
@@ -339,18 +340,20 @@ XhcCreateTransferTrb (
         } else {\r
           TrbStart->TrbCtrData.DIR = 0;\r
         }\r
+\r
         //\r
         // Update the cycle bit\r
         //\r
         TrbStart->TrbCtrData.CycleBit = EPRing->RingPCS & BIT0;\r
         Urb->TrbNum++;\r
       }\r
+\r
       //\r
       // For control transfer, create STATUS_STAGE_TRB.\r
       // Get the pointer to next TRB for status stage use\r
       //\r
       XhcSyncTrsRing (Xhc, EPRing);\r
-      TrbStart = (TRB *)(UINTN)EPRing->RingEnqueue;\r
+      TrbStart                         = (TRB *)(UINTN)EPRing->RingEnqueue;\r
       TrbStart->TrbCtrStatus.IntTarget = 0;\r
       TrbStart->TrbCtrStatus.IOC       = 1;\r
       TrbStart->TrbCtrStatus.CH        = 0;\r
@@ -362,6 +365,7 @@ XhcCreateTransferTrb (
       } else {\r
         TrbStart->TrbCtrStatus.DIR = 0;\r
       }\r
+\r
       //\r
       // Update the cycle bit\r
       //\r
@@ -387,10 +391,11 @@ XhcCreateTransferTrb (
         } else {\r
           Len = 0x10000;\r
         }\r
-        TrbStart = (TRB *)(UINTN)EPRing->RingEnqueue;\r
-        TrbStart->TrbNormal.TRBPtrLo  = XHC_LOW_32BIT((UINT8 *) Urb->DataPhy + TotalLen);\r
-        TrbStart->TrbNormal.TRBPtrHi  = XHC_HIGH_32BIT((UINT8 *) Urb->DataPhy + TotalLen);\r
-        TrbStart->TrbNormal.Length    = (UINT32) Len;\r
+\r
+        TrbStart                      = (TRB *)(UINTN)EPRing->RingEnqueue;\r
+        TrbStart->TrbNormal.TRBPtrLo  = XHC_LOW_32BIT ((UINT8 *)Urb->DataPhy + TotalLen);\r
+        TrbStart->TrbNormal.TRBPtrHi  = XHC_HIGH_32BIT ((UINT8 *)Urb->DataPhy + TotalLen);\r
+        TrbStart->TrbNormal.Length    = (UINT32)Len;\r
         TrbStart->TrbNormal.TDSize    = 0;\r
         TrbStart->TrbNormal.IntTarget = 0;\r
         TrbStart->TrbNormal.ISP       = 1;\r
@@ -422,10 +427,11 @@ XhcCreateTransferTrb (
         } else {\r
           Len = 0x10000;\r
         }\r
-        TrbStart = (TRB *)(UINTN)EPRing->RingEnqueue;\r
-        TrbStart->TrbNormal.TRBPtrLo  = XHC_LOW_32BIT((UINT8 *) Urb->DataPhy + TotalLen);\r
-        TrbStart->TrbNormal.TRBPtrHi  = XHC_HIGH_32BIT((UINT8 *) Urb->DataPhy + TotalLen);\r
-        TrbStart->TrbNormal.Length    = (UINT32) Len;\r
+\r
+        TrbStart                      = (TRB *)(UINTN)EPRing->RingEnqueue;\r
+        TrbStart->TrbNormal.TRBPtrLo  = XHC_LOW_32BIT ((UINT8 *)Urb->DataPhy + TotalLen);\r
+        TrbStart->TrbNormal.TRBPtrHi  = XHC_HIGH_32BIT ((UINT8 *)Urb->DataPhy + TotalLen);\r
+        TrbStart->TrbNormal.Length    = (UINT32)Len;\r
         TrbStart->TrbNormal.TDSize    = 0;\r
         TrbStart->TrbNormal.IntTarget = 0;\r
         TrbStart->TrbNormal.ISP       = 1;\r
@@ -446,7 +452,7 @@ XhcCreateTransferTrb (
       break;\r
 \r
     default:\r
-      DEBUG ((DEBUG_INFO, "Not supported EPType 0x%x!\n",EPType));\r
+      DEBUG ((DEBUG_INFO, "Not supported EPType 0x%x!\n", EPType));\r
       ASSERT (FALSE);\r
       break;\r
   }\r
@@ -454,7 +460,6 @@ XhcCreateTransferTrb (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Initialize the XHCI host controller for schedule.\r
 \r
@@ -463,7 +468,7 @@ XhcCreateTransferTrb (
 **/\r
 VOID\r
 XhcInitSched (\r
-  IN USB_XHCI_INSTANCE    *Xhc\r
+  IN USB_XHCI_INSTANCE  *Xhc\r
   )\r
 {\r
   VOID                  *Dcbaa;\r
@@ -500,8 +505,8 @@ XhcInitSched (
   // The Device Context Base Address Array shall contain MaxSlotsEn + 1 entries.\r
   // Software shall set Device Context Base Address Array entries for unallocated Device Slots to '0'.\r
   //\r
-  Entries = (Xhc->MaxSlotsEn + 1) * sizeof(UINT64);\r
-  Dcbaa = UsbHcAllocateMem (Xhc->MemPool, Entries);\r
+  Entries = (Xhc->MaxSlotsEn + 1) * sizeof (UINT64);\r
+  Dcbaa   = UsbHcAllocateMem (Xhc->MemPool, Entries);\r
   ASSERT (Dcbaa != NULL);\r
   ZeroMem (Dcbaa, Entries);\r
 \r
@@ -529,14 +534,14 @@ XhcInitSched (
     Xhc->ScratchEntry = ScratchEntry;\r
 \r
     ScratchPhy = 0;\r
-    Status = UsbHcAllocateAlignedPages (\r
-               Xhc->PciIo,\r
-               EFI_SIZE_TO_PAGES (MaxScratchpadBufs * sizeof (UINT64)),\r
-               Xhc->PageSize,\r
-               (VOID **) &ScratchBuf,\r
-               &ScratchPhy,\r
-               &Xhc->ScratchMap\r
-               );\r
+    Status     = UsbHcAllocateAlignedPages (\r
+                   Xhc->PciIo,\r
+                   EFI_SIZE_TO_PAGES (MaxScratchpadBufs * sizeof (UINT64)),\r
+                   Xhc->PageSize,\r
+                   (VOID **)&ScratchBuf,\r
+                   &ScratchPhy,\r
+                   &Xhc->ScratchMap\r
+                   );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     ZeroMem (ScratchBuf, MaxScratchpadBufs * sizeof (UINT64));\r
@@ -547,14 +552,14 @@ XhcInitSched (
     //\r
     for (Index = 0; Index < MaxScratchpadBufs; Index++) {\r
       ScratchEntryPhy = 0;\r
-      Status = UsbHcAllocateAlignedPages (\r
-                 Xhc->PciIo,\r
-                 EFI_SIZE_TO_PAGES (Xhc->PageSize),\r
-                 Xhc->PageSize,\r
-                 (VOID **) &ScratchEntry[Index],\r
-                 &ScratchEntryPhy,\r
-                 (VOID **) &ScratchEntryMap[Index]\r
-                 );\r
+      Status          = UsbHcAllocateAlignedPages (\r
+                          Xhc->PciIo,\r
+                          EFI_SIZE_TO_PAGES (Xhc->PageSize),\r
+                          Xhc->PageSize,\r
+                          (VOID **)&ScratchEntry[Index],\r
+                          &ScratchEntryPhy,\r
+                          (VOID **)&ScratchEntryMap[Index]\r
+                          );\r
       ASSERT_EFI_ERROR (Status);\r
       ZeroMem ((VOID *)(UINTN)ScratchEntry[Index], Xhc->PageSize);\r
       //\r
@@ -562,11 +567,12 @@ XhcInitSched (
       //\r
       *ScratchBuf++ = ScratchEntryPhy;\r
     }\r
+\r
     //\r
     // The Scratchpad Buffer Array contains pointers to the Scratchpad Buffers. Entry 0 of the\r
     // Device Context Base Address Array points to the Scratchpad Buffer Array.\r
     //\r
-    *(UINT64 *)Dcbaa = (UINT64)(UINTN) ScratchPhy;\r
+    *(UINT64 *)Dcbaa = (UINT64)(UINTN)ScratchPhy;\r
   }\r
 \r
   //\r
@@ -579,7 +585,7 @@ XhcInitSched (
   // So divide it to two 32-bytes width register access.\r
   //\r
   DcbaaPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Dcbaa, Entries);\r
-  XhcWriteOpReg (Xhc, XHC_DCBAAP_OFFSET, XHC_LOW_32BIT(DcbaaPhy));\r
+  XhcWriteOpReg (Xhc, XHC_DCBAAP_OFFSET, XHC_LOW_32BIT (DcbaaPhy));\r
   XhcWriteOpReg (Xhc, XHC_DCBAAP_OFFSET + 4, XHC_HIGH_32BIT (DcbaaPhy));\r
 \r
   DEBUG ((DEBUG_INFO, "XhcInitSched:DCBAA=0x%x\n", (UINT64)(UINTN)Xhc->DCBAA));\r
@@ -596,15 +602,15 @@ XhcInitSched (
   // Transfer Ring it checks for a Cycle bit transition. If a transition detected, the ring is empty.\r
   // So we set RCS as inverted PCS init value to let Command Ring empty\r
   //\r
-  CmdRing  = (UINT64)(UINTN)Xhc->CmdRing.RingSeg0;\r
-  CmdRingPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, (VOID *)(UINTN) CmdRing, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER);\r
+  CmdRing    = (UINT64)(UINTN)Xhc->CmdRing.RingSeg0;\r
+  CmdRingPhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, (VOID *)(UINTN)CmdRing, sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER);\r
   ASSERT ((CmdRingPhy & 0x3F) == 0);\r
   CmdRingPhy |= XHC_CRCR_RCS;\r
   //\r
   // Some 3rd party XHCI external cards don't support single 64-bytes width register access,\r
   // So divide it to two 32-bytes width register access.\r
   //\r
-  XhcWriteOpReg (Xhc, XHC_CRCR_OFFSET, XHC_LOW_32BIT(CmdRingPhy));\r
+  XhcWriteOpReg (Xhc, XHC_CRCR_OFFSET, XHC_LOW_32BIT (CmdRingPhy));\r
   XhcWriteOpReg (Xhc, XHC_CRCR_OFFSET + 4, XHC_HIGH_32BIT (CmdRingPhy));\r
 \r
   //\r
@@ -621,9 +627,13 @@ XhcInitSched (
   // Allocate EventRing for Cmd, Ctrl, Bulk, Interrupt, AsynInterrupt transfer\r
   //\r
   CreateEventRing (Xhc, &Xhc->EventRing);\r
-  DEBUG ((DEBUG_INFO, "XhcInitSched: Created CMD ring [%p~%p) EVENT ring [%p~%p)\n",\r
-    Xhc->CmdRing.RingSeg0,        (UINTN)Xhc->CmdRing.RingSeg0 + sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER,\r
-    Xhc->EventRing.EventRingSeg0, (UINTN)Xhc->EventRing.EventRingSeg0 + sizeof (TRB_TEMPLATE) * EVENT_RING_TRB_NUMBER\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "XhcInitSched: Created CMD ring [%p~%p) EVENT ring [%p~%p)\n",\r
+    Xhc->CmdRing.RingSeg0,\r
+    (UINTN)Xhc->CmdRing.RingSeg0 + sizeof (TRB_TEMPLATE) * CMD_RING_TRB_NUMBER,\r
+    Xhc->EventRing.EventRingSeg0,\r
+    (UINTN)Xhc->EventRing.EventRingSeg0 + sizeof (TRB_TEMPLATE) * EVENT_RING_TRB_NUMBER\r
     ));\r
 }\r
 \r
@@ -644,19 +654,20 @@ XhcInitSched (
 EFI_STATUS\r
 EFIAPI\r
 XhcRecoverHaltedEndpoint (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  URB                 *Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  URB                *Urb\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       Dci;\r
-  UINT8                       SlotId;\r
+  EFI_STATUS  Status;\r
+  UINT8       Dci;\r
+  UINT8       SlotId;\r
 \r
   Status = EFI_SUCCESS;\r
   SlotId = XhcBusDevAddrToSlotId (Xhc, Urb->Ep.BusAddr);\r
   if (SlotId == 0) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r
 \r
@@ -665,8 +676,8 @@ XhcRecoverHaltedEndpoint (
   //\r
   // 1) Send Reset endpoint command to transit from halt to stop state\r
   //\r
-  Status = XhcResetEndpoint(Xhc, SlotId, Dci);\r
-  if (EFI_ERROR(Status)) {\r
+  Status = XhcResetEndpoint (Xhc, SlotId, Dci);\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcRecoverHaltedEndpoint: Reset Endpoint Failed, Status = %r\n", Status));\r
     goto Done;\r
   }\r
@@ -674,8 +685,8 @@ XhcRecoverHaltedEndpoint (
   //\r
   // 2)Set dequeue pointer\r
   //\r
-  Status = XhcSetTrDequeuePointer(Xhc, SlotId, Dci, Urb);\r
-  if (EFI_ERROR(Status)) {\r
+  Status = XhcSetTrDequeuePointer (Xhc, SlotId, Dci, Urb);\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcRecoverHaltedEndpoint: Set Transfer Ring Dequeue Pointer Failed, Status = %r\n", Status));\r
     goto Done;\r
   }\r
@@ -706,19 +717,20 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 XhcDequeueTrbFromEndpoint (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  URB                 *Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  URB                *Urb\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  UINT8                       Dci;\r
-  UINT8                       SlotId;\r
+  EFI_STATUS  Status;\r
+  UINT8       Dci;\r
+  UINT8       SlotId;\r
 \r
   Status = EFI_SUCCESS;\r
   SlotId = XhcBusDevAddrToSlotId (Xhc, Urb->Ep.BusAddr);\r
   if (SlotId == 0) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
+\r
   Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
   ASSERT (Dci < 32);\r
 \r
@@ -727,8 +739,8 @@ XhcDequeueTrbFromEndpoint (
   //\r
   // 1) Send Stop endpoint command to stop xHC from executing of the TDs on the endpoint\r
   //\r
-  Status = XhcStopEndpoint(Xhc, SlotId, Dci, Urb);\r
-  if (EFI_ERROR(Status)) {\r
+  Status = XhcStopEndpoint (Xhc, SlotId, Dci, Urb);\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcDequeueTrbFromEndpoint: Stop Endpoint Failed, Status = %r\n", Status));\r
     goto Done;\r
   }\r
@@ -736,7 +748,7 @@ XhcDequeueTrbFromEndpoint (
   //\r
   // 2)Set dequeue pointer\r
   //\r
-  if (Urb->Finished && Urb->Result == EFI_USB_NOERROR) {\r
+  if (Urb->Finished && (Urb->Result == EFI_USB_NOERROR)) {\r
     //\r
     // Return Already Started to indicate the pending URB is finished.\r
     // This fixes BULK data loss when transfer is detected as timeout\r
@@ -745,7 +757,7 @@ XhcDequeueTrbFromEndpoint (
     Status = EFI_ALREADY_STARTED;\r
     DEBUG ((DEBUG_INFO, "XhcDequeueTrbFromEndpoint: Pending URB is finished: Length Actual/Expect = %d/%d!\n", Urb->Completed, Urb->DataLen));\r
   } else {\r
-    Status = XhcSetTrDequeuePointer(Xhc, SlotId, Dci, Urb);\r
+    Status = XhcSetTrDequeuePointer (Xhc, SlotId, Dci, Urb);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "XhcDequeueTrbFromEndpoint: Set Transfer Ring Dequeue Pointer Failed, Status = %r\n", Status));\r
       goto Done;\r
@@ -770,8 +782,8 @@ Done:
 **/\r
 VOID\r
 CreateEventRing (\r
-  IN  USB_XHCI_INSTANCE     *Xhc,\r
-  OUT EVENT_RING            *EventRing\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  OUT EVENT_RING         *EventRing\r
   )\r
 {\r
   VOID                        *Buf;\r
@@ -783,15 +795,15 @@ CreateEventRing (
   ASSERT (EventRing != NULL);\r
 \r
   Size = sizeof (TRB_TEMPLATE) * EVENT_RING_TRB_NUMBER;\r
-  Buf = UsbHcAllocateMem (Xhc->MemPool, Size);\r
+  Buf  = UsbHcAllocateMem (Xhc->MemPool, Size);\r
   ASSERT (Buf != NULL);\r
-  ASSERT (((UINTN) Buf & 0x3F) == 0);\r
+  ASSERT (((UINTN)Buf & 0x3F) == 0);\r
   ZeroMem (Buf, Size);\r
 \r
   EventRing->EventRingSeg0    = Buf;\r
   EventRing->TrbNumber        = EVENT_RING_TRB_NUMBER;\r
-  EventRing->EventRingDequeue = (TRB_TEMPLATE *) EventRing->EventRingSeg0;\r
-  EventRing->EventRingEnqueue = (TRB_TEMPLATE *) EventRing->EventRingSeg0;\r
+  EventRing->EventRingDequeue = (TRB_TEMPLATE *)EventRing->EventRingSeg0;\r
+  EventRing->EventRingEnqueue = (TRB_TEMPLATE *)EventRing->EventRingSeg0;\r
 \r
   DequeuePhy = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, Size);\r
 \r
@@ -802,12 +814,12 @@ CreateEventRing (
   EventRing->EventRingCCS = 1;\r
 \r
   Size = sizeof (EVENT_RING_SEG_TABLE_ENTRY) * ERST_NUMBER;\r
-  Buf = UsbHcAllocateMem (Xhc->MemPool, Size);\r
+  Buf  = UsbHcAllocateMem (Xhc->MemPool, Size);\r
   ASSERT (Buf != NULL);\r
-  ASSERT (((UINTN) Buf & 0x3F) == 0);\r
+  ASSERT (((UINTN)Buf & 0x3F) == 0);\r
   ZeroMem (Buf, Size);\r
 \r
-  ERSTBase              = (EVENT_RING_SEG_TABLE_ENTRY *) Buf;\r
+  ERSTBase              = (EVENT_RING_SEG_TABLE_ENTRY *)Buf;\r
   EventRing->ERSTBase   = ERSTBase;\r
   ERSTBase->PtrLo       = XHC_LOW_32BIT (DequeuePhy);\r
   ERSTBase->PtrHi       = XHC_HIGH_32BIT (DequeuePhy);\r
@@ -832,12 +844,12 @@ CreateEventRing (
   XhcWriteRuntimeReg (\r
     Xhc,\r
     XHC_ERDP_OFFSET,\r
-    XHC_LOW_32BIT((UINT64)(UINTN)DequeuePhy)\r
+    XHC_LOW_32BIT ((UINT64)(UINTN)DequeuePhy)\r
     );\r
   XhcWriteRuntimeReg (\r
     Xhc,\r
     XHC_ERDP_OFFSET + 4,\r
-    XHC_HIGH_32BIT((UINT64)(UINTN)DequeuePhy)\r
+    XHC_HIGH_32BIT ((UINT64)(UINTN)DequeuePhy)\r
     );\r
   //\r
   // Program the Interrupter Event Ring Segment Table Base Address (ERSTBA) register(5.5.2.3.2)\r
@@ -848,12 +860,12 @@ CreateEventRing (
   XhcWriteRuntimeReg (\r
     Xhc,\r
     XHC_ERSTBA_OFFSET,\r
-    XHC_LOW_32BIT((UINT64)(UINTN)ERSTPhy)\r
+    XHC_LOW_32BIT ((UINT64)(UINTN)ERSTPhy)\r
     );\r
   XhcWriteRuntimeReg (\r
     Xhc,\r
     XHC_ERSTBA_OFFSET + 4,\r
-    XHC_HIGH_32BIT((UINT64)(UINTN)ERSTPhy)\r
+    XHC_HIGH_32BIT ((UINT64)(UINTN)ERSTPhy)\r
     );\r
   //\r
   // Need set IMAN IE bit to enble the ring interrupt\r
@@ -871,9 +883,9 @@ CreateEventRing (
 **/\r
 VOID\r
 CreateTransferRing (\r
-  IN  USB_XHCI_INSTANCE     *Xhc,\r
-  IN  UINTN                 TrbNum,\r
-  OUT TRANSFER_RING         *TransferRing\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  UINTN              TrbNum,\r
+  OUT TRANSFER_RING      *TransferRing\r
   )\r
 {\r
   VOID                  *Buf;\r
@@ -882,28 +894,28 @@ CreateTransferRing (
 \r
   Buf = UsbHcAllocateMem (Xhc->MemPool, sizeof (TRB_TEMPLATE) * TrbNum);\r
   ASSERT (Buf != NULL);\r
-  ASSERT (((UINTN) Buf & 0x3F) == 0);\r
+  ASSERT (((UINTN)Buf & 0x3F) == 0);\r
   ZeroMem (Buf, sizeof (TRB_TEMPLATE) * TrbNum);\r
 \r
-  TransferRing->RingSeg0     = Buf;\r
-  TransferRing->TrbNumber    = TrbNum;\r
-  TransferRing->RingEnqueue  = (TRB_TEMPLATE *) TransferRing->RingSeg0;\r
-  TransferRing->RingDequeue  = (TRB_TEMPLATE *) TransferRing->RingSeg0;\r
-  TransferRing->RingPCS      = 1;\r
+  TransferRing->RingSeg0    = Buf;\r
+  TransferRing->TrbNumber   = TrbNum;\r
+  TransferRing->RingEnqueue = (TRB_TEMPLATE *)TransferRing->RingSeg0;\r
+  TransferRing->RingDequeue = (TRB_TEMPLATE *)TransferRing->RingSeg0;\r
+  TransferRing->RingPCS     = 1;\r
   //\r
   // 4.9.2 Transfer Ring Management\r
   // To form a ring (or circular queue) a Link TRB may be inserted at the end of a ring to\r
   // point to the first TRB in the ring.\r
   //\r
-  EndTrb        = (LINK_TRB *) ((UINTN)Buf + sizeof (TRB_TEMPLATE) * (TrbNum - 1));\r
+  EndTrb        = (LINK_TRB *)((UINTN)Buf + sizeof (TRB_TEMPLATE) * (TrbNum - 1));\r
   EndTrb->Type  = TRB_TYPE_LINK;\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, sizeof (TRB_TEMPLATE) * TrbNum);\r
+  PhyAddr       = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Buf, sizeof (TRB_TEMPLATE) * TrbNum);\r
   EndTrb->PtrLo = XHC_LOW_32BIT (PhyAddr);\r
   EndTrb->PtrHi = XHC_HIGH_32BIT (PhyAddr);\r
   //\r
   // Toggle Cycle (TC). When set to '1', the xHC shall toggle its interpretation of the Cycle bit.\r
   //\r
-  EndTrb->TC    = 1;\r
+  EndTrb->TC = 1;\r
   //\r
   // Set Cycle bit as other TRB PCS init value\r
   //\r
@@ -920,11 +932,11 @@ CreateTransferRing (
 EFI_STATUS\r
 EFIAPI\r
 XhcFreeEventRing (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  EVENT_RING          *EventRing\r
-)\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  EVENT_RING         *EventRing\r
+  )\r
 {\r
-  if(EventRing->EventRingSeg0 == NULL) {\r
+  if (EventRing->EventRingSeg0 == NULL) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -948,11 +960,11 @@ XhcFreeEventRing (
 **/\r
 VOID\r
 XhcFreeSched (\r
-  IN USB_XHCI_INSTANCE    *Xhc\r
+  IN USB_XHCI_INSTANCE  *Xhc\r
   )\r
 {\r
-  UINT32                  Index;\r
-  UINT64                  *ScratchEntry;\r
+  UINT32  Index;\r
+  UINT64  *ScratchEntry;\r
 \r
   if (Xhc->ScratchBuf != NULL) {\r
     ScratchEntry = Xhc->ScratchEntry;\r
@@ -960,8 +972,9 @@ XhcFreeSched (
       //\r
       // Free Scratchpad Buffers\r
       //\r
-      UsbHcFreeAlignedPages (Xhc->PciIo, (VOID*)(UINTN)ScratchEntry[Index], EFI_SIZE_TO_PAGES (Xhc->PageSize), (VOID *) Xhc->ScratchEntryMap[Index]);\r
+      UsbHcFreeAlignedPages (Xhc->PciIo, (VOID *)(UINTN)ScratchEntry[Index], EFI_SIZE_TO_PAGES (Xhc->PageSize), (VOID *)Xhc->ScratchEntryMap[Index]);\r
     }\r
+\r
     //\r
     // Free Scratchpad Buffer Array\r
     //\r
@@ -975,10 +988,10 @@ XhcFreeSched (
     Xhc->CmdRing.RingSeg0 = NULL;\r
   }\r
 \r
-  XhcFreeEventRing (Xhc,&Xhc->EventRing);\r
+  XhcFreeEventRing (Xhc, &Xhc->EventRing);\r
 \r
   if (Xhc->DCBAA != NULL) {\r
-    UsbHcFreeMem (Xhc->MemPool, Xhc->DCBAA, (Xhc->MaxSlotsEn + 1) * sizeof(UINT64));\r
+    UsbHcFreeMem (Xhc->MemPool, Xhc->DCBAA, (Xhc->MaxSlotsEn + 1) * sizeof (UINT64));\r
     Xhc->DCBAA = NULL;\r
   }\r
 \r
@@ -1004,30 +1017,31 @@ XhcFreeSched (
 **/\r
 BOOLEAN\r
 IsTransferRingTrb (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  TRB_TEMPLATE        *Trb,\r
-  IN  URB                 *Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  TRB_TEMPLATE       *Trb,\r
+  IN  URB                *Urb\r
   )\r
 {\r
-  LINK_TRB      *LinkTrb;\r
-  TRB_TEMPLATE  *CheckedTrb;\r
-  UINTN         Index;\r
-  EFI_PHYSICAL_ADDRESS PhyAddr;\r
+  LINK_TRB              *LinkTrb;\r
+  TRB_TEMPLATE          *CheckedTrb;\r
+  UINTN                 Index;\r
+  EFI_PHYSICAL_ADDRESS  PhyAddr;\r
 \r
   CheckedTrb = Urb->TrbStart;\r
   for (Index = 0; Index < Urb->TrbNum; Index++) {\r
     if (Trb == CheckedTrb) {\r
       return TRUE;\r
     }\r
+\r
     CheckedTrb++;\r
     //\r
     // If the checked TRB is the link TRB at the end of the transfer ring,\r
     // recircle it to the head of the ring.\r
     //\r
     if (CheckedTrb->Type == TRB_TYPE_LINK) {\r
-      LinkTrb = (LINK_TRB *) CheckedTrb;\r
-      PhyAddr = (EFI_PHYSICAL_ADDRESS)(LinkTrb->PtrLo | LShiftU64 ((UINT64) LinkTrb->PtrHi, 32));\r
-      CheckedTrb = (TRB_TEMPLATE *)(UINTN) UsbHcGetHostAddrForPciAddr (Xhc->MemPool, (VOID *)(UINTN) PhyAddr, sizeof (TRB_TEMPLATE));\r
+      LinkTrb    = (LINK_TRB *)CheckedTrb;\r
+      PhyAddr    = (EFI_PHYSICAL_ADDRESS)(LinkTrb->PtrLo | LShiftU64 ((UINT64)LinkTrb->PtrHi, 32));\r
+      CheckedTrb = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc->MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE));\r
       ASSERT (CheckedTrb == Urb->Ring->RingSeg0);\r
     }\r
   }\r
@@ -1048,14 +1062,14 @@ IsTransferRingTrb (
 **/\r
 BOOLEAN\r
 IsAsyncIntTrb (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  TRB_TEMPLATE        *Trb,\r
-  OUT URB                 **Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  TRB_TEMPLATE       *Trb,\r
+  OUT URB                **Urb\r
   )\r
 {\r
-  LIST_ENTRY              *Entry;\r
-  LIST_ENTRY              *Next;\r
-  URB                     *CheckedUrb;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  URB         *CheckedUrb;\r
 \r
   BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {\r
     CheckedUrb = EFI_LIST_CONTAINER (Entry, URB, UrbList);\r
@@ -1068,7 +1082,6 @@ IsAsyncIntTrb (
   return FALSE;\r
 }\r
 \r
-\r
 /**\r
   Check the URB's execution result and update the URB's\r
   result accordingly.\r
@@ -1081,21 +1094,21 @@ IsAsyncIntTrb (
 **/\r
 BOOLEAN\r
 XhcCheckUrbResult (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  URB                 *Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  URB                *Urb\r
   )\r
 {\r
-  EVT_TRB_TRANSFER        *EvtTrb;\r
-  TRB_TEMPLATE            *TRBPtr;\r
-  UINTN                   Index;\r
-  UINT8                   TRBType;\r
-  EFI_STATUS              Status;\r
-  URB                     *AsyncUrb;\r
-  URB                     *CheckedUrb;\r
-  UINT64                  XhcDequeue;\r
-  UINT32                  High;\r
-  UINT32                  Low;\r
-  EFI_PHYSICAL_ADDRESS    PhyAddr;\r
+  EVT_TRB_TRANSFER      *EvtTrb;\r
+  TRB_TEMPLATE          *TRBPtr;\r
+  UINTN                 Index;\r
+  UINT8                 TRBType;\r
+  EFI_STATUS            Status;\r
+  URB                   *AsyncUrb;\r
+  URB                   *CheckedUrb;\r
+  UINT64                XhcDequeue;\r
+  UINT32                High;\r
+  UINT32                Low;\r
+  EFI_PHYSICAL_ADDRESS  PhyAddr;\r
 \r
   ASSERT ((Xhc != NULL) && (Urb != NULL));\r
 \r
@@ -1136,8 +1149,8 @@ XhcCheckUrbResult (
     //\r
     // Need convert pci device address to host address\r
     //\r
-    PhyAddr = (EFI_PHYSICAL_ADDRESS)(EvtTrb->TRBPtrLo | LShiftU64 ((UINT64) EvtTrb->TRBPtrHi, 32));\r
-    TRBPtr = (TRB_TEMPLATE *)(UINTN) UsbHcGetHostAddrForPciAddr (Xhc->MemPool, (VOID *)(UINTN) PhyAddr, sizeof (TRB_TEMPLATE));\r
+    PhyAddr = (EFI_PHYSICAL_ADDRESS)(EvtTrb->TRBPtrLo | LShiftU64 ((UINT64)EvtTrb->TRBPtrHi, 32));\r
+    TRBPtr  = (TRB_TEMPLATE *)(UINTN)UsbHcGetHostAddrForPciAddr (Xhc->MemPool, (VOID *)(UINTN)PhyAddr, sizeof (TRB_TEMPLATE));\r
 \r
     //\r
     // Update the status of URB including the pending URB, the URB that is currently checked,\r
@@ -1145,7 +1158,7 @@ XhcCheckUrbResult (
     // This way is used to avoid that those completed async transfer events don't get\r
     // handled in time and are flushed by newer coming events.\r
     //\r
-    if (Xhc->PendingUrb != NULL && IsTransferRingTrb (Xhc, TRBPtr, Xhc->PendingUrb)) {\r
+    if ((Xhc->PendingUrb != NULL) && IsTransferRingTrb (Xhc, TRBPtr, Xhc->PendingUrb)) {\r
       CheckedUrb = Xhc->PendingUrb;\r
     } else if (IsTransferRingTrb (Xhc, TRBPtr, Urb)) {\r
       CheckedUrb = Urb;\r
@@ -1159,25 +1172,25 @@ XhcCheckUrbResult (
       case TRB_COMPLETION_STALL_ERROR:\r
         CheckedUrb->Result  |= EFI_USB_ERR_STALL;\r
         CheckedUrb->Finished = TRUE;\r
-        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: STALL_ERROR! Completecode = %x\n",EvtTrb->Completecode));\r
+        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: STALL_ERROR! Completecode = %x\n", EvtTrb->Completecode));\r
         goto EXIT;\r
 \r
       case TRB_COMPLETION_BABBLE_ERROR:\r
         CheckedUrb->Result  |= EFI_USB_ERR_BABBLE;\r
         CheckedUrb->Finished = TRUE;\r
-        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: BABBLE_ERROR! Completecode = %x\n",EvtTrb->Completecode));\r
+        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: BABBLE_ERROR! Completecode = %x\n", EvtTrb->Completecode));\r
         goto EXIT;\r
 \r
       case TRB_COMPLETION_DATA_BUFFER_ERROR:\r
         CheckedUrb->Result  |= EFI_USB_ERR_BUFFER;\r
         CheckedUrb->Finished = TRUE;\r
-        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: ERR_BUFFER! Completecode = %x\n",EvtTrb->Completecode));\r
+        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: ERR_BUFFER! Completecode = %x\n", EvtTrb->Completecode));\r
         goto EXIT;\r
 \r
       case TRB_COMPLETION_USB_TRANSACTION_ERROR:\r
         CheckedUrb->Result  |= EFI_USB_ERR_TIMEOUT;\r
         CheckedUrb->Finished = TRUE;\r
-        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: TRANSACTION_ERROR! Completecode = %x\n",EvtTrb->Completecode));\r
+        DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: TRANSACTION_ERROR! Completecode = %x\n", EvtTrb->Completecode));\r
         goto EXIT;\r
 \r
       case TRB_COMPLETION_STOPPED:\r
@@ -1196,17 +1209,18 @@ XhcCheckUrbResult (
           DEBUG ((DEBUG_VERBOSE, "XhcCheckUrbResult: short packet happens!\n"));\r
         }\r
 \r
-        TRBType = (UINT8) (TRBPtr->Type);\r
+        TRBType = (UINT8)(TRBPtr->Type);\r
         if ((TRBType == TRB_TYPE_DATA_STAGE) ||\r
             (TRBType == TRB_TYPE_NORMAL) ||\r
-            (TRBType == TRB_TYPE_ISOCH)) {\r
-          CheckedUrb->Completed += (((TRANSFER_TRB_NORMAL*)TRBPtr)->Length - EvtTrb->Length);\r
+            (TRBType == TRB_TYPE_ISOCH))\r
+        {\r
+          CheckedUrb->Completed += (((TRANSFER_TRB_NORMAL *)TRBPtr)->Length - EvtTrb->Length);\r
         }\r
 \r
         break;\r
 \r
       default:\r
-        DEBUG ((DEBUG_ERROR, "Transfer Default Error Occur! Completecode = 0x%x!\n",EvtTrb->Completecode));\r
+        DEBUG ((DEBUG_ERROR, "Transfer Default Error Occur! Completecode = 0x%x!\n", EvtTrb->Completecode));\r
         CheckedUrb->Result  |= EFI_USB_ERR_TIMEOUT;\r
         CheckedUrb->Finished = TRUE;\r
         goto EXIT;\r
@@ -1237,9 +1251,9 @@ EXIT:
   // Some 3rd party XHCI external cards don't support single 64-bytes width register access,\r
   // So divide it to two 32-bytes width register access.\r
   //\r
-  Low  = XhcReadRuntimeReg (Xhc, XHC_ERDP_OFFSET);\r
-  High = XhcReadRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4);\r
-  XhcDequeue = (UINT64)(LShiftU64((UINT64)High, 32) | Low);\r
+  Low        = XhcReadRuntimeReg (Xhc, XHC_ERDP_OFFSET);\r
+  High       = XhcReadRuntimeReg (Xhc, XHC_ERDP_OFFSET + 4);\r
+  XhcDequeue = (UINT64)(LShiftU64 ((UINT64)High, 32) | Low);\r
 \r
   PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc->EventRing.EventRingDequeue, sizeof (TRB_TEMPLATE));\r
 \r
@@ -1255,7 +1269,6 @@ EXIT:
   return Urb->Finished;\r
 }\r
 \r
-\r
 /**\r
   Execute the transfer by polling the URB. This is a synchronous operation.\r
 \r
@@ -1272,18 +1285,18 @@ EXIT:
 **/\r
 EFI_STATUS\r
 XhcExecTransfer (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  BOOLEAN             CmdTransfer,\r
-  IN  URB                 *Urb,\r
-  IN  UINTN               Timeout\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  BOOLEAN            CmdTransfer,\r
+  IN  URB                *Urb,\r
+  IN  UINTN              Timeout\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINT8                   SlotId;\r
-  UINT8                   Dci;\r
-  BOOLEAN                 Finished;\r
-  EFI_EVENT               TimeoutEvent;\r
-  BOOLEAN                 IndefiniteTimeout;\r
+  EFI_STATUS  Status;\r
+  UINT8       SlotId;\r
+  UINT8       Dci;\r
+  BOOLEAN     Finished;\r
+  EFI_EVENT   TimeoutEvent;\r
+  BOOLEAN     IndefiniteTimeout;\r
 \r
   Status            = EFI_SUCCESS;\r
   Finished          = FALSE;\r
@@ -1298,7 +1311,8 @@ XhcExecTransfer (
     if (SlotId == 0) {\r
       return EFI_DEVICE_ERROR;\r
     }\r
-    Dci  = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
+\r
+    Dci = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
     ASSERT (Dci < 32);\r
   }\r
 \r
@@ -1319,9 +1333,11 @@ XhcExecTransfer (
     goto DONE;\r
   }\r
 \r
-  Status = gBS->SetTimer (TimeoutEvent,\r
-                          TimerRelative,\r
-                          EFI_TIMER_PERIOD_MILLISECONDS(Timeout));\r
+  Status = gBS->SetTimer (\r
+                  TimeoutEvent,\r
+                  TimerRelative,\r
+                  EFI_TIMER_PERIOD_MILLISECONDS (Timeout)\r
+                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto DONE;\r
@@ -1335,17 +1351,18 @@ RINGDOORBELL:
     if (Finished) {\r
       break;\r
     }\r
+\r
     gBS->Stall (XHC_1_MICROSECOND);\r
-  } while (IndefiniteTimeout || EFI_ERROR(gBS->CheckEvent (TimeoutEvent)));\r
+  } while (IndefiniteTimeout || EFI_ERROR (gBS->CheckEvent (TimeoutEvent)));\r
 \r
 DONE:\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     Urb->Result = EFI_USB_ERR_NOTEXECUTE;\r
   } else if (!Finished) {\r
     Urb->Result = EFI_USB_ERR_TIMEOUT;\r
     Status      = EFI_TIMEOUT;\r
   } else if (Urb->Result != EFI_USB_NOERROR) {\r
-    Status      = EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
   if (TimeoutEvent != NULL) {\r
@@ -1369,9 +1386,9 @@ DONE:
 **/\r
 EFI_STATUS\r
 XhciDelAsyncIntTransfer (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  UINT8               BusAddr,\r
-  IN  UINT8               EpNum\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  UINT8              BusAddr,\r
+  IN  UINT8              EpNum\r
   )\r
 {\r
   LIST_ENTRY              *Entry;\r
@@ -1389,7 +1406,8 @@ XhciDelAsyncIntTransfer (
     Urb = EFI_LIST_CONTAINER (Entry, URB, UrbList);\r
     if ((Urb->Ep.BusAddr == BusAddr) &&\r
         (Urb->Ep.EpAddr == EpNum) &&\r
-        (Urb->Ep.Direction == Direction)) {\r
+        (Urb->Ep.Direction == Direction))\r
+    {\r
       //\r
       // Device doesn't finish the IntTransfer until real data comes\r
       // So the TRB should be removed as well.\r
@@ -1417,13 +1435,13 @@ XhciDelAsyncIntTransfer (
 **/\r
 VOID\r
 XhciDelAllAsyncIntTransfers (\r
-  IN USB_XHCI_INSTANCE    *Xhc\r
+  IN USB_XHCI_INSTANCE  *Xhc\r
   )\r
 {\r
-  LIST_ENTRY              *Entry;\r
-  LIST_ENTRY              *Next;\r
-  URB                     *Urb;\r
-  EFI_STATUS              Status;\r
+  LIST_ENTRY  *Entry;\r
+  LIST_ENTRY  *Next;\r
+  URB         *Urb;\r
+  EFI_STATUS  Status;\r
 \r
   BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {\r
     Urb = EFI_LIST_CONTAINER (Entry, URB, UrbList);\r
@@ -1461,18 +1479,18 @@ XhciDelAllAsyncIntTransfers (
 **/\r
 URB *\r
 XhciInsertAsyncIntTransfer (\r
-  IN USB_XHCI_INSTANCE                  *Xhc,\r
-  IN UINT8                              BusAddr,\r
-  IN UINT8                              EpAddr,\r
-  IN UINT8                              DevSpeed,\r
-  IN UINTN                              MaxPacket,\r
-  IN UINTN                              DataLen,\r
-  IN EFI_ASYNC_USB_TRANSFER_CALLBACK    Callback,\r
-  IN VOID                               *Context\r
+  IN USB_XHCI_INSTANCE                *Xhc,\r
+  IN UINT8                            BusAddr,\r
+  IN UINT8                            EpAddr,\r
+  IN UINT8                            DevSpeed,\r
+  IN UINTN                            MaxPacket,\r
+  IN UINTN                            DataLen,\r
+  IN EFI_ASYNC_USB_TRANSFER_CALLBACK  Callback,\r
+  IN VOID                             *Context\r
   )\r
 {\r
-  VOID      *Data;\r
-  URB       *Urb;\r
+  VOID  *Data;\r
+  URB   *Urb;\r
 \r
   Data = AllocateZeroPool (DataLen);\r
   if (Data == NULL) {\r
@@ -1517,17 +1535,18 @@ XhciInsertAsyncIntTransfer (
 **/\r
 VOID\r
 XhcUpdateAsyncRequest (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN URB                      *Urb\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN URB                *Urb\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (Urb->Result == EFI_USB_NOERROR) {\r
     Status = XhcCreateTransferTrb (Xhc, Urb);\r
     if (EFI_ERROR (Status)) {\r
       return;\r
     }\r
+\r
     Status = RingIntTransferDoorBell (Xhc, Urb);\r
     if (EFI_ERROR (Status)) {\r
       return;\r
@@ -1548,16 +1567,16 @@ XhcUpdateAsyncRequest (
 **/\r
 EFI_STATUS\r
 XhcFlushAsyncIntMap (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  URB                 *Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  URB                *Urb\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_PHYSICAL_ADDRESS          PhyAddr;\r
-  EFI_PCI_IO_PROTOCOL_OPERATION MapOp;\r
-  EFI_PCI_IO_PROTOCOL           *PciIo;\r
-  UINTN                         Len;\r
-  VOID                          *Map;\r
+  EFI_STATUS                     Status;\r
+  EFI_PHYSICAL_ADDRESS           PhyAddr;\r
+  EFI_PCI_IO_PROTOCOL_OPERATION  MapOp;\r
+  EFI_PCI_IO_PROTOCOL            *PciIo;\r
+  UINTN                          Len;\r
+  VOID                           *Map;\r
 \r
   PciIo = Xhc->PciIo;\r
   Len   = Urb->DataLen;\r
@@ -1582,8 +1601,8 @@ XhcFlushAsyncIntMap (
     goto ON_ERROR;\r
   }\r
 \r
-  Urb->DataPhy  = (VOID *) ((UINTN) PhyAddr);\r
-  Urb->DataMap  = Map;\r
+  Urb->DataPhy = (VOID *)((UINTN)PhyAddr);\r
+  Urb->DataMap = Map;\r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
@@ -1600,22 +1619,22 @@ ON_ERROR:
 VOID\r
 EFIAPI\r
 XhcMonitorAsyncRequests (\r
-  IN EFI_EVENT            Event,\r
-  IN VOID                 *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  USB_XHCI_INSTANCE       *Xhc;\r
-  LIST_ENTRY              *Entry;\r
-  LIST_ENTRY              *Next;\r
-  UINT8                   *ProcBuf;\r
-  URB                     *Urb;\r
-  UINT8                   SlotId;\r
-  EFI_STATUS              Status;\r
-  EFI_TPL                 OldTpl;\r
+  USB_XHCI_INSTANCE  *Xhc;\r
+  LIST_ENTRY         *Entry;\r
+  LIST_ENTRY         *Next;\r
+  UINT8              *ProcBuf;\r
+  URB                *Urb;\r
+  UINT8              SlotId;\r
+  EFI_STATUS         Status;\r
+  EFI_TPL            OldTpl;\r
 \r
   OldTpl = gBS->RaiseTPL (XHC_TPL);\r
 \r
-  Xhc    = (USB_XHCI_INSTANCE*) Context;\r
+  Xhc = (USB_XHCI_INSTANCE *)Context;\r
 \r
   BASE_LIST_FOR_EACH_SAFE (Entry, Next, &Xhc->AsyncIntTransfers) {\r
     Urb = EFI_LIST_CONTAINER (Entry, URB, UrbList);\r
@@ -1685,7 +1704,7 @@ XhcMonitorAsyncRequests (
       // his callback. Some drivers may has a lower TPL restriction.\r
       //\r
       gBS->RestoreTPL (OldTpl);\r
-      (Urb->Callback) (ProcBuf, Urb->Completed, Urb->Context, Urb->Result);\r
+      (Urb->Callback)(ProcBuf, Urb->Completed, Urb->Context, Urb->Result);\r
       OldTpl = gBS->RaiseTPL (XHC_TPL);\r
     }\r
 \r
@@ -1713,19 +1732,19 @@ XhcMonitorAsyncRequests (
 EFI_STATUS\r
 EFIAPI\r
 XhcPollPortStatusChange (\r
-  IN  USB_XHCI_INSTANCE     *Xhc,\r
-  IN  USB_DEV_ROUTE         ParentRouteChart,\r
-  IN  UINT8                 Port,\r
-  IN  EFI_USB_PORT_STATUS   *PortState\r
+  IN  USB_XHCI_INSTANCE    *Xhc,\r
+  IN  USB_DEV_ROUTE        ParentRouteChart,\r
+  IN  UINT8                Port,\r
+  IN  EFI_USB_PORT_STATUS  *PortState\r
   )\r
 {\r
-  EFI_STATUS        Status;\r
-  UINT8             Speed;\r
-  UINT8             SlotId;\r
-  UINT8             Retries;\r
-  USB_DEV_ROUTE     RouteChart;\r
+  EFI_STATUS     Status;\r
+  UINT8          Speed;\r
+  UINT8          SlotId;\r
+  UINT8          Retries;\r
+  USB_DEV_ROUTE  RouteChart;\r
 \r
-  Status = EFI_SUCCESS;\r
+  Status  = EFI_SUCCESS;\r
   Retries = XHC_INIT_DEVICE_SLOT_RETRIES;\r
 \r
   if ((PortState->PortChangeStatus & (USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE | USB_PORT_STAT_C_OVERCURRENT | USB_PORT_STAT_C_RESET)) == 0) {\r
@@ -1737,13 +1756,14 @@ XhcPollPortStatusChange (
     RouteChart.Route.RootPortNum = Port + 1;\r
     RouteChart.Route.TierNum     = 1;\r
   } else {\r
-    if(Port < 14) {\r
+    if (Port < 14) {\r
       RouteChart.Route.RouteString = ParentRouteChart.Route.RouteString | (Port << (4 * (ParentRouteChart.Route.TierNum - 1)));\r
     } else {\r
       RouteChart.Route.RouteString = ParentRouteChart.Route.RouteString | (15 << (4 * (ParentRouteChart.Route.TierNum - 1)));\r
     }\r
-    RouteChart.Route.RootPortNum   = ParentRouteChart.Route.RootPortNum;\r
-    RouteChart.Route.TierNum       = ParentRouteChart.Route.TierNum + 1;\r
+\r
+    RouteChart.Route.RootPortNum = ParentRouteChart.Route.RootPortNum;\r
+    RouteChart.Route.TierNum     = ParentRouteChart.Route.TierNum + 1;\r
   }\r
 \r
   SlotId = XhcRouteStringToSlotId (Xhc, RouteChart);\r
@@ -1756,7 +1776,8 @@ XhcPollPortStatusChange (
   }\r
 \r
   if (((PortState->PortStatus & USB_PORT_STAT_ENABLE) != 0) &&\r
-      ((PortState->PortStatus & USB_PORT_STAT_CONNECTION) != 0)) {\r
+      ((PortState->PortStatus & USB_PORT_STAT_CONNECTION) != 0))\r
+  {\r
     //\r
     // Has a device attached, Identify device speed after port is enabled.\r
     //\r
@@ -1796,7 +1817,6 @@ XhcPollPortStatusChange (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Calculate the device context index by endpoint address and direction.\r
 \r
@@ -1808,19 +1828,20 @@ XhcPollPortStatusChange (
 **/\r
 UINT8\r
 XhcEndpointToDci (\r
-  IN  UINT8                   EpAddr,\r
-  IN  UINT8                   Direction\r
+  IN  UINT8  EpAddr,\r
+  IN  UINT8  Direction\r
   )\r
 {\r
-  UINT8 Index;\r
+  UINT8  Index;\r
 \r
   if (EpAddr == 0) {\r
     return 1;\r
   } else {\r
-    Index = (UINT8) (2 * EpAddr);\r
+    Index = (UINT8)(2 * EpAddr);\r
     if (Direction == EfiUsbDataIn) {\r
       Index += 1;\r
     }\r
+\r
     return Index;\r
   }\r
 }\r
@@ -1846,7 +1867,8 @@ XhcBusDevAddrToSlotId (
   for (Index = 0; Index < 255; Index++) {\r
     if (Xhc->UsbDevContext[Index + 1].Enabled &&\r
         (Xhc->UsbDevContext[Index + 1].SlotId != 0) &&\r
-        (Xhc->UsbDevContext[Index + 1].BusDevAddr == BusDevAddr)) {\r
+        (Xhc->UsbDevContext[Index + 1].BusDevAddr == BusDevAddr))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -1879,7 +1901,8 @@ XhcRouteStringToSlotId (
   for (Index = 0; Index < 255; Index++) {\r
     if (Xhc->UsbDevContext[Index + 1].Enabled &&\r
         (Xhc->UsbDevContext[Index + 1].SlotId != 0) &&\r
-        (Xhc->UsbDevContext[Index + 1].RouteString.Dword == RouteString.Dword)) {\r
+        (Xhc->UsbDevContext[Index + 1].RouteString.Dword == RouteString.Dword))\r
+    {\r
       break;\r
     }\r
   }\r
@@ -1903,12 +1926,12 @@ XhcRouteStringToSlotId (
 EFI_STATUS\r
 EFIAPI\r
 XhcSyncEventRing (\r
-  IN USB_XHCI_INSTANCE    *Xhc,\r
-  IN EVENT_RING           *EvtRing\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN EVENT_RING         *EvtRing\r
   )\r
 {\r
-  UINTN               Index;\r
-  TRB_TEMPLATE        *EvtTrb1;\r
+  UINTN         Index;\r
+  TRB_TEMPLATE  *EvtTrb1;\r
 \r
   ASSERT (EvtRing != NULL);\r
 \r
@@ -1925,8 +1948,8 @@ XhcSyncEventRing (
 \r
     EvtTrb1++;\r
 \r
-    if ((UINTN)EvtTrb1 >= ((UINTN) EvtRing->EventRingSeg0 + sizeof (TRB_TEMPLATE) * EvtRing->TrbNumber)) {\r
-      EvtTrb1 = EvtRing->EventRingSeg0;\r
+    if ((UINTN)EvtTrb1 >= ((UINTN)EvtRing->EventRingSeg0 + sizeof (TRB_TEMPLATE) * EvtRing->TrbNumber)) {\r
+      EvtTrb1               = EvtRing->EventRingSeg0;\r
       EvtRing->EventRingCCS = (EvtRing->EventRingCCS) ? 0 : 1;\r
     }\r
   }\r
@@ -1952,12 +1975,12 @@ XhcSyncEventRing (
 EFI_STATUS\r
 EFIAPI\r
 XhcSyncTrsRing (\r
-  IN USB_XHCI_INSTANCE    *Xhc,\r
-  IN TRANSFER_RING        *TrsRing\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN TRANSFER_RING      *TrsRing\r
   )\r
 {\r
-  UINTN               Index;\r
-  TRB_TEMPLATE        *TrsTrb;\r
+  UINTN         Index;\r
+  TRB_TEMPLATE  *TrsTrb;\r
 \r
   ASSERT (TrsRing != NULL);\r
   //\r
@@ -1970,18 +1993,19 @@ XhcSyncTrsRing (
     if (TrsTrb->CycleBit != (TrsRing->RingPCS & BIT0)) {\r
       break;\r
     }\r
+\r
     TrsTrb++;\r
-    if ((UINT8) TrsTrb->Type == TRB_TYPE_LINK) {\r
-      ASSERT (((LINK_TRB*)TrsTrb)->TC != 0);\r
+    if ((UINT8)TrsTrb->Type == TRB_TYPE_LINK) {\r
+      ASSERT (((LINK_TRB *)TrsTrb)->TC != 0);\r
       //\r
       // set cycle bit in Link TRB as normal\r
       //\r
-      ((LINK_TRB*)TrsTrb)->CycleBit = TrsRing->RingPCS & BIT0;\r
+      ((LINK_TRB *)TrsTrb)->CycleBit = TrsRing->RingPCS & BIT0;\r
       //\r
       // Toggle PCS maintained by software\r
       //\r
       TrsRing->RingPCS = (TrsRing->RingPCS & BIT0) ? 0 : 1;\r
-      TrsTrb = (TRB_TEMPLATE *) TrsRing->RingSeg0;  // Use host address\r
+      TrsTrb           = (TRB_TEMPLATE *)TrsRing->RingSeg0; // Use host address\r
     }\r
   }\r
 \r
@@ -2018,9 +2042,9 @@ XhcSyncTrsRing (
 EFI_STATUS\r
 EFIAPI\r
 XhcCheckNewEvent (\r
-  IN  USB_XHCI_INSTANCE       *Xhc,\r
-  IN  EVENT_RING              *EvtRing,\r
-  OUT TRB_TEMPLATE            **NewEvtTrb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  EVENT_RING         *EvtRing,\r
+  OUT TRB_TEMPLATE       **NewEvtTrb\r
   )\r
 {\r
   ASSERT (EvtRing != NULL);\r
@@ -2035,7 +2059,7 @@ XhcCheckNewEvent (
   //\r
   // If the dequeue pointer is beyond the ring, then roll-back it to the begining of the ring.\r
   //\r
-  if ((UINTN)EvtRing->EventRingDequeue >= ((UINTN) EvtRing->EventRingSeg0 + sizeof (TRB_TEMPLATE) * EvtRing->TrbNumber)) {\r
+  if ((UINTN)EvtRing->EventRingDequeue >= ((UINTN)EvtRing->EventRingSeg0 + sizeof (TRB_TEMPLATE) * EvtRing->TrbNumber)) {\r
     EvtRing->EventRingDequeue = EvtRing->EventRingSeg0;\r
   }\r
 \r
@@ -2055,9 +2079,9 @@ XhcCheckNewEvent (
 EFI_STATUS\r
 EFIAPI\r
 XhcRingDoorBell (\r
-  IN USB_XHCI_INSTANCE    *Xhc,\r
-  IN UINT8                SlotId,\r
-  IN UINT8                Dci\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT8              Dci\r
   )\r
 {\r
   if (SlotId == 0) {\r
@@ -2080,12 +2104,12 @@ XhcRingDoorBell (
 **/\r
 EFI_STATUS\r
 RingIntTransferDoorBell (\r
-  IN  USB_XHCI_INSTANCE   *Xhc,\r
-  IN  URB                 *Urb\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  URB                *Urb\r
   )\r
 {\r
-  UINT8                SlotId;\r
-  UINT8                Dci;\r
+  UINT8  SlotId;\r
+  UINT8  Dci;\r
 \r
   SlotId = XhcBusDevAddrToSlotId (Xhc, Urb->Ep.BusAddr);\r
   Dci    = XhcEndpointToDci (Urb->Ep.EpAddr, (UINT8)(Urb->Ep.Direction));\r
@@ -2108,11 +2132,11 @@ RingIntTransferDoorBell (
 EFI_STATUS\r
 EFIAPI\r
 XhcInitializeDeviceSlot (\r
-  IN  USB_XHCI_INSTANCE         *Xhc,\r
-  IN  USB_DEV_ROUTE             ParentRouteChart,\r
-  IN  UINT16                    ParentPort,\r
-  IN  USB_DEV_ROUTE             RouteChart,\r
-  IN  UINT8                     DeviceSpeed\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  USB_DEV_ROUTE      ParentRouteChart,\r
+  IN  UINT16             ParentPort,\r
+  IN  USB_DEV_ROUTE      RouteChart,\r
+  IN  UINT8              DeviceSpeed\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -2133,15 +2157,16 @@ XhcInitializeDeviceSlot (
   CmdTrb.Type     = TRB_TYPE_EN_SLOT;\r
 \r
   Status = XhcCmdTransfer (\r
-              Xhc,\r
-              (TRB_TEMPLATE *) (UINTN) &CmdTrb,\r
-              XHC_GENERIC_TIMEOUT,\r
-              (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-              );\r
+             Xhc,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrb,\r
+             XHC_GENERIC_TIMEOUT,\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcInitializeDeviceSlot: Enable Slot Failed, Status = %r\n", Status));\r
     return Status;\r
   }\r
+\r
   ASSERT (EvtTrb->SlotId <= Xhc->MaxSlotsEn);\r
   DEBUG ((DEBUG_INFO, "Enable Slot Successfully, The Slot ID = 0x%x\n", EvtTrb->SlotId));\r
   SlotId = (UINT8)EvtTrb->SlotId;\r
@@ -2159,10 +2184,10 @@ XhcInitializeDeviceSlot (
   //\r
   InputContext = UsbHcAllocateMem (Xhc->MemPool, sizeof (INPUT_CONTEXT));\r
   ASSERT (InputContext != NULL);\r
-  ASSERT (((UINTN) InputContext & 0x3F) == 0);\r
+  ASSERT (((UINTN)InputContext & 0x3F) == 0);\r
   ZeroMem (InputContext, sizeof (INPUT_CONTEXT));\r
 \r
-  Xhc->UsbDevContext[SlotId].InputContext = (VOID *) InputContext;\r
+  Xhc->UsbDevContext[SlotId].InputContext = (VOID *)InputContext;\r
 \r
   //\r
   // 2) Initialize the Input Control Context (6.2.5.1) of the Input Context by setting the A0 and A1\r
@@ -2183,14 +2208,15 @@ XhcInitializeDeviceSlot (
     //\r
     // The device is behind of hub device.\r
     //\r
-    ParentSlotId = XhcRouteStringToSlotId(Xhc, ParentRouteChart);\r
+    ParentSlotId = XhcRouteStringToSlotId (Xhc, ParentRouteChart);\r
     ASSERT (ParentSlotId != 0);\r
     //\r
-    //if the Full/Low device attached to a High Speed Hub, Init the TTPortNum and TTHubSlotId field of slot context\r
+    // if the Full/Low device attached to a High Speed Hub, Init the TTPortNum and TTHubSlotId field of slot context\r
     //\r
     ParentDeviceContext = (DEVICE_CONTEXT *)Xhc->UsbDevContext[ParentSlotId].OutputContext;\r
     if ((ParentDeviceContext->Slot.TTPortNum == 0) &&\r
-        (ParentDeviceContext->Slot.TTHubSlotId == 0)) {\r
+        (ParentDeviceContext->Slot.TTHubSlotId == 0))\r
+    {\r
       if ((ParentDeviceContext->Slot.Speed == (EFI_USB_SPEED_HIGH + 1)) && (DeviceSpeed < EFI_USB_SPEED_HIGH)) {\r
         //\r
         // Full/Low device attached to High speed hub port that isolates the high speed signaling\r
@@ -2217,9 +2243,9 @@ XhcInitializeDeviceSlot (
   //\r
   // 4) Allocate and initialize the Transfer Ring for the Default Control Endpoint.\r
   //\r
-  EndpointTransferRing = AllocateZeroPool (sizeof (TRANSFER_RING));\r
+  EndpointTransferRing                               = AllocateZeroPool (sizeof (TRANSFER_RING));\r
   Xhc->UsbDevContext[SlotId].EndpointTransferRing[0] = EndpointTransferRing;\r
-  CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[0]);\r
+  CreateTransferRing (Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[0]);\r
   //\r
   // 5) Initialize the Input default control Endpoint 0 Context (6.2.3).\r
   //\r
@@ -2232,6 +2258,7 @@ XhcInitializeDeviceSlot (
   } else {\r
     InputContext->EP[0].MaxPacketSize = 8;\r
   }\r
+\r
   //\r
   // Initial value of Average TRB Length for Control endpoints would be 8B, Interrupt endpoints\r
   // 1KB, and Bulk and Isoch endpoints 3KB.\r
@@ -2259,7 +2286,7 @@ XhcInitializeDeviceSlot (
   //\r
   OutputContext = UsbHcAllocateMem (Xhc->MemPool, sizeof (DEVICE_CONTEXT));\r
   ASSERT (OutputContext != NULL);\r
-  ASSERT (((UINTN) OutputContext & 0x3F) == 0);\r
+  ASSERT (((UINTN)OutputContext & 0x3F) == 0);\r
   ZeroMem (OutputContext, sizeof (DEVICE_CONTEXT));\r
 \r
   Xhc->UsbDevContext[SlotId].OutputContext = OutputContext;\r
@@ -2271,7 +2298,7 @@ XhcInitializeDeviceSlot (
   //\r
   // Fill DCBAA with PCI device address\r
   //\r
-  Xhc->DCBAA[SlotId] = (UINT64) (UINTN) PhyAddr;\r
+  Xhc->DCBAA[SlotId] = (UINT64)(UINTN)PhyAddr;\r
 \r
   //\r
   // 8) Issue an Address Device Command for the Device Slot, where the command points to the Input\r
@@ -2282,20 +2309,20 @@ XhcInitializeDeviceSlot (
   //\r
   gBS->Stall (XHC_RESET_RECOVERY_DELAY);\r
   ZeroMem (&CmdTrbAddr, sizeof (CmdTrbAddr));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc->UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT));\r
+  PhyAddr             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc->UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT));\r
   CmdTrbAddr.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbAddr.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbAddr.CycleBit = 1;\r
   CmdTrbAddr.Type     = TRB_TYPE_ADDRESS_DEV;\r
   CmdTrbAddr.SlotId   = Xhc->UsbDevContext[SlotId].SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbAddr,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
+  Status              = XhcCmdTransfer (\r
+                          Xhc,\r
+                          (TRB_TEMPLATE *)(UINTN)&CmdTrbAddr,\r
+                          XHC_GENERIC_TIMEOUT,\r
+                          (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                          );\r
   if (!EFI_ERROR (Status)) {\r
-    DeviceAddress = (UINT8) ((DEVICE_CONTEXT *) OutputContext)->Slot.DeviceAddress;\r
+    DeviceAddress = (UINT8)((DEVICE_CONTEXT *)OutputContext)->Slot.DeviceAddress;\r
     DEBUG ((DEBUG_INFO, "    Address %d assigned successfully\n", DeviceAddress));\r
     Xhc->UsbDevContext[SlotId].XhciDevAddr = DeviceAddress;\r
   } else {\r
@@ -2321,11 +2348,11 @@ XhcInitializeDeviceSlot (
 EFI_STATUS\r
 EFIAPI\r
 XhcInitializeDeviceSlot64 (\r
-  IN  USB_XHCI_INSTANCE         *Xhc,\r
-  IN  USB_DEV_ROUTE             ParentRouteChart,\r
-  IN  UINT16                    ParentPort,\r
-  IN  USB_DEV_ROUTE             RouteChart,\r
-  IN  UINT8                     DeviceSpeed\r
+  IN  USB_XHCI_INSTANCE  *Xhc,\r
+  IN  USB_DEV_ROUTE      ParentRouteChart,\r
+  IN  UINT16             ParentPort,\r
+  IN  USB_DEV_ROUTE      RouteChart,\r
+  IN  UINT8              DeviceSpeed\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -2346,15 +2373,16 @@ XhcInitializeDeviceSlot64 (
   CmdTrb.Type     = TRB_TYPE_EN_SLOT;\r
 \r
   Status = XhcCmdTransfer (\r
-              Xhc,\r
-              (TRB_TEMPLATE *) (UINTN) &CmdTrb,\r
-              XHC_GENERIC_TIMEOUT,\r
-              (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-              );\r
+             Xhc,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrb,\r
+             XHC_GENERIC_TIMEOUT,\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcInitializeDeviceSlot64: Enable Slot Failed, Status = %r\n", Status));\r
     return Status;\r
   }\r
+\r
   ASSERT (EvtTrb->SlotId <= Xhc->MaxSlotsEn);\r
   DEBUG ((DEBUG_INFO, "Enable Slot Successfully, The Slot ID = 0x%x\n", EvtTrb->SlotId));\r
   SlotId = (UINT8)EvtTrb->SlotId;\r
@@ -2372,10 +2400,10 @@ XhcInitializeDeviceSlot64 (
   //\r
   InputContext = UsbHcAllocateMem (Xhc->MemPool, sizeof (INPUT_CONTEXT_64));\r
   ASSERT (InputContext != NULL);\r
-  ASSERT (((UINTN) InputContext & 0x3F) == 0);\r
+  ASSERT (((UINTN)InputContext & 0x3F) == 0);\r
   ZeroMem (InputContext, sizeof (INPUT_CONTEXT_64));\r
 \r
-  Xhc->UsbDevContext[SlotId].InputContext = (VOID *) InputContext;\r
+  Xhc->UsbDevContext[SlotId].InputContext = (VOID *)InputContext;\r
 \r
   //\r
   // 2) Initialize the Input Control Context (6.2.5.1) of the Input Context by setting the A0 and A1\r
@@ -2396,14 +2424,15 @@ XhcInitializeDeviceSlot64 (
     //\r
     // The device is behind of hub device.\r
     //\r
-    ParentSlotId = XhcRouteStringToSlotId(Xhc, ParentRouteChart);\r
+    ParentSlotId = XhcRouteStringToSlotId (Xhc, ParentRouteChart);\r
     ASSERT (ParentSlotId != 0);\r
     //\r
-    //if the Full/Low device attached to a High Speed Hub, Init the TTPortNum and TTHubSlotId field of slot context\r
+    // if the Full/Low device attached to a High Speed Hub, Init the TTPortNum and TTHubSlotId field of slot context\r
     //\r
     ParentDeviceContext = (DEVICE_CONTEXT_64 *)Xhc->UsbDevContext[ParentSlotId].OutputContext;\r
     if ((ParentDeviceContext->Slot.TTPortNum == 0) &&\r
-        (ParentDeviceContext->Slot.TTHubSlotId == 0)) {\r
+        (ParentDeviceContext->Slot.TTHubSlotId == 0))\r
+    {\r
       if ((ParentDeviceContext->Slot.Speed == (EFI_USB_SPEED_HIGH + 1)) && (DeviceSpeed < EFI_USB_SPEED_HIGH)) {\r
         //\r
         // Full/Low device attached to High speed hub port that isolates the high speed signaling\r
@@ -2430,9 +2459,9 @@ XhcInitializeDeviceSlot64 (
   //\r
   // 4) Allocate and initialize the Transfer Ring for the Default Control Endpoint.\r
   //\r
-  EndpointTransferRing = AllocateZeroPool (sizeof (TRANSFER_RING));\r
+  EndpointTransferRing                               = AllocateZeroPool (sizeof (TRANSFER_RING));\r
   Xhc->UsbDevContext[SlotId].EndpointTransferRing[0] = EndpointTransferRing;\r
-  CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[0]);\r
+  CreateTransferRing (Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[0]);\r
   //\r
   // 5) Initialize the Input default control Endpoint 0 Context (6.2.3).\r
   //\r
@@ -2445,6 +2474,7 @@ XhcInitializeDeviceSlot64 (
   } else {\r
     InputContext->EP[0].MaxPacketSize = 8;\r
   }\r
+\r
   //\r
   // Initial value of Average TRB Length for Control endpoints would be 8B, Interrupt endpoints\r
   // 1KB, and Bulk and Isoch endpoints 3KB.\r
@@ -2472,7 +2502,7 @@ XhcInitializeDeviceSlot64 (
   //\r
   OutputContext = UsbHcAllocateMem (Xhc->MemPool, sizeof (DEVICE_CONTEXT_64));\r
   ASSERT (OutputContext != NULL);\r
-  ASSERT (((UINTN) OutputContext & 0x3F) == 0);\r
+  ASSERT (((UINTN)OutputContext & 0x3F) == 0);\r
   ZeroMem (OutputContext, sizeof (DEVICE_CONTEXT_64));\r
 \r
   Xhc->UsbDevContext[SlotId].OutputContext = OutputContext;\r
@@ -2484,7 +2514,7 @@ XhcInitializeDeviceSlot64 (
   //\r
   // Fill DCBAA with PCI device address\r
   //\r
-  Xhc->DCBAA[SlotId] = (UINT64) (UINTN) PhyAddr;\r
+  Xhc->DCBAA[SlotId] = (UINT64)(UINTN)PhyAddr;\r
 \r
   //\r
   // 8) Issue an Address Device Command for the Device Slot, where the command points to the Input\r
@@ -2495,20 +2525,20 @@ XhcInitializeDeviceSlot64 (
   //\r
   gBS->Stall (XHC_RESET_RECOVERY_DELAY);\r
   ZeroMem (&CmdTrbAddr, sizeof (CmdTrbAddr));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc->UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64));\r
+  PhyAddr             = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Xhc->UsbDevContext[SlotId].InputContext, sizeof (INPUT_CONTEXT_64));\r
   CmdTrbAddr.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbAddr.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbAddr.CycleBit = 1;\r
   CmdTrbAddr.Type     = TRB_TYPE_ADDRESS_DEV;\r
   CmdTrbAddr.SlotId   = Xhc->UsbDevContext[SlotId].SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbAddr,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
+  Status              = XhcCmdTransfer (\r
+                          Xhc,\r
+                          (TRB_TEMPLATE *)(UINTN)&CmdTrbAddr,\r
+                          XHC_GENERIC_TIMEOUT,\r
+                          (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                          );\r
   if (!EFI_ERROR (Status)) {\r
-    DeviceAddress = (UINT8) ((DEVICE_CONTEXT_64 *) OutputContext)->Slot.DeviceAddress;\r
+    DeviceAddress = (UINT8)((DEVICE_CONTEXT_64 *)OutputContext)->Slot.DeviceAddress;\r
     DEBUG ((DEBUG_INFO, "    Address %d assigned successfully\n", DeviceAddress));\r
     Xhc->UsbDevContext[SlotId].XhciDevAddr = DeviceAddress;\r
   } else {\r
@@ -2519,7 +2549,6 @@ XhcInitializeDeviceSlot64 (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Disable the specified device slot.\r
 \r
@@ -2532,8 +2561,8 @@ XhcInitializeDeviceSlot64 (
 EFI_STATUS\r
 EFIAPI\r
 XhcDisableSlotCmd (\r
-  IN USB_XHCI_INSTANCE         *Xhc,\r
-  IN UINT8                     SlotId\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId\r
   )\r
 {\r
   EFI_STATUS            Status;\r
@@ -2549,7 +2578,8 @@ XhcDisableSlotCmd (
   for (Index = 0; Index < 255; Index++) {\r
     if (!Xhc->UsbDevContext[Index + 1].Enabled ||\r
         (Xhc->UsbDevContext[Index + 1].SlotId == 0) ||\r
-        (Xhc->UsbDevContext[Index + 1].ParentRouteString.Dword != Xhc->UsbDevContext[SlotId].RouteString.Dword)) {\r
+        (Xhc->UsbDevContext[Index + 1].ParentRouteString.Dword != Xhc->UsbDevContext[SlotId].RouteString.Dword))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -2570,16 +2600,17 @@ XhcDisableSlotCmd (
   CmdTrbDisSlot.CycleBit = 1;\r
   CmdTrbDisSlot.Type     = TRB_TYPE_DIS_SLOT;\r
   CmdTrbDisSlot.SlotId   = SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbDisSlot,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
+  Status                 = XhcCmdTransfer (\r
+                             Xhc,\r
+                             (TRB_TEMPLATE *)(UINTN)&CmdTrbDisSlot,\r
+                             XHC_GENERIC_TIMEOUT,\r
+                             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcDisableSlotCmd: Disable Slot Command Failed, Status = %r\n", Status));\r
     return Status;\r
   }\r
+\r
   //\r
   // Free the slot's device context entry\r
   //\r
@@ -2594,6 +2625,7 @@ XhcDisableSlotCmd (
       if (RingSeg != NULL) {\r
         UsbHcFreeMem (Xhc->MemPool, RingSeg, sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER);\r
       }\r
+\r
       FreePool (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Index]);\r
       Xhc->UsbDevContext[SlotId].EndpointTransferRing[Index] = NULL;\r
     }\r
@@ -2616,6 +2648,7 @@ XhcDisableSlotCmd (
   if (Xhc->UsbDevContext[SlotId].OutputContext != NULL) {\r
     UsbHcFreeMem (Xhc->MemPool, Xhc->UsbDevContext[SlotId].OutputContext, sizeof (DEVICE_CONTEXT));\r
   }\r
+\r
   //\r
   // Doesn't zero the entry because XhcAsyncInterruptTransfer() may be invoked to remove the established\r
   // asynchronous interrupt pipe after the device is disabled. It needs the device address mapping info to\r
@@ -2639,8 +2672,8 @@ XhcDisableSlotCmd (
 EFI_STATUS\r
 EFIAPI\r
 XhcDisableSlotCmd64 (\r
-  IN USB_XHCI_INSTANCE         *Xhc,\r
-  IN UINT8                     SlotId\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId\r
   )\r
 {\r
   EFI_STATUS            Status;\r
@@ -2656,7 +2689,8 @@ XhcDisableSlotCmd64 (
   for (Index = 0; Index < 255; Index++) {\r
     if (!Xhc->UsbDevContext[Index + 1].Enabled ||\r
         (Xhc->UsbDevContext[Index + 1].SlotId == 0) ||\r
-        (Xhc->UsbDevContext[Index + 1].ParentRouteString.Dword != Xhc->UsbDevContext[SlotId].RouteString.Dword)) {\r
+        (Xhc->UsbDevContext[Index + 1].ParentRouteString.Dword != Xhc->UsbDevContext[SlotId].RouteString.Dword))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -2677,16 +2711,17 @@ XhcDisableSlotCmd64 (
   CmdTrbDisSlot.CycleBit = 1;\r
   CmdTrbDisSlot.Type     = TRB_TYPE_DIS_SLOT;\r
   CmdTrbDisSlot.SlotId   = SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbDisSlot,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
+  Status                 = XhcCmdTransfer (\r
+                             Xhc,\r
+                             (TRB_TEMPLATE *)(UINTN)&CmdTrbDisSlot,\r
+                             XHC_GENERIC_TIMEOUT,\r
+                             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcDisableSlotCmd: Disable Slot Command Failed, Status = %r\n", Status));\r
     return Status;\r
   }\r
+\r
   //\r
   // Free the slot's device context entry\r
   //\r
@@ -2701,6 +2736,7 @@ XhcDisableSlotCmd64 (
       if (RingSeg != NULL) {\r
         UsbHcFreeMem (Xhc->MemPool, RingSeg, sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER);\r
       }\r
+\r
       FreePool (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Index]);\r
       Xhc->UsbDevContext[SlotId].EndpointTransferRing[Index] = NULL;\r
     }\r
@@ -2721,8 +2757,9 @@ XhcDisableSlotCmd64 (
   }\r
 \r
   if (Xhc->UsbDevContext[SlotId].OutputContext != NULL) {\r
-     UsbHcFreeMem (Xhc->MemPool, Xhc->UsbDevContext[SlotId].OutputContext, sizeof (DEVICE_CONTEXT_64));\r
+    UsbHcFreeMem (Xhc->MemPool, Xhc->UsbDevContext[SlotId].OutputContext, sizeof (DEVICE_CONTEXT_64));\r
   }\r
+\r
   //\r
   // Doesn't zero the entry because XhcAsyncInterruptTransfer() may be invoked to remove the established\r
   // asynchronous interrupt pipe after the device is disabled. It needs the device address mapping info to\r
@@ -2749,23 +2786,23 @@ XhcDisableSlotCmd64 (
 UINT8\r
 EFIAPI\r
 XhcInitializeEndpointContext (\r
-  IN USB_XHCI_INSTANCE          *Xhc,\r
-  IN UINT8                      SlotId,\r
-  IN UINT8                      DeviceSpeed,\r
-  IN INPUT_CONTEXT              *InputContext,\r
-  IN USB_INTERFACE_DESCRIPTOR   *IfDesc\r
+  IN USB_XHCI_INSTANCE         *Xhc,\r
+  IN UINT8                     SlotId,\r
+  IN UINT8                     DeviceSpeed,\r
+  IN INPUT_CONTEXT             *InputContext,\r
+  IN USB_INTERFACE_DESCRIPTOR  *IfDesc\r
   )\r
 {\r
-  USB_ENDPOINT_DESCRIPTOR       *EpDesc;\r
-  UINTN                         NumEp;\r
-  UINTN                         EpIndex;\r
-  UINT8                         EpAddr;\r
-  UINT8                         Direction;\r
-  UINT8                         Dci;\r
-  UINT8                         MaxDci;\r
-  EFI_PHYSICAL_ADDRESS          PhyAddr;\r
-  UINT8                         Interval;\r
-  TRANSFER_RING                 *EndpointTransferRing;\r
+  USB_ENDPOINT_DESCRIPTOR  *EpDesc;\r
+  UINTN                    NumEp;\r
+  UINTN                    EpIndex;\r
+  UINT8                    EpAddr;\r
+  UINT8                    Direction;\r
+  UINT8                    Dci;\r
+  UINT8                    MaxDci;\r
+  EFI_PHYSICAL_ADDRESS     PhyAddr;\r
+  UINT8                    Interval;\r
+  TRANSFER_RING            *EndpointTransferRing;\r
 \r
   MaxDci = 0;\r
 \r
@@ -2815,14 +2852,16 @@ XhcInitializeEndpointContext (
 \r
         InputContext->EP[Dci-1].AverageTRBLength = 0x1000;\r
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {\r
-          EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));\r
-          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;\r
-          CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
-          DEBUG ((DEBUG_INFO, "Endpoint[%x]: Created BULK ring [%p~%p)\n",\r
-                  EpDesc->EndpointAddress,\r
-                  EndpointTransferRing->RingSeg0,\r
-                  (UINTN) EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
-                  ));\r
+          EndpointTransferRing                                   = AllocateZeroPool (sizeof (TRANSFER_RING));\r
+          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *)EndpointTransferRing;\r
+          CreateTransferRing (Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "Endpoint[%x]: Created BULK ring [%p~%p)\n",\r
+            EpDesc->EndpointAddress,\r
+            EndpointTransferRing->RingSeg0,\r
+            (UINTN)EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
+            ));\r
         }\r
 \r
         break;\r
@@ -2834,6 +2873,7 @@ XhcInitializeEndpointContext (
           InputContext->EP[Dci-1].CErr   = 0;\r
           InputContext->EP[Dci-1].EPType = ED_ISOCH_OUT;\r
         }\r
+\r
         //\r
         // Get the bInterval from descriptor and init the the interval field of endpoint context.\r
         // Refer to XHCI 1.1 spec section 6.2.3.6.\r
@@ -2862,6 +2902,7 @@ XhcInitializeEndpointContext (
           InputContext->EP[Dci-1].CErr   = 3;\r
           InputContext->EP[Dci-1].EPType = ED_INTERRUPT_OUT;\r
         }\r
+\r
         InputContext->EP[Dci-1].AverageTRBLength = 0x1000;\r
         InputContext->EP[Dci-1].MaxESITPayload   = EpDesc->MaxPacketSize;\r
         //\r
@@ -2873,7 +2914,7 @@ XhcInitializeEndpointContext (
           // Calculate through the bInterval field of Endpoint descriptor.\r
           //\r
           ASSERT (Interval != 0);\r
-          InputContext->EP[Dci-1].Interval = (UINT32)HighBitSet32((UINT32)Interval) + 3;\r
+          InputContext->EP[Dci-1].Interval = (UINT32)HighBitSet32 ((UINT32)Interval) + 3;\r
         } else if ((DeviceSpeed == EFI_USB_SPEED_HIGH) || (DeviceSpeed == EFI_USB_SPEED_SUPER)) {\r
           Interval = EpDesc->Interval;\r
           ASSERT (Interval >= 1 && Interval <= 16);\r
@@ -2888,15 +2929,18 @@ XhcInitializeEndpointContext (
         }\r
 \r
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {\r
-          EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));\r
-          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;\r
-          CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
-          DEBUG ((DEBUG_INFO, "Endpoint[%x]: Created INT ring [%p~%p)\n",\r
-                  EpDesc->EndpointAddress,\r
-                  EndpointTransferRing->RingSeg0,\r
-                  (UINTN) EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
-                  ));\r
+          EndpointTransferRing                                   = AllocateZeroPool (sizeof (TRANSFER_RING));\r
+          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *)EndpointTransferRing;\r
+          CreateTransferRing (Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "Endpoint[%x]: Created INT ring [%p~%p)\n",\r
+            EpDesc->EndpointAddress,\r
+            EndpointTransferRing->RingSeg0,\r
+            (UINTN)EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
+            ));\r
         }\r
+\r
         break;\r
 \r
       case USB_ENDPOINT_CONTROL:\r
@@ -2915,8 +2959,8 @@ XhcInitializeEndpointContext (
                 ((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0,\r
                 sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER\r
                 );\r
-    PhyAddr &= ~((EFI_PHYSICAL_ADDRESS)0x0F);\r
-    PhyAddr |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;\r
+    PhyAddr                      &= ~((EFI_PHYSICAL_ADDRESS)0x0F);\r
+    PhyAddr                      |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;\r
     InputContext->EP[Dci-1].PtrLo = XHC_LOW_32BIT (PhyAddr);\r
     InputContext->EP[Dci-1].PtrHi = XHC_HIGH_32BIT (PhyAddr);\r
 \r
@@ -2941,23 +2985,23 @@ XhcInitializeEndpointContext (
 UINT8\r
 EFIAPI\r
 XhcInitializeEndpointContext64 (\r
-  IN USB_XHCI_INSTANCE          *Xhc,\r
-  IN UINT8                      SlotId,\r
-  IN UINT8                      DeviceSpeed,\r
-  IN INPUT_CONTEXT_64           *InputContext,\r
-  IN USB_INTERFACE_DESCRIPTOR   *IfDesc\r
+  IN USB_XHCI_INSTANCE         *Xhc,\r
+  IN UINT8                     SlotId,\r
+  IN UINT8                     DeviceSpeed,\r
+  IN INPUT_CONTEXT_64          *InputContext,\r
+  IN USB_INTERFACE_DESCRIPTOR  *IfDesc\r
   )\r
 {\r
-  USB_ENDPOINT_DESCRIPTOR       *EpDesc;\r
-  UINTN                         NumEp;\r
-  UINTN                         EpIndex;\r
-  UINT8                         EpAddr;\r
-  UINT8                         Direction;\r
-  UINT8                         Dci;\r
-  UINT8                         MaxDci;\r
-  EFI_PHYSICAL_ADDRESS          PhyAddr;\r
-  UINT8                         Interval;\r
-  TRANSFER_RING                 *EndpointTransferRing;\r
+  USB_ENDPOINT_DESCRIPTOR  *EpDesc;\r
+  UINTN                    NumEp;\r
+  UINTN                    EpIndex;\r
+  UINT8                    EpAddr;\r
+  UINT8                    Direction;\r
+  UINT8                    Dci;\r
+  UINT8                    MaxDci;\r
+  EFI_PHYSICAL_ADDRESS     PhyAddr;\r
+  UINT8                    Interval;\r
+  TRANSFER_RING            *EndpointTransferRing;\r
 \r
   MaxDci = 0;\r
 \r
@@ -3007,14 +3051,16 @@ XhcInitializeEndpointContext64 (
 \r
         InputContext->EP[Dci-1].AverageTRBLength = 0x1000;\r
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {\r
-          EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));\r
-          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;\r
-          CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
-          DEBUG ((DEBUG_INFO, "Endpoint64[%x]: Created BULK ring [%p~%p)\n",\r
-                  EpDesc->EndpointAddress,\r
-                  EndpointTransferRing->RingSeg0,\r
-                  (UINTN) EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
-                  ));\r
+          EndpointTransferRing                                   = AllocateZeroPool (sizeof (TRANSFER_RING));\r
+          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *)EndpointTransferRing;\r
+          CreateTransferRing (Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "Endpoint64[%x]: Created BULK ring [%p~%p)\n",\r
+            EpDesc->EndpointAddress,\r
+            EndpointTransferRing->RingSeg0,\r
+            (UINTN)EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
+            ));\r
         }\r
 \r
         break;\r
@@ -3026,6 +3072,7 @@ XhcInitializeEndpointContext64 (
           InputContext->EP[Dci-1].CErr   = 0;\r
           InputContext->EP[Dci-1].EPType = ED_ISOCH_OUT;\r
         }\r
+\r
         //\r
         // Get the bInterval from descriptor and init the the interval field of endpoint context.\r
         // Refer to XHCI 1.1 spec section 6.2.3.6.\r
@@ -3054,6 +3101,7 @@ XhcInitializeEndpointContext64 (
           InputContext->EP[Dci-1].CErr   = 3;\r
           InputContext->EP[Dci-1].EPType = ED_INTERRUPT_OUT;\r
         }\r
+\r
         InputContext->EP[Dci-1].AverageTRBLength = 0x1000;\r
         InputContext->EP[Dci-1].MaxESITPayload   = EpDesc->MaxPacketSize;\r
         //\r
@@ -3065,7 +3113,7 @@ XhcInitializeEndpointContext64 (
           // Calculate through the bInterval field of Endpoint descriptor.\r
           //\r
           ASSERT (Interval != 0);\r
-          InputContext->EP[Dci-1].Interval = (UINT32)HighBitSet32((UINT32)Interval) + 3;\r
+          InputContext->EP[Dci-1].Interval = (UINT32)HighBitSet32 ((UINT32)Interval) + 3;\r
         } else if ((DeviceSpeed == EFI_USB_SPEED_HIGH) || (DeviceSpeed == EFI_USB_SPEED_SUPER)) {\r
           Interval = EpDesc->Interval;\r
           ASSERT (Interval >= 1 && Interval <= 16);\r
@@ -3080,15 +3128,18 @@ XhcInitializeEndpointContext64 (
         }\r
 \r
         if (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] == NULL) {\r
-          EndpointTransferRing = AllocateZeroPool(sizeof (TRANSFER_RING));\r
-          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *) EndpointTransferRing;\r
-          CreateTransferRing(Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
-          DEBUG ((DEBUG_INFO, "Endpoint64[%x]: Created INT ring [%p~%p)\n",\r
-                  EpDesc->EndpointAddress,\r
-                  EndpointTransferRing->RingSeg0,\r
-                  (UINTN) EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
-                  ));\r
+          EndpointTransferRing                                   = AllocateZeroPool (sizeof (TRANSFER_RING));\r
+          Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1] = (VOID *)EndpointTransferRing;\r
+          CreateTransferRing (Xhc, TR_RING_TRB_NUMBER, (TRANSFER_RING *)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1]);\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "Endpoint64[%x]: Created INT ring [%p~%p)\n",\r
+            EpDesc->EndpointAddress,\r
+            EndpointTransferRing->RingSeg0,\r
+            (UINTN)EndpointTransferRing->RingSeg0 + TR_RING_TRB_NUMBER * sizeof (TRB_TEMPLATE)\r
+            ));\r
         }\r
+\r
         break;\r
 \r
       case USB_ENDPOINT_CONTROL:\r
@@ -3107,8 +3158,8 @@ XhcInitializeEndpointContext64 (
                 ((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingSeg0,\r
                 sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER\r
                 );\r
-    PhyAddr &= ~((EFI_PHYSICAL_ADDRESS)0x0F);\r
-    PhyAddr |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;\r
+    PhyAddr                      &= ~((EFI_PHYSICAL_ADDRESS)0x0F);\r
+    PhyAddr                      |= (EFI_PHYSICAL_ADDRESS)((TRANSFER_RING *)(UINTN)Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci-1])->RingPCS;\r
     InputContext->EP[Dci-1].PtrLo = XHC_LOW_32BIT (PhyAddr);\r
     InputContext->EP[Dci-1].PtrHi = XHC_HIGH_32BIT (PhyAddr);\r
 \r
@@ -3132,23 +3183,24 @@ XhcInitializeEndpointContext64 (
 EFI_STATUS\r
 EFIAPI\r
 XhcSetConfigCmd (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT8                    DeviceSpeed,\r
-  IN USB_CONFIG_DESCRIPTOR    *ConfigDesc\r
+  IN USB_XHCI_INSTANCE      *Xhc,\r
+  IN UINT8                  SlotId,\r
+  IN UINT8                  DeviceSpeed,\r
+  IN USB_CONFIG_DESCRIPTOR  *ConfigDesc\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDesc;\r
-  UINT8                       Index;\r
-  UINT8                       Dci;\r
-  UINT8                       MaxDci;\r
-  EFI_PHYSICAL_ADDRESS        PhyAddr;\r
+  EFI_STATUS                Status;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDesc;\r
+  UINT8                     Index;\r
+  UINT8                     Dci;\r
+  UINT8                     MaxDci;\r
+  EFI_PHYSICAL_ADDRESS      PhyAddr;\r
 \r
   CMD_TRB_CONFIG_ENDPOINT     CmdTrbCfgEP;\r
   INPUT_CONTEXT               *InputContext;\r
   DEVICE_CONTEXT              *OutputContext;\r
   EVT_TRB_COMMAND_COMPLETION  *EvtTrb;\r
+\r
   //\r
   // 4.6.6 Configure Endpoint\r
   //\r
@@ -3186,7 +3238,7 @@ XhcSetConfigCmd (
   // configure endpoint\r
   //\r
   ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
   CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbCfgEP.CycleBit = 1;\r
@@ -3195,9 +3247,9 @@ XhcSetConfigCmd (
   DEBUG ((DEBUG_INFO, "Configure Endpoint\n"));\r
   Status = XhcCmdTransfer (\r
              Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbCfgEP,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrbCfgEP,\r
              XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcSetConfigCmd: Config Endpoint Failed, Status = %r\n", Status));\r
@@ -3222,23 +3274,24 @@ XhcSetConfigCmd (
 EFI_STATUS\r
 EFIAPI\r
 XhcSetConfigCmd64 (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT8                    DeviceSpeed,\r
-  IN USB_CONFIG_DESCRIPTOR    *ConfigDesc\r
+  IN USB_XHCI_INSTANCE      *Xhc,\r
+  IN UINT8                  SlotId,\r
+  IN UINT8                  DeviceSpeed,\r
+  IN USB_CONFIG_DESCRIPTOR  *ConfigDesc\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDesc;\r
-  UINT8                       Index;\r
-  UINT8                       Dci;\r
-  UINT8                       MaxDci;\r
-  EFI_PHYSICAL_ADDRESS        PhyAddr;\r
+  EFI_STATUS                Status;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDesc;\r
+  UINT8                     Index;\r
+  UINT8                     Dci;\r
+  UINT8                     MaxDci;\r
+  EFI_PHYSICAL_ADDRESS      PhyAddr;\r
 \r
   CMD_TRB_CONFIG_ENDPOINT     CmdTrbCfgEP;\r
   INPUT_CONTEXT_64            *InputContext;\r
   DEVICE_CONTEXT_64           *OutputContext;\r
   EVT_TRB_COMMAND_COMPLETION  *EvtTrb;\r
+\r
   //\r
   // 4.6.6 Configure Endpoint\r
   //\r
@@ -3276,7 +3329,7 @@ XhcSetConfigCmd64 (
   // configure endpoint\r
   //\r
   ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));\r
-  PhyAddr  = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
   CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbCfgEP.CycleBit = 1;\r
@@ -3285,9 +3338,9 @@ XhcSetConfigCmd64 (
   DEBUG ((DEBUG_INFO, "Configure Endpoint\n"));\r
   Status = XhcCmdTransfer (\r
              Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbCfgEP,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrbCfgEP,\r
              XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcSetConfigCmd64: Config Endpoint Failed, Status = %r\n", Status));\r
@@ -3313,15 +3366,15 @@ XhcSetConfigCmd64 (
 EFI_STATUS\r
 EFIAPI\r
 XhcStopEndpoint (\r
-  IN USB_XHCI_INSTANCE      *Xhc,\r
-  IN UINT8                  SlotId,\r
-  IN UINT8                  Dci,\r
-  IN URB                    *PendingUrb  OPTIONAL\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT8              Dci,\r
+  IN URB                *PendingUrb  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EVT_TRB_COMMAND_COMPLETION    *EvtTrb;\r
-  CMD_TRB_STOP_ENDPOINT         CmdTrbStopED;\r
+  EFI_STATUS                  Status;\r
+  EVT_TRB_COMMAND_COMPLETION  *EvtTrb;\r
+  CMD_TRB_STOP_ENDPOINT       CmdTrbStopED;\r
 \r
   DEBUG ((DEBUG_INFO, "XhcStopEndpoint: Slot = 0x%x, Dci = 0x%x\n", SlotId, Dci));\r
 \r
@@ -3356,13 +3409,13 @@ XhcStopEndpoint (
   CmdTrbStopED.Type     = TRB_TYPE_STOP_ENDPOINT;\r
   CmdTrbStopED.EDID     = Dci;\r
   CmdTrbStopED.SlotId   = SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbStopED,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
-  if (EFI_ERROR(Status)) {\r
+  Status                = XhcCmdTransfer (\r
+                            Xhc,\r
+                            (TRB_TEMPLATE *)(UINTN)&CmdTrbStopED,\r
+                            XHC_GENERIC_TIMEOUT,\r
+                            (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                            );\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcStopEndpoint: Stop Endpoint Failed, Status = %r\n", Status));\r
   }\r
 \r
@@ -3385,9 +3438,9 @@ XhcStopEndpoint (
 EFI_STATUS\r
 EFIAPI\r
 XhcResetEndpoint (\r
-  IN USB_XHCI_INSTANCE      *Xhc,\r
-  IN UINT8                  SlotId,\r
-  IN UINT8                  Dci\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT8              Dci\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -3404,13 +3457,13 @@ XhcResetEndpoint (
   CmdTrbResetED.Type     = TRB_TYPE_RESET_ENDPOINT;\r
   CmdTrbResetED.EDID     = Dci;\r
   CmdTrbResetED.SlotId   = SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbResetED,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
-  if (EFI_ERROR(Status)) {\r
+  Status                 = XhcCmdTransfer (\r
+                             Xhc,\r
+                             (TRB_TEMPLATE *)(UINTN)&CmdTrbResetED,\r
+                             XHC_GENERIC_TIMEOUT,\r
+                             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                             );\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcResetEndpoint: Reset Endpoint Failed, Status = %r\n", Status));\r
   }\r
 \r
@@ -3433,10 +3486,10 @@ XhcResetEndpoint (
 EFI_STATUS\r
 EFIAPI\r
 XhcSetTrDequeuePointer (\r
-  IN USB_XHCI_INSTANCE      *Xhc,\r
-  IN UINT8                  SlotId,\r
-  IN UINT8                  Dci,\r
-  IN URB                    *Urb\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT8              Dci,\r
+  IN URB                *Urb\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -3450,20 +3503,20 @@ XhcSetTrDequeuePointer (
   // Send stop endpoint command to transit Endpoint from running to stop state\r
   //\r
   ZeroMem (&CmdSetTRDeq, sizeof (CmdSetTRDeq));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Urb->Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, Urb->Ring->RingEnqueue, sizeof (CMD_SET_TR_DEQ_POINTER));\r
   CmdSetTRDeq.PtrLo    = XHC_LOW_32BIT (PhyAddr) | Urb->Ring->RingPCS;\r
   CmdSetTRDeq.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdSetTRDeq.CycleBit = 1;\r
   CmdSetTRDeq.Type     = TRB_TYPE_SET_TR_DEQUE;\r
   CmdSetTRDeq.Endpoint = Dci;\r
   CmdSetTRDeq.SlotId   = SlotId;\r
-  Status = XhcCmdTransfer (\r
-             Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdSetTRDeq,\r
-             XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-             );\r
-  if (EFI_ERROR(Status)) {\r
+  Status               = XhcCmdTransfer (\r
+                           Xhc,\r
+                           (TRB_TEMPLATE *)(UINTN)&CmdSetTRDeq,\r
+                           XHC_GENERIC_TIMEOUT,\r
+                           (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+                           );\r
+  if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcSetTrDequeuePointer: Set TR Dequeue Pointer Failed, Status = %r\n", Status));\r
   }\r
 \r
@@ -3485,26 +3538,26 @@ XhcSetTrDequeuePointer (
 EFI_STATUS\r
 EFIAPI\r
 XhcSetInterface (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT8                    DeviceSpeed,\r
-  IN USB_CONFIG_DESCRIPTOR    *ConfigDesc,\r
-  IN EFI_USB_DEVICE_REQUEST   *Request\r
+  IN USB_XHCI_INSTANCE       *Xhc,\r
+  IN UINT8                   SlotId,\r
+  IN UINT8                   DeviceSpeed,\r
+  IN USB_CONFIG_DESCRIPTOR   *ConfigDesc,\r
+  IN EFI_USB_DEVICE_REQUEST  *Request\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDescActive;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDescSet;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDesc;\r
-  USB_ENDPOINT_DESCRIPTOR     *EpDesc;\r
-  UINTN                       NumEp;\r
-  UINTN                       EpIndex;\r
-  UINT8                       EpAddr;\r
-  UINT8                       Direction;\r
-  UINT8                       Dci;\r
-  UINT8                       MaxDci;\r
-  EFI_PHYSICAL_ADDRESS        PhyAddr;\r
-  VOID                        *RingSeg;\r
+  EFI_STATUS                Status;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDescActive;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDescSet;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDesc;\r
+  USB_ENDPOINT_DESCRIPTOR   *EpDesc;\r
+  UINTN                     NumEp;\r
+  UINTN                     EpIndex;\r
+  UINT8                     EpAddr;\r
+  UINT8                     Direction;\r
+  UINT8                     Dci;\r
+  UINT8                     MaxDci;\r
+  EFI_PHYSICAL_ADDRESS      PhyAddr;\r
+  VOID                      *RingSeg;\r
 \r
   CMD_TRB_CONFIG_ENDPOINT     CmdTrbCfgEP;\r
   INPUT_CONTEXT               *InputContext;\r
@@ -3533,18 +3586,18 @@ XhcSetInterface (
   MaxDci = 0;\r
 \r
   IfDescActive = NULL;\r
-  IfDescSet = NULL;\r
+  IfDescSet    = NULL;\r
 \r
   IfDesc = (USB_INTERFACE_DESCRIPTOR *)(ConfigDesc + 1);\r
-  while ((UINTN) IfDesc < ((UINTN) ConfigDesc + ConfigDesc->TotalLength)) {\r
+  while ((UINTN)IfDesc < ((UINTN)ConfigDesc + ConfigDesc->TotalLength)) {\r
     if ((IfDesc->DescriptorType == USB_DESC_TYPE_INTERFACE) && (IfDesc->Length >= sizeof (USB_INTERFACE_DESCRIPTOR))) {\r
-      if (IfDesc->InterfaceNumber == (UINT8) Request->Index) {\r
+      if (IfDesc->InterfaceNumber == (UINT8)Request->Index) {\r
         if (IfDesc->AlternateSetting == Xhc->UsbDevContext[SlotId].ActiveAlternateSetting[IfDesc->InterfaceNumber]) {\r
           //\r
           // Find out the active interface descriptor.\r
           //\r
           IfDescActive = IfDesc;\r
-        } else if (IfDesc->AlternateSetting == (UINT8) Request->Value) {\r
+        } else if (IfDesc->AlternateSetting == (UINT8)Request->Value) {\r
           //\r
           // Find out the interface descriptor to set.\r
           //\r
@@ -3552,6 +3605,7 @@ XhcSetInterface (
         }\r
       }\r
     }\r
+\r
     IfDesc = (USB_INTERFACE_DESCRIPTOR *)((UINTN)IfDesc + IfDesc->Length);\r
   }\r
 \r
@@ -3570,8 +3624,8 @@ XhcSetInterface (
   //\r
 \r
   if ((IfDescActive != NULL) && (IfDescSet != NULL)) {\r
-    NumEp = IfDescActive->NumEndpoints;\r
-    EpDesc = (USB_ENDPOINT_DESCRIPTOR *) (IfDescActive + 1);\r
+    NumEp  = IfDescActive->NumEndpoints;\r
+    EpDesc = (USB_ENDPOINT_DESCRIPTOR *)(IfDescActive + 1);\r
     for (EpIndex = 0; EpIndex < NumEp; EpIndex++) {\r
       while (EpDesc->DescriptorType != USB_DESC_TYPE_ENDPOINT) {\r
         EpDesc = (USB_ENDPOINT_DESCRIPTOR *)((UINTN)EpDesc + EpDesc->Length);\r
@@ -3582,14 +3636,15 @@ XhcSetInterface (
         continue;\r
       }\r
 \r
-      EpAddr    = (UINT8) (EpDesc->EndpointAddress & 0x0F);\r
-      Direction = (UINT8) ((EpDesc->EndpointAddress & 0x80) ? EfiUsbDataIn : EfiUsbDataOut);\r
+      EpAddr    = (UINT8)(EpDesc->EndpointAddress & 0x0F);\r
+      Direction = (UINT8)((EpDesc->EndpointAddress & 0x80) ? EfiUsbDataIn : EfiUsbDataOut);\r
 \r
       Dci = XhcEndpointToDci (EpAddr, Direction);\r
       ASSERT (Dci < 32);\r
       if (Dci > MaxDci) {\r
         MaxDci = Dci;\r
       }\r
+\r
       //\r
       // XHCI 4.3.6 - Setting Alternate Interfaces\r
       // 1) Stop any Running Transfer Rings affected by the Alternate Interface setting.\r
@@ -3598,6 +3653,7 @@ XhcSetInterface (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
+\r
       //\r
       // XHCI 4.3.6 - Setting Alternate Interfaces\r
       // 2) Free Transfer Rings of all endpoints that will be affected by the Alternate Interface setting.\r
@@ -3607,6 +3663,7 @@ XhcSetInterface (
         if (RingSeg != NULL) {\r
           UsbHcFreeMem (Xhc->MemPool, RingSeg, sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER);\r
         }\r
+\r
         FreePool (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci - 1]);\r
         Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci - 1] = NULL;\r
       }\r
@@ -3646,7 +3703,7 @@ XhcSetInterface (
     // 5) Issue and successfully complete a Configure Endpoint Command.\r
     //\r
     ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));\r
-    PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
+    PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
     CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
     CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
     CmdTrbCfgEP.CycleBit = 1;\r
@@ -3655,9 +3712,9 @@ XhcSetInterface (
     DEBUG ((DEBUG_INFO, "SetInterface: Configure Endpoint\n"));\r
     Status = XhcCmdTransfer (\r
                Xhc,\r
-               (TRB_TEMPLATE *) (UINTN) &CmdTrbCfgEP,\r
+               (TRB_TEMPLATE *)(UINTN)&CmdTrbCfgEP,\r
                XHC_GENERIC_TIMEOUT,\r
-               (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
+               (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
                );\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "SetInterface: Config Endpoint Failed, Status = %r\n", Status));\r
@@ -3665,7 +3722,7 @@ XhcSetInterface (
       //\r
       // Update the active AlternateSetting.\r
       //\r
-      Xhc->UsbDevContext[SlotId].ActiveAlternateSetting[(UINT8) Request->Index] = (UINT8) Request->Value;\r
+      Xhc->UsbDevContext[SlotId].ActiveAlternateSetting[(UINT8)Request->Index] = (UINT8)Request->Value;\r
     }\r
   }\r
 \r
@@ -3687,26 +3744,26 @@ XhcSetInterface (
 EFI_STATUS\r
 EFIAPI\r
 XhcSetInterface64 (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT8                    DeviceSpeed,\r
-  IN USB_CONFIG_DESCRIPTOR    *ConfigDesc,\r
-  IN EFI_USB_DEVICE_REQUEST   *Request\r
+  IN USB_XHCI_INSTANCE       *Xhc,\r
+  IN UINT8                   SlotId,\r
+  IN UINT8                   DeviceSpeed,\r
+  IN USB_CONFIG_DESCRIPTOR   *ConfigDesc,\r
+  IN EFI_USB_DEVICE_REQUEST  *Request\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDescActive;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDescSet;\r
-  USB_INTERFACE_DESCRIPTOR    *IfDesc;\r
-  USB_ENDPOINT_DESCRIPTOR     *EpDesc;\r
-  UINTN                       NumEp;\r
-  UINTN                       EpIndex;\r
-  UINT8                       EpAddr;\r
-  UINT8                       Direction;\r
-  UINT8                       Dci;\r
-  UINT8                       MaxDci;\r
-  EFI_PHYSICAL_ADDRESS        PhyAddr;\r
-  VOID                        *RingSeg;\r
+  EFI_STATUS                Status;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDescActive;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDescSet;\r
+  USB_INTERFACE_DESCRIPTOR  *IfDesc;\r
+  USB_ENDPOINT_DESCRIPTOR   *EpDesc;\r
+  UINTN                     NumEp;\r
+  UINTN                     EpIndex;\r
+  UINT8                     EpAddr;\r
+  UINT8                     Direction;\r
+  UINT8                     Dci;\r
+  UINT8                     MaxDci;\r
+  EFI_PHYSICAL_ADDRESS      PhyAddr;\r
+  VOID                      *RingSeg;\r
 \r
   CMD_TRB_CONFIG_ENDPOINT     CmdTrbCfgEP;\r
   INPUT_CONTEXT_64            *InputContext;\r
@@ -3735,18 +3792,18 @@ XhcSetInterface64 (
   MaxDci = 0;\r
 \r
   IfDescActive = NULL;\r
-  IfDescSet = NULL;\r
+  IfDescSet    = NULL;\r
 \r
   IfDesc = (USB_INTERFACE_DESCRIPTOR *)(ConfigDesc + 1);\r
-  while ((UINTN) IfDesc < ((UINTN) ConfigDesc + ConfigDesc->TotalLength)) {\r
+  while ((UINTN)IfDesc < ((UINTN)ConfigDesc + ConfigDesc->TotalLength)) {\r
     if ((IfDesc->DescriptorType == USB_DESC_TYPE_INTERFACE) && (IfDesc->Length >= sizeof (USB_INTERFACE_DESCRIPTOR))) {\r
-      if (IfDesc->InterfaceNumber == (UINT8) Request->Index) {\r
+      if (IfDesc->InterfaceNumber == (UINT8)Request->Index) {\r
         if (IfDesc->AlternateSetting == Xhc->UsbDevContext[SlotId].ActiveAlternateSetting[IfDesc->InterfaceNumber]) {\r
           //\r
           // Find out the active interface descriptor.\r
           //\r
           IfDescActive = IfDesc;\r
-        } else if (IfDesc->AlternateSetting == (UINT8) Request->Value) {\r
+        } else if (IfDesc->AlternateSetting == (UINT8)Request->Value) {\r
           //\r
           // Find out the interface descriptor to set.\r
           //\r
@@ -3754,6 +3811,7 @@ XhcSetInterface64 (
         }\r
       }\r
     }\r
+\r
     IfDesc = (USB_INTERFACE_DESCRIPTOR *)((UINTN)IfDesc + IfDesc->Length);\r
   }\r
 \r
@@ -3772,8 +3830,8 @@ XhcSetInterface64 (
   //\r
 \r
   if ((IfDescActive != NULL) && (IfDescSet != NULL)) {\r
-    NumEp = IfDescActive->NumEndpoints;\r
-    EpDesc = (USB_ENDPOINT_DESCRIPTOR *) (IfDescActive + 1);\r
+    NumEp  = IfDescActive->NumEndpoints;\r
+    EpDesc = (USB_ENDPOINT_DESCRIPTOR *)(IfDescActive + 1);\r
     for (EpIndex = 0; EpIndex < NumEp; EpIndex++) {\r
       while (EpDesc->DescriptorType != USB_DESC_TYPE_ENDPOINT) {\r
         EpDesc = (USB_ENDPOINT_DESCRIPTOR *)((UINTN)EpDesc + EpDesc->Length);\r
@@ -3784,14 +3842,15 @@ XhcSetInterface64 (
         continue;\r
       }\r
 \r
-      EpAddr    = (UINT8) (EpDesc->EndpointAddress & 0x0F);\r
-      Direction = (UINT8) ((EpDesc->EndpointAddress & 0x80) ? EfiUsbDataIn : EfiUsbDataOut);\r
+      EpAddr    = (UINT8)(EpDesc->EndpointAddress & 0x0F);\r
+      Direction = (UINT8)((EpDesc->EndpointAddress & 0x80) ? EfiUsbDataIn : EfiUsbDataOut);\r
 \r
       Dci = XhcEndpointToDci (EpAddr, Direction);\r
       ASSERT (Dci < 32);\r
       if (Dci > MaxDci) {\r
         MaxDci = Dci;\r
       }\r
+\r
       //\r
       // XHCI 4.3.6 - Setting Alternate Interfaces\r
       // 1) Stop any Running Transfer Rings affected by the Alternate Interface setting.\r
@@ -3800,6 +3859,7 @@ XhcSetInterface64 (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
+\r
       //\r
       // XHCI 4.3.6 - Setting Alternate Interfaces\r
       // 2) Free Transfer Rings of all endpoints that will be affected by the Alternate Interface setting.\r
@@ -3809,6 +3869,7 @@ XhcSetInterface64 (
         if (RingSeg != NULL) {\r
           UsbHcFreeMem (Xhc->MemPool, RingSeg, sizeof (TRB_TEMPLATE) * TR_RING_TRB_NUMBER);\r
         }\r
+\r
         FreePool (Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci - 1]);\r
         Xhc->UsbDevContext[SlotId].EndpointTransferRing[Dci - 1] = NULL;\r
       }\r
@@ -3848,7 +3909,7 @@ XhcSetInterface64 (
     // 5) Issue and successfully complete a Configure Endpoint Command.\r
     //\r
     ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));\r
-    PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
+    PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
     CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
     CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
     CmdTrbCfgEP.CycleBit = 1;\r
@@ -3857,9 +3918,9 @@ XhcSetInterface64 (
     DEBUG ((DEBUG_INFO, "SetInterface64: Configure Endpoint\n"));\r
     Status = XhcCmdTransfer (\r
                Xhc,\r
-               (TRB_TEMPLATE *) (UINTN) &CmdTrbCfgEP,\r
+               (TRB_TEMPLATE *)(UINTN)&CmdTrbCfgEP,\r
                XHC_GENERIC_TIMEOUT,\r
-               (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
+               (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
                );\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "SetInterface64: Config Endpoint Failed, Status = %r\n", Status));\r
@@ -3867,7 +3928,7 @@ XhcSetInterface64 (
       //\r
       // Update the active AlternateSetting.\r
       //\r
-      Xhc->UsbDevContext[SlotId].ActiveAlternateSetting[(UINT8) Request->Index] = (UINT8) Request->Value;\r
+      Xhc->UsbDevContext[SlotId].ActiveAlternateSetting[(UINT8)Request->Index] = (UINT8)Request->Value;\r
     }\r
   }\r
 \r
@@ -3887,9 +3948,9 @@ XhcSetInterface64 (
 EFI_STATUS\r
 EFIAPI\r
 XhcEvaluateContext (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT32                   MaxPacketSize\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT32             MaxPacketSize\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -3910,7 +3971,7 @@ XhcEvaluateContext (
   InputContext->EP[0].MaxPacketSize         = MaxPacketSize;\r
 \r
   ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
   CmdTrbEvalu.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbEvalu.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbEvalu.CycleBit = 1;\r
@@ -3919,13 +3980,14 @@ XhcEvaluateContext (
   DEBUG ((DEBUG_INFO, "Evaluate context\n"));\r
   Status = XhcCmdTransfer (\r
              Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbEvalu,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrbEvalu,\r
              XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcEvaluateContext: Evaluate Context Failed, Status = %r\n", Status));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -3942,9 +4004,9 @@ XhcEvaluateContext (
 EFI_STATUS\r
 EFIAPI\r
 XhcEvaluateContext64 (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT32                   MaxPacketSize\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT32             MaxPacketSize\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -3965,7 +4027,7 @@ XhcEvaluateContext64 (
   InputContext->EP[0].MaxPacketSize         = MaxPacketSize;\r
 \r
   ZeroMem (&CmdTrbEvalu, sizeof (CmdTrbEvalu));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
   CmdTrbEvalu.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbEvalu.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbEvalu.CycleBit = 1;\r
@@ -3974,17 +4036,17 @@ XhcEvaluateContext64 (
   DEBUG ((DEBUG_INFO, "Evaluate context\n"));\r
   Status = XhcCmdTransfer (\r
              Xhc,\r
-             (TRB_TEMPLATE *) (UINTN) &CmdTrbEvalu,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrbEvalu,\r
              XHC_GENERIC_TIMEOUT,\r
-             (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
              );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcEvaluateContext64: Evaluate Context Failed, Status = %r\n", Status));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Evaluate the slot context for hub device through XHCI's Configure_Endpoint cmd.\r
 \r
@@ -3999,11 +4061,11 @@ XhcEvaluateContext64 (
 **/\r
 EFI_STATUS\r
 XhcConfigHubContext (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT8                    PortNum,\r
-  IN UINT8                    TTT,\r
-  IN UINT8                    MTT\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT8              PortNum,\r
+  IN UINT8              TTT,\r
+  IN UINT8              MTT\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -4027,14 +4089,14 @@ XhcConfigHubContext (
   //\r
   // Copy the slot context from OutputContext to Input context\r
   //\r
-  CopyMem(&(InputContext->Slot), &(OutputContext->Slot), sizeof (SLOT_CONTEXT));\r
+  CopyMem (&(InputContext->Slot), &(OutputContext->Slot), sizeof (SLOT_CONTEXT));\r
   InputContext->Slot.Hub     = 1;\r
   InputContext->Slot.PortNum = PortNum;\r
   InputContext->Slot.TTT     = TTT;\r
   InputContext->Slot.MTT     = MTT;\r
 \r
   ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT));\r
   CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbCfgEP.CycleBit = 1;\r
@@ -4042,14 +4104,15 @@ XhcConfigHubContext (
   CmdTrbCfgEP.SlotId   = Xhc->UsbDevContext[SlotId].SlotId;\r
   DEBUG ((DEBUG_INFO, "Configure Hub Slot Context\n"));\r
   Status = XhcCmdTransfer (\r
-              Xhc,\r
-              (TRB_TEMPLATE *) (UINTN) &CmdTrbCfgEP,\r
-              XHC_GENERIC_TIMEOUT,\r
-              (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-              );\r
+             Xhc,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrbCfgEP,\r
+             XHC_GENERIC_TIMEOUT,\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcConfigHubContext: Config Endpoint Failed, Status = %r\n", Status));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -4067,11 +4130,11 @@ XhcConfigHubContext (
 **/\r
 EFI_STATUS\r
 XhcConfigHubContext64 (\r
-  IN USB_XHCI_INSTANCE        *Xhc,\r
-  IN UINT8                    SlotId,\r
-  IN UINT8                    PortNum,\r
-  IN UINT8                    TTT,\r
-  IN UINT8                    MTT\r
+  IN USB_XHCI_INSTANCE  *Xhc,\r
+  IN UINT8              SlotId,\r
+  IN UINT8              PortNum,\r
+  IN UINT8              TTT,\r
+  IN UINT8              MTT\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -4095,14 +4158,14 @@ XhcConfigHubContext64 (
   //\r
   // Copy the slot context from OutputContext to Input context\r
   //\r
-  CopyMem(&(InputContext->Slot), &(OutputContext->Slot), sizeof (SLOT_CONTEXT_64));\r
+  CopyMem (&(InputContext->Slot), &(OutputContext->Slot), sizeof (SLOT_CONTEXT_64));\r
   InputContext->Slot.Hub     = 1;\r
   InputContext->Slot.PortNum = PortNum;\r
   InputContext->Slot.TTT     = TTT;\r
   InputContext->Slot.MTT     = MTT;\r
 \r
   ZeroMem (&CmdTrbCfgEP, sizeof (CmdTrbCfgEP));\r
-  PhyAddr = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
+  PhyAddr              = UsbHcGetPciAddrForHostAddr (Xhc->MemPool, InputContext, sizeof (INPUT_CONTEXT_64));\r
   CmdTrbCfgEP.PtrLo    = XHC_LOW_32BIT (PhyAddr);\r
   CmdTrbCfgEP.PtrHi    = XHC_HIGH_32BIT (PhyAddr);\r
   CmdTrbCfgEP.CycleBit = 1;\r
@@ -4110,13 +4173,14 @@ XhcConfigHubContext64 (
   CmdTrbCfgEP.SlotId   = Xhc->UsbDevContext[SlotId].SlotId;\r
   DEBUG ((DEBUG_INFO, "Configure Hub Slot Context\n"));\r
   Status = XhcCmdTransfer (\r
-              Xhc,\r
-              (TRB_TEMPLATE *) (UINTN) &CmdTrbCfgEP,\r
-              XHC_GENERIC_TIMEOUT,\r
-              (TRB_TEMPLATE **) (UINTN) &EvtTrb\r
-              );\r
+             Xhc,\r
+             (TRB_TEMPLATE *)(UINTN)&CmdTrbCfgEP,\r
+             XHC_GENERIC_TIMEOUT,\r
+             (TRB_TEMPLATE **)(UINTN)&EvtTrb\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((DEBUG_ERROR, "XhcConfigHubContext64: Config Endpoint Failed, Status = %r\n", Status));\r
   }\r
+\r
   return Status;\r
 }\r