]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Universal / DebugPortDxe / DebugPort.c
index 172c1cbca38d8a215ec9e4cb1baf3fa7f643f246..f79ad0489ca8e8b1c71cb846eb84c42f1077631c 100644 (file)
@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // Globals\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL gDebugPortDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gDebugPortDriverBinding = {\r
   DebugPortSupported,\r
   DebugPortStart,\r
   DebugPortStop,\r
@@ -23,25 +23,25 @@ EFI_DRIVER_BINDING_PROTOCOL gDebugPortDriverBinding = {
   NULL\r
 };\r
 \r
-DEBUGPORT_DEVICE mDebugPortDevice = {\r
+DEBUGPORT_DEVICE  mDebugPortDevice = {\r
   DEBUGPORT_DEVICE_SIGNATURE,\r
-  (EFI_HANDLE) 0,\r
-  (EFI_HANDLE) 0,\r
-  (EFI_DEVICE_PATH_PROTOCOL *) NULL,\r
+  (EFI_HANDLE)0,\r
+  (EFI_HANDLE)0,\r
+  (EFI_DEVICE_PATH_PROTOCOL *)NULL,\r
   {\r
     DebugPortReset,\r
     DebugPortWrite,\r
     DebugPortRead,\r
     DebugPortPoll\r
   },\r
-  (EFI_HANDLE) 0,\r
-  (EFI_SERIAL_IO_PROTOCOL *) NULL,\r
+  (EFI_HANDLE)0,\r
+  (EFI_SERIAL_IO_PROTOCOL *)NULL,\r
   DEBUGPORT_UART_DEFAULT_BAUDRATE,\r
   DEBUGPORT_UART_DEFAULT_FIFO_DEPTH,\r
   DEBUGPORT_UART_DEFAULT_TIMEOUT,\r
-  (EFI_PARITY_TYPE) DEBUGPORT_UART_DEFAULT_PARITY,\r
+  (EFI_PARITY_TYPE)DEBUGPORT_UART_DEFAULT_PARITY,\r
   DEBUGPORT_UART_DEFAULT_DATA_BITS,\r
-  (EFI_STOP_BITS_TYPE) DEBUGPORT_UART_DEFAULT_STOP_BITS\r
+  (EFI_STOP_BITS_TYPE)DEBUGPORT_UART_DEFAULT_STOP_BITS\r
 };\r
 \r
 /**\r
@@ -59,7 +59,7 @@ GetDebugPortVariable (
   EFI_DEVICE_PATH_PROTOCOL  *DebugPortVariable;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
-  GetVariable2 (EFI_DEBUGPORT_VARIABLE_NAME, &gEfiDebugPortVariableGuid, (VOID **) &DebugPortVariable, &DataSize);\r
+  GetVariable2 (EFI_DEBUGPORT_VARIABLE_NAME, &gEfiDebugPortVariableGuid, (VOID **)&DebugPortVariable, &DataSize);\r
   if (DebugPortVariable == NULL) {\r
     return NULL;\r
   }\r
@@ -75,25 +75,25 @@ GetDebugPortVariable (
   } else {\r
     CopyMem (\r
       &mDebugPortDevice.BaudRate,\r
-      &((UART_DEVICE_PATH *) DevicePath)->BaudRate,\r
-      sizeof (((UART_DEVICE_PATH *) DevicePath)->BaudRate)\r
+      &((UART_DEVICE_PATH *)DevicePath)->BaudRate,\r
+      sizeof (((UART_DEVICE_PATH *)DevicePath)->BaudRate)\r
       );\r
     mDebugPortDevice.ReceiveFifoDepth = DEBUGPORT_UART_DEFAULT_FIFO_DEPTH;\r
     mDebugPortDevice.Timeout          = DEBUGPORT_UART_DEFAULT_TIMEOUT;\r
     CopyMem (\r
       &mDebugPortDevice.Parity,\r
-      &((UART_DEVICE_PATH *) DevicePath)->Parity,\r
-      sizeof (((UART_DEVICE_PATH *) DevicePath)->Parity)\r
+      &((UART_DEVICE_PATH *)DevicePath)->Parity,\r
+      sizeof (((UART_DEVICE_PATH *)DevicePath)->Parity)\r
       );\r
     CopyMem (\r
       &mDebugPortDevice.DataBits,\r
-      &((UART_DEVICE_PATH *) DevicePath)->DataBits,\r
-      sizeof (((UART_DEVICE_PATH *) DevicePath)->DataBits)\r
+      &((UART_DEVICE_PATH *)DevicePath)->DataBits,\r
+      sizeof (((UART_DEVICE_PATH *)DevicePath)->DataBits)\r
       );\r
     CopyMem (\r
       &mDebugPortDevice.StopBits,\r
-      &((UART_DEVICE_PATH *) DevicePath)->StopBits,\r
-      sizeof (((UART_DEVICE_PATH *) DevicePath)->StopBits)\r
+      &((UART_DEVICE_PATH *)DevicePath)->StopBits,\r
+      sizeof (((UART_DEVICE_PATH *)DevicePath)->StopBits)\r
       );\r
     return DebugPortVariable;\r
   }\r
@@ -117,11 +117,11 @@ GetDebugPortVariable (
 EFI_STATUS\r
 EFIAPI\r
 InitializeDebugPortDriver (\r
-  IN EFI_HANDLE             ImageHandle,\r
-  IN EFI_SYSTEM_TABLE       *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Install driver model protocol(s).\r
@@ -163,9 +163,9 @@ InitializeDebugPortDriver (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -179,9 +179,10 @@ DebugPortSupported (
   // Check to see that there's not a debugport protocol already published,\r
   // since only one standard UART serial port could be supported by this driver.\r
   //\r
-  if (gBS->LocateProtocol (&gEfiDebugPortProtocolGuid, NULL, (VOID **) &DebugPortInterface) != EFI_NOT_FOUND) {\r
+  if (gBS->LocateProtocol (&gEfiDebugPortProtocolGuid, NULL, (VOID **)&DebugPortInterface) != EFI_NOT_FOUND) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   //\r
   // Read DebugPort variable to determine debug port selection and parameters\r
   //\r
@@ -195,25 +196,25 @@ DebugPortSupported (
     // device path only.  Otherwise, it's a mismatch and EFI_UNSUPPORTED is returned.\r
     //\r
     DevicePath = DebugPortVariable;\r
-    Status = gBS->LocateDevicePath (\r
-                    &gEfiSerialIoProtocolGuid,\r
-                    &DevicePath,\r
-                    &TempHandle\r
-                    );\r
+    Status     = gBS->LocateDevicePath (\r
+                        &gEfiSerialIoProtocolGuid,\r
+                        &DevicePath,\r
+                        &TempHandle\r
+                        );\r
 \r
-    if (Status == EFI_SUCCESS && TempHandle != ControllerHandle) {\r
+    if ((Status == EFI_SUCCESS) && (TempHandle != ControllerHandle)) {\r
       Status = EFI_UNSUPPORTED;\r
     }\r
 \r
-    if (Status == EFI_SUCCESS &&\r
-        (DevicePath->Type != MESSAGING_DEVICE_PATH ||\r
-         DevicePath->SubType != MSG_VENDOR_DP ||\r
-         *((UINT16 *) DevicePath->Length) != sizeof (DEBUGPORT_DEVICE_PATH))) {\r
-\r
+    if ((Status == EFI_SUCCESS) &&\r
+        ((DevicePath->Type != MESSAGING_DEVICE_PATH) ||\r
+         (DevicePath->SubType != MSG_VENDOR_DP) ||\r
+         (*((UINT16 *)DevicePath->Length) != sizeof (DEBUGPORT_DEVICE_PATH))))\r
+    {\r
       Status = EFI_UNSUPPORTED;\r
     }\r
 \r
-    if (Status == EFI_SUCCESS && !CompareGuid (&gEfiDebugPortDevicePathGuid, (GUID *) (DevicePath + 1))) {\r
+    if ((Status == EFI_SUCCESS) && !CompareGuid (&gEfiDebugPortDevicePathGuid, (GUID *)(DevicePath + 1))) {\r
       Status = EFI_UNSUPPORTED;\r
     }\r
 \r
@@ -226,7 +227,7 @@ DebugPortSupported (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSerialIoProtocolGuid,\r
-                  (VOID **) &SerialIo,\r
+                  (VOID **)&SerialIo,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER | EFI_OPEN_PROTOCOL_EXCLUSIVE\r
@@ -262,9 +263,9 @@ DebugPortSupported (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -275,7 +276,7 @@ DebugPortStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSerialIoProtocolGuid,\r
-                  (VOID **) &mDebugPortDevice.SerialIoBinding,\r
+                  (VOID **)&mDebugPortDevice.SerialIoBinding,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER | EFI_OPEN_PROTOCOL_EXCLUSIVE\r
@@ -290,36 +291,36 @@ DebugPortStart (
   // Initialize the Serial Io interface...\r
   //\r
   Status = mDebugPortDevice.SerialIoBinding->SetAttributes (\r
-                                                mDebugPortDevice.SerialIoBinding,\r
-                                                mDebugPortDevice.BaudRate,\r
-                                                mDebugPortDevice.ReceiveFifoDepth,\r
-                                                mDebugPortDevice.Timeout,\r
-                                                mDebugPortDevice.Parity,\r
-                                                mDebugPortDevice.DataBits,\r
-                                                mDebugPortDevice.StopBits\r
-                                                );\r
+                                               mDebugPortDevice.SerialIoBinding,\r
+                                               mDebugPortDevice.BaudRate,\r
+                                               mDebugPortDevice.ReceiveFifoDepth,\r
+                                               mDebugPortDevice.Timeout,\r
+                                               mDebugPortDevice.Parity,\r
+                                               mDebugPortDevice.DataBits,\r
+                                               mDebugPortDevice.StopBits\r
+                                               );\r
   if (EFI_ERROR (Status)) {\r
-    mDebugPortDevice.BaudRate          = 0;\r
-    mDebugPortDevice.Parity            = DefaultParity;\r
-    mDebugPortDevice.DataBits          = 0;\r
-    mDebugPortDevice.StopBits          = DefaultStopBits;\r
-    mDebugPortDevice.ReceiveFifoDepth  = 0;\r
-    Status = mDebugPortDevice.SerialIoBinding->SetAttributes (\r
-                                                  mDebugPortDevice.SerialIoBinding,\r
-                                                  mDebugPortDevice.BaudRate,\r
-                                                  mDebugPortDevice.ReceiveFifoDepth,\r
-                                                  mDebugPortDevice.Timeout,\r
-                                                  mDebugPortDevice.Parity,\r
-                                                  mDebugPortDevice.DataBits,\r
-                                                  mDebugPortDevice.StopBits\r
-                                                  );\r
+    mDebugPortDevice.BaudRate         = 0;\r
+    mDebugPortDevice.Parity           = DefaultParity;\r
+    mDebugPortDevice.DataBits         = 0;\r
+    mDebugPortDevice.StopBits         = DefaultStopBits;\r
+    mDebugPortDevice.ReceiveFifoDepth = 0;\r
+    Status                            = mDebugPortDevice.SerialIoBinding->SetAttributes (\r
+                                                                            mDebugPortDevice.SerialIoBinding,\r
+                                                                            mDebugPortDevice.BaudRate,\r
+                                                                            mDebugPortDevice.ReceiveFifoDepth,\r
+                                                                            mDebugPortDevice.Timeout,\r
+                                                                            mDebugPortDevice.Parity,\r
+                                                                            mDebugPortDevice.DataBits,\r
+                                                                            mDebugPortDevice.StopBits\r
+                                                                            );\r
     if (EFI_ERROR (Status)) {\r
       gBS->CloseProtocol (\r
-            ControllerHandle,\r
-            &gEfiSerialIoProtocolGuid,\r
-            This->DriverBindingHandle,\r
-            ControllerHandle\r
-            );\r
+             ControllerHandle,\r
+             &gEfiSerialIoProtocolGuid,\r
+             This->DriverBindingHandle,\r
+             ControllerHandle\r
+             );\r
       return Status;\r
     }\r
   }\r
@@ -329,8 +330,8 @@ DebugPortStart (
   //\r
   // Create device path instance for DebugPort\r
   //\r
-  DebugPortDP.Header.Type     = MESSAGING_DEVICE_PATH;\r
-  DebugPortDP.Header.SubType  = MSG_VENDOR_DP;\r
+  DebugPortDP.Header.Type    = MESSAGING_DEVICE_PATH;\r
+  DebugPortDP.Header.SubType = MSG_VENDOR_DP;\r
   SetDevicePathNodeLength (&(DebugPortDP.Header), sizeof (DebugPortDP));\r
   CopyGuid (&DebugPortDP.Guid, &gEfiDebugPortDevicePathGuid);\r
 \r
@@ -340,10 +341,11 @@ DebugPortStart (
     SetDevicePathEndNode (Dp1);\r
   }\r
 \r
-  mDebugPortDevice.DebugPortDevicePath = AppendDevicePathNode (Dp1, (EFI_DEVICE_PATH_PROTOCOL *) &DebugPortDP);\r
+  mDebugPortDevice.DebugPortDevicePath = AppendDevicePathNode (Dp1, (EFI_DEVICE_PATH_PROTOCOL *)&DebugPortDP);\r
   if (mDebugPortDevice.DebugPortDevicePath == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Publish DebugPort and Device Path protocols\r
   //\r
@@ -358,20 +360,21 @@ DebugPortStart (
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiSerialIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiSerialIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
     return Status;\r
   }\r
+\r
   //\r
   // Connect debugport child to serial io\r
   //\r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSerialIoProtocolGuid,\r
-                  (VOID **) &mDebugPortDevice.SerialIoBinding,\r
+                  (VOID **)&mDebugPortDevice.SerialIoBinding,\r
                   This->DriverBindingHandle,\r
                   mDebugPortDevice.DebugPortDeviceHandle,\r
                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -379,11 +382,11 @@ DebugPortStart (
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiSerialIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiSerialIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
     return Status;\r
   }\r
 \r
@@ -407,10 +410,10 @@ DebugPortStart (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN  EFI_HANDLE                     ControllerHandle,\r
-  IN  UINTN                          NumberOfChildren,\r
-  IN  EFI_HANDLE                     *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  UINTN                        NumberOfChildren,\r
+  IN  EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -420,20 +423,20 @@ DebugPortStop (
     // Close the bus driver\r
     //\r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiSerialIoProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiSerialIoProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
 \r
     mDebugPortDevice.SerialIoBinding = NULL;\r
 \r
     gBS->CloseProtocol (\r
-          ControllerHandle,\r
-          &gEfiDevicePathProtocolGuid,\r
-          This->DriverBindingHandle,\r
-          ControllerHandle\r
-          );\r
+           ControllerHandle,\r
+           &gEfiDevicePathProtocolGuid,\r
+           This->DriverBindingHandle,\r
+           ControllerHandle\r
+           );\r
 \r
     FreePool (mDebugPortDevice.DebugPortDevicePath);\r
 \r
@@ -452,6 +455,7 @@ DebugPortStop (
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
+\r
     //\r
     // Unpublish our protocols (DevicePath, DebugPort)\r
     //\r
@@ -466,13 +470,13 @@ DebugPortStop (
 \r
     if (EFI_ERROR (Status)) {\r
       gBS->OpenProtocol (\r
-            ControllerHandle,\r
-            &gEfiSerialIoProtocolGuid,\r
-            (VOID **) &mDebugPortDevice.SerialIoBinding,\r
-            This->DriverBindingHandle,\r
-            mDebugPortDevice.DebugPortDeviceHandle,\r
-            EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
-            );\r
+             ControllerHandle,\r
+             &gEfiSerialIoProtocolGuid,\r
+             (VOID **)&mDebugPortDevice.SerialIoBinding,\r
+             This->DriverBindingHandle,\r
+             mDebugPortDevice.DebugPortDeviceHandle,\r
+             EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+             );\r
     } else {\r
       mDebugPortDevice.DebugPortDeviceHandle = NULL;\r
     }\r
@@ -497,11 +501,11 @@ DebugPortStop (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortReset (\r
-  IN EFI_DEBUGPORT_PROTOCOL   *This\r
+  IN EFI_DEBUGPORT_PROTOCOL  *This\r
   )\r
 {\r
-  UINTN             BufferSize;\r
-  UINTN             BitBucket;\r
+  UINTN  BufferSize;\r
+  UINTN  BitBucket;\r
 \r
   while (This->Poll (This) == EFI_SUCCESS) {\r
     BufferSize = 1;\r
@@ -528,10 +532,10 @@ DebugPortReset (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortRead (\r
-  IN EFI_DEBUGPORT_PROTOCOL   *This,\r
-  IN UINT32                   Timeout,\r
-  IN OUT UINTN                *BufferSize,\r
-  IN VOID                     *Buffer\r
+  IN EFI_DEBUGPORT_PROTOCOL  *This,\r
+  IN UINT32                  Timeout,\r
+  IN OUT UINTN               *BufferSize,\r
+  IN VOID                    *Buffer\r
   )\r
 {\r
   DEBUGPORT_DEVICE  *DebugPortDevice;\r
@@ -545,10 +549,10 @@ DebugPortRead (
 \r
   do {\r
     Status = DebugPortDevice->SerialIoBinding->Read (\r
-                                                DebugPortDevice->SerialIoBinding,\r
-                                                &LocalBufferSize,\r
-                                                BufferPtr\r
-                                                );\r
+                                                 DebugPortDevice->SerialIoBinding,\r
+                                                 &LocalBufferSize,\r
+                                                 BufferPtr\r
+                                                 );\r
     if (Status == EFI_TIMEOUT) {\r
       if (Timeout > DEBUGPORT_UART_DEFAULT_TIMEOUT) {\r
         Timeout -= DEBUGPORT_UART_DEFAULT_TIMEOUT;\r
@@ -559,11 +563,11 @@ DebugPortRead (
       break;\r
     }\r
 \r
-    BufferPtr += LocalBufferSize;\r
-    LocalBufferSize = *BufferSize - (BufferPtr - (UINT8 *) Buffer);\r
+    BufferPtr      += LocalBufferSize;\r
+    LocalBufferSize = *BufferSize - (BufferPtr - (UINT8 *)Buffer);\r
   } while (LocalBufferSize != 0 && Timeout > 0);\r
 \r
-  *BufferSize = (UINTN) BufferPtr - (UINTN) Buffer;\r
+  *BufferSize = (UINTN)BufferPtr - (UINTN)Buffer;\r
 \r
   return Status;\r
 }\r
@@ -586,10 +590,10 @@ DebugPortRead (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortWrite (\r
-  IN EFI_DEBUGPORT_PROTOCOL   *This,\r
-  IN UINT32                   Timeout,\r
-  IN OUT UINTN                *BufferSize,\r
-  OUT VOID                    *Buffer\r
+  IN EFI_DEBUGPORT_PROTOCOL  *This,\r
+  IN UINT32                  Timeout,\r
+  IN OUT UINTN               *BufferSize,\r
+  OUT VOID                   *Buffer\r
   )\r
 {\r
   DEBUGPORT_DEVICE  *DebugPortDevice;\r
@@ -601,7 +605,7 @@ DebugPortWrite (
   Status          = EFI_SUCCESS;\r
   DebugPortDevice = DEBUGPORT_DEVICE_FROM_THIS (This);\r
 \r
-  WriteSize       = 8;\r
+  WriteSize = 8;\r
   for (Position = 0; Position < *BufferSize && !EFI_ERROR (Status); Position += WriteSize) {\r
     DebugPortDevice->SerialIoBinding->GetControl (\r
                                         DebugPortDevice->SerialIoBinding,\r
@@ -612,10 +616,10 @@ DebugPortWrite (
     }\r
 \r
     Status = DebugPortDevice->SerialIoBinding->Write (\r
-                                                DebugPortDevice->SerialIoBinding,\r
-                                                &WriteSize,\r
-                                                &((UINT8 *) Buffer)[Position]\r
-                                                );\r
+                                                 DebugPortDevice->SerialIoBinding,\r
+                                                 &WriteSize,\r
+                                                 &((UINT8 *)Buffer)[Position]\r
+                                                 );\r
   }\r
 \r
   *BufferSize = Position;\r
@@ -638,7 +642,7 @@ DebugPortWrite (
 EFI_STATUS\r
 EFIAPI\r
 DebugPortPoll (\r
-  IN EFI_DEBUGPORT_PROTOCOL   *This\r
+  IN EFI_DEBUGPORT_PROTOCOL  *This\r
   )\r
 {\r
   EFI_STATUS        Status;\r
@@ -648,9 +652,9 @@ DebugPortPoll (
   DebugPortDevice = DEBUGPORT_DEVICE_FROM_THIS (This);\r
 \r
   Status = DebugPortDevice->SerialIoBinding->GetControl (\r
-                                              DebugPortDevice->SerialIoBinding,\r
-                                              &SerialControl\r
-                                              );\r
+                                               DebugPortDevice->SerialIoBinding,\r
+                                               &SerialControl\r
+                                               );\r
 \r
   if (!EFI_ERROR (Status)) {\r
     if ((SerialControl & EFI_SERIAL_INPUT_BUFFER_EMPTY) != 0) {\r
@@ -677,7 +681,7 @@ DebugPortPoll (
 EFI_STATUS\r
 EFIAPI\r
 ImageUnloadHandler (\r
-  EFI_HANDLE ImageHandle\r
+  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -705,14 +709,17 @@ ImageUnloadHandler (
     if (ComponentName2 == NULL) {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       ImageHandle,\r
-                      &gEfiDriverBindingProtocolGuid,  &gDebugPortDriverBinding,\r
+                      &gEfiDriverBindingProtocolGuid,\r
+                      &gDebugPortDriverBinding,\r
                       NULL\r
                       );\r
     } else {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       ImageHandle,\r
-                      &gEfiDriverBindingProtocolGuid,  &gDebugPortDriverBinding,\r
-                      &gEfiComponentName2ProtocolGuid, ComponentName2,\r
+                      &gEfiDriverBindingProtocolGuid,\r
+                      &gDebugPortDriverBinding,\r
+                      &gEfiComponentName2ProtocolGuid,\r
+                      ComponentName2,\r
                       NULL\r
                       );\r
     }\r
@@ -720,16 +727,21 @@ ImageUnloadHandler (
     if (ComponentName2 == NULL) {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       ImageHandle,\r
-                      &gEfiDriverBindingProtocolGuid,  &gDebugPortDriverBinding,\r
-                      &gEfiComponentNameProtocolGuid,  ComponentName,\r
+                      &gEfiDriverBindingProtocolGuid,\r
+                      &gDebugPortDriverBinding,\r
+                      &gEfiComponentNameProtocolGuid,\r
+                      ComponentName,\r
                       NULL\r
                       );\r
     } else {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
                       ImageHandle,\r
-                      &gEfiDriverBindingProtocolGuid,  &gDebugPortDriverBinding,\r
-                      &gEfiComponentNameProtocolGuid,  ComponentName,\r
-                      &gEfiComponentName2ProtocolGuid, ComponentName2,\r
+                      &gEfiDriverBindingProtocolGuid,\r
+                      &gDebugPortDriverBinding,\r
+                      &gEfiComponentNameProtocolGuid,\r
+                      ComponentName,\r
+                      &gEfiComponentName2ProtocolGuid,\r
+                      ComponentName2,\r
                       NULL\r
                       );\r
     }\r