]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm
[mirror_edk2.git] / MdeModulePkg / Universal / Console / ConSplitterDxe / ConSplitter.c
index b090de288517780c52e1b9e2ebf492f17101a135..8b5e62e3a883cebfca105265fa5f9290a49583ed 100644 (file)
@@ -35,33 +35,33 @@ BOOLEAN  mConInIsConnect = FALSE;
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {\r
   TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE,\r
-  (EFI_HANDLE) NULL,\r
+  (EFI_HANDLE)NULL,\r
 \r
   {\r
     ConSplitterTextInReset,\r
     ConSplitterTextInReadKeyStroke,\r
-    (EFI_EVENT) NULL\r
+    (EFI_EVENT)NULL\r
   },\r
   0,\r
-  (EFI_SIMPLE_TEXT_INPUT_PROTOCOL **) NULL,\r
+  (EFI_SIMPLE_TEXT_INPUT_PROTOCOL **)NULL,\r
   0,\r
 \r
   {\r
     ConSplitterTextInResetEx,\r
     ConSplitterTextInReadKeyStrokeEx,\r
-    (EFI_EVENT) NULL,\r
+    (EFI_EVENT)NULL,\r
     ConSplitterTextInSetState,\r
     ConSplitterTextInRegisterKeyNotify,\r
     ConSplitterTextInUnregisterKeyNotify\r
   },\r
   0,\r
-  (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL **) NULL,\r
+  (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL **)NULL,\r
   0,\r
   {\r
-    (LIST_ENTRY *) NULL,\r
-    (LIST_ENTRY *) NULL\r
+    (LIST_ENTRY *)NULL,\r
+    (LIST_ENTRY *)NULL\r
   },\r
-  (EFI_KEY_DATA *) NULL,\r
+  (EFI_KEY_DATA *)NULL,\r
   0,\r
   0,\r
   FALSE,\r
@@ -69,8 +69,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {
   {\r
     ConSplitterSimplePointerReset,\r
     ConSplitterSimplePointerGetState,\r
-    (EFI_EVENT) NULL,\r
-    (EFI_SIMPLE_POINTER_MODE *) NULL\r
+    (EFI_EVENT)NULL,\r
+    (EFI_SIMPLE_POINTER_MODE *)NULL\r
   },\r
   {\r
     0x10000,\r
@@ -80,14 +80,14 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {
     TRUE\r
   },\r
   0,\r
-  (EFI_SIMPLE_POINTER_PROTOCOL **) NULL,\r
+  (EFI_SIMPLE_POINTER_PROTOCOL **)NULL,\r
   0,\r
 \r
   {\r
     ConSplitterAbsolutePointerReset,\r
     ConSplitterAbsolutePointerGetState,\r
-    (EFI_EVENT) NULL,\r
-    (EFI_ABSOLUTE_POINTER_MODE *) NULL\r
+    (EFI_EVENT)NULL,\r
+    (EFI_ABSOLUTE_POINTER_MODE *)NULL\r
   },\r
   {\r
     0,       // AbsoluteMinX\r
@@ -99,7 +99,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {
     0        // Attributes\r
   },\r
   0,\r
-  (EFI_ABSOLUTE_POINTER_PROTOCOL **) NULL,\r
+  (EFI_ABSOLUTE_POINTER_PROTOCOL **)NULL,\r
   0,\r
   FALSE,\r
 \r
@@ -107,11 +107,10 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_IN_SPLITTER_PRIVATE_DATA  mConIn = {
   FALSE\r
 };\r
 \r
-\r
 //\r
 // Uga Draw Protocol Private Data template\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_UGA_DRAW_PROTOCOL mUgaDrawProtocolTemplate = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UGA_DRAW_PROTOCOL  mUgaDrawProtocolTemplate = {\r
   ConSplitterUgaDrawGetMode,\r
   ConSplitterUgaDrawSetMode,\r
   ConSplitterUgaDrawBlt\r
@@ -120,20 +119,19 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UGA_DRAW_PROTOCOL mUgaDrawProtocolTemplate = {
 //\r
 // Graphics Output Protocol Private Data template\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_GRAPHICS_OUTPUT_PROTOCOL mGraphicsOutputProtocolTemplate = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_GRAPHICS_OUTPUT_PROTOCOL  mGraphicsOutputProtocolTemplate = {\r
   ConSplitterGraphicsOutputQueryMode,\r
   ConSplitterGraphicsOutputSetMode,\r
   ConSplitterGraphicsOutputBlt,\r
   NULL\r
 };\r
 \r
-\r
 //\r
 // Text Out Splitter Private Data template\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA  mConOut = {\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE,\r
-  (EFI_HANDLE) NULL,\r
+  (EFI_HANDLE)NULL,\r
   {\r
     ConSplitterTextOutReset,\r
     ConSplitterTextOutOutputString,\r
@@ -144,7 +142,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
     ConSplitterTextOutClearScreen,\r
     ConSplitterTextOutSetCursorPosition,\r
     ConSplitterTextOutEnableCursor,\r
-    (EFI_SIMPLE_TEXT_OUTPUT_MODE *) NULL\r
+    (EFI_SIMPLE_TEXT_OUTPUT_MODE *)NULL\r
   },\r
   {\r
     1,\r
@@ -171,25 +169,25 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mConOut = {
     NULL,\r
     NULL\r
   },\r
-  (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) NULL,\r
+  (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *)NULL,\r
   0,\r
   0,\r
 \r
   0,\r
-  (TEXT_OUT_AND_GOP_DATA *) NULL,\r
+  (TEXT_OUT_AND_GOP_DATA *)NULL,\r
   0,\r
-  (TEXT_OUT_SPLITTER_QUERY_DATA *) NULL,\r
+  (TEXT_OUT_SPLITTER_QUERY_DATA *)NULL,\r
   0,\r
-  (INT32 *) NULL,\r
+  (INT32 *)NULL,\r
   FALSE\r
 };\r
 \r
 //\r
 // Standard Error Text Out Splitter Data Template\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA  mStdErr = {\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE,\r
-  (EFI_HANDLE) NULL,\r
+  (EFI_HANDLE)NULL,\r
   {\r
     ConSplitterTextOutReset,\r
     ConSplitterTextOutOutputString,\r
@@ -200,7 +198,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
     ConSplitterTextOutClearScreen,\r
     ConSplitterTextOutSetCursorPosition,\r
     ConSplitterTextOutEnableCursor,\r
-    (EFI_SIMPLE_TEXT_OUTPUT_MODE *) NULL\r
+    (EFI_SIMPLE_TEXT_OUTPUT_MODE *)NULL\r
   },\r
   {\r
     1,\r
@@ -227,23 +225,23 @@ GLOBAL_REMOVE_IF_UNREFERENCED TEXT_OUT_SPLITTER_PRIVATE_DATA mStdErr = {
     NULL,\r
     NULL\r
   },\r
-  (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *) NULL,\r
+  (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *)NULL,\r
   0,\r
   0,\r
 \r
   0,\r
-  (TEXT_OUT_AND_GOP_DATA *) NULL,\r
+  (TEXT_OUT_AND_GOP_DATA *)NULL,\r
   0,\r
-  (TEXT_OUT_SPLITTER_QUERY_DATA *) NULL,\r
+  (TEXT_OUT_SPLITTER_QUERY_DATA *)NULL,\r
   0,\r
-  (INT32 *) NULL,\r
+  (INT32 *)NULL,\r
   FALSE\r
 };\r
 \r
 //\r
 // Driver binding instance for Console Input Device\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConInDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gConSplitterConInDriverBinding = {\r
   ConSplitterConInDriverBindingSupported,\r
   ConSplitterConInDriverBindingStart,\r
   ConSplitterConInDriverBindingStop,\r
@@ -255,7 +253,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConInDriverBinding = {
 //\r
 // Driver binding instance for Console Out device\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConOutDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gConSplitterConOutDriverBinding = {\r
   ConSplitterConOutDriverBindingSupported,\r
   ConSplitterConOutDriverBindingStart,\r
   ConSplitterConOutDriverBindingStop,\r
@@ -267,7 +265,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterConOutDriverBinding = {
 //\r
 // Driver binding instance for Standard Error device\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL           gConSplitterStdErrDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gConSplitterStdErrDriverBinding = {\r
   ConSplitterStdErrDriverBindingSupported,\r
   ConSplitterStdErrDriverBindingStart,\r
   ConSplitterStdErrDriverBindingStop,\r
@@ -279,7 +277,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterStdErrDriverBinding = {
 //\r
 // Driver binding instance for Simple Pointer protocol\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL           gConSplitterSimplePointerDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gConSplitterSimplePointerDriverBinding = {\r
   ConSplitterSimplePointerDriverBindingSupported,\r
   ConSplitterSimplePointerDriverBindingStart,\r
   ConSplitterSimplePointerDriverBindingStop,\r
@@ -291,7 +289,7 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterSimplePointerDriverBinding = {
 //\r
 // Driver binding instance for Absolute Pointer protocol\r
 //\r
-EFI_DRIVER_BINDING_PROTOCOL           gConSplitterAbsolutePointerDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  gConSplitterAbsolutePointerDriverBinding = {\r
   ConSplitterAbsolutePointerDriverBindingSupported,\r
   ConSplitterAbsolutePointerDriverBindingStart,\r
   ConSplitterAbsolutePointerDriverBindingStop,\r
@@ -313,13 +311,14 @@ EFI_DRIVER_BINDING_PROTOCOL           gConSplitterAbsolutePointerDriverBinding =
 EFI_STATUS\r
 EFIAPI\r
 ToggleStateSyncKeyNotify (\r
-  IN EFI_KEY_DATA   *KeyData\r
+  IN EFI_KEY_DATA  *KeyData\r
   )\r
 {\r
-  UINTN     Index;\r
+  UINTN  Index;\r
 \r
   if (((KeyData->KeyState.KeyToggleState & KEY_STATE_VALID_EXPOSED) == KEY_STATE_VALID_EXPOSED) &&\r
-      (KeyData->KeyState.KeyToggleState != mConIn.PhysicalKeyToggleState)) {\r
+      (KeyData->KeyState.KeyToggleState != mConIn.PhysicalKeyToggleState))\r
+  {\r
     //\r
     // There is toggle state change, sync to other console input devices.\r
     //\r
@@ -329,8 +328,9 @@ ToggleStateSyncKeyNotify (
                                     &KeyData->KeyState.KeyToggleState\r
                                     );\r
     }\r
+\r
     mConIn.PhysicalKeyToggleState = KeyData->KeyState.KeyToggleState;\r
-    DEBUG ((EFI_D_INFO, "Current toggle state is 0x%02x\n", mConIn.PhysicalKeyToggleState));\r
+    DEBUG ((DEBUG_INFO, "Current toggle state is 0x%02x\n", mConIn.PhysicalKeyToggleState));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -347,8 +347,8 @@ ToggleStateSyncInitialization (
   IN TEXT_IN_SPLITTER_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  EFI_KEY_DATA      KeyData;\r
-  VOID              *NotifyHandle;\r
+  EFI_KEY_DATA  KeyData;\r
+  VOID          *NotifyHandle;\r
 \r
   //\r
   // Initialize PhysicalKeyToggleState that will be synced to new console\r
@@ -368,9 +368,9 @@ ToggleStateSyncInitialization (
   //\r
   // Register key notify for toggle state sync.\r
   //\r
-  KeyData.Key.ScanCode = SCAN_NULL;\r
-  KeyData.Key.UnicodeChar = CHAR_NULL;\r
-  KeyData.KeyState.KeyShiftState = 0;\r
+  KeyData.Key.ScanCode            = SCAN_NULL;\r
+  KeyData.Key.UnicodeChar         = CHAR_NULL;\r
+  KeyData.KeyState.KeyShiftState  = 0;\r
   KeyData.KeyState.KeyToggleState = 0;\r
   Private->TextInEx.RegisterKeyNotify (\r
                       &Private->TextInEx,\r
@@ -391,7 +391,7 @@ ToggleStateSyncReInitialization (
   IN TEXT_IN_SPLITTER_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINTN             Index;\r
+  UINTN  Index;\r
 \r
   //\r
   // Reinitialize PhysicalKeyToggleState that will be synced to new console\r
@@ -433,12 +433,12 @@ ToggleStateSyncReInitialization (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ConSplitterDriverEntry(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+ConSplitterDriverEntry (\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
@@ -496,8 +496,10 @@ ConSplitterDriverEntry(
   //\r
   // Either Graphics Output protocol or UGA Draw protocol must be supported.\r
   //\r
-  ASSERT (FeaturePcdGet (PcdConOutGopSupport) ||\r
-          FeaturePcdGet (PcdConOutUgaSupport));\r
+  ASSERT (\r
+    FeaturePcdGet (PcdConOutGopSupport) ||\r
+    FeaturePcdGet (PcdConOutUgaSupport)\r
+    );\r
 \r
   //\r
   // The driver creates virtual handles for ConIn, ConOut, StdErr.\r
@@ -526,10 +528,11 @@ ConSplitterDriverEntry(
       // Update the EFI System Table with new virtual console\r
       // and update the pointer to Simple Text Input protocol.\r
       //\r
-      gST->ConsoleInHandle  = mConIn.VirtualHandle;\r
-      gST->ConIn            = &mConIn.TextIn;\r
+      gST->ConsoleInHandle = mConIn.VirtualHandle;\r
+      gST->ConIn           = &mConIn.TextIn;\r
     }\r
   }\r
+\r
   //\r
   // Create virtual device handle for ConOut Splitter\r
   //\r
@@ -549,7 +552,6 @@ ConSplitterDriverEntry(
       gST->ConsoleOutHandle = mConOut.VirtualHandle;\r
       gST->ConOut           = &mConOut.TextOut;\r
     }\r
-\r
   }\r
 \r
   //\r
@@ -568,8 +570,8 @@ ConSplitterDriverEntry(
       // Update the EFI System Table with new virtual console\r
       // and update the pointer to Text Output protocol.\r
       //\r
-      gST->StandardErrorHandle  = mStdErr.VirtualHandle;\r
-      gST->StdErr               = &mStdErr.TextOut;\r
+      gST->StandardErrorHandle = mStdErr.VirtualHandle;\r
+      gST->StdErr              = &mStdErr.TextOut;\r
     }\r
   }\r
 \r
@@ -578,13 +580,12 @@ ConSplitterDriverEntry(
   //\r
   gST->Hdr.CRC32 = 0;\r
   gBS->CalculateCrc32 (\r
-        (UINT8 *) &gST->Hdr,\r
-        gST->Hdr.HeaderSize,\r
-        &gST->Hdr.CRC32\r
-        );\r
+         (UINT8 *)&gST->Hdr,\r
+         gST->Hdr.HeaderSize,\r
+         &gST->Hdr.CRC32\r
+         );\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
 /**\r
@@ -600,7 +601,7 @@ ConSplitterDriverEntry(
 **/\r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA       *ConInPrivate\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *ConInPrivate\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -610,10 +611,10 @@ ConSplitterTextInConstructor (
   // Allocate buffer for Simple Text Input device\r
   //\r
   Status = ConSplitterGrowBuffer (\r
-            sizeof (EFI_SIMPLE_TEXT_INPUT_PROTOCOL *),\r
-            &ConInPrivate->TextInListCount,\r
-            (VOID **) &ConInPrivate->TextInList\r
-            );\r
+             sizeof (EFI_SIMPLE_TEXT_INPUT_PROTOCOL *),\r
+             &ConInPrivate->TextInListCount,\r
+             (VOID **)&ConInPrivate->TextInList\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -634,11 +635,11 @@ ConSplitterTextInConstructor (
   // Allocate buffer for KeyQueue\r
   //\r
   TextInExListCount = ConInPrivate->TextInExListCount;\r
-  Status = ConSplitterGrowBuffer (\r
-             sizeof (EFI_KEY_DATA),\r
-             &TextInExListCount,\r
-             (VOID **) &ConInPrivate->KeyQueue\r
-             );\r
+  Status            = ConSplitterGrowBuffer (\r
+                        sizeof (EFI_KEY_DATA),\r
+                        &TextInExListCount,\r
+                        (VOID **)&ConInPrivate->KeyQueue\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -649,11 +650,12 @@ ConSplitterTextInConstructor (
   Status = ConSplitterGrowBuffer (\r
              sizeof (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *),\r
              &ConInPrivate->TextInExListCount,\r
-             (VOID **) &ConInPrivate->TextInExList\r
+             (VOID **)&ConInPrivate->TextInExList\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Create Event to wait for a key Ex\r
   //\r
@@ -675,23 +677,24 @@ ConSplitterTextInConstructor (
   // Allocate buffer for Absolute Pointer device\r
   //\r
   Status = ConSplitterGrowBuffer (\r
-            sizeof (EFI_ABSOLUTE_POINTER_PROTOCOL *),\r
-            &ConInPrivate->AbsolutePointerListCount,\r
-            (VOID **) &ConInPrivate->AbsolutePointerList\r
-            );\r
+             sizeof (EFI_ABSOLUTE_POINTER_PROTOCOL *),\r
+             &ConInPrivate->AbsolutePointerListCount,\r
+             (VOID **)&ConInPrivate->AbsolutePointerList\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Create Event to wait for device input for Absolute pointer device\r
   //\r
   Status = gBS->CreateEvent (\r
-            EVT_NOTIFY_WAIT,\r
-            TPL_NOTIFY,\r
-            ConSplitterAbsolutePointerWaitForInput,\r
-            ConInPrivate,\r
-            &ConInPrivate->AbsolutePointer.WaitForInput\r
-        );\r
+                  EVT_NOTIFY_WAIT,\r
+                  TPL_NOTIFY,\r
+                  ConSplitterAbsolutePointerWaitForInput,\r
+                  ConInPrivate,\r
+                  &ConInPrivate->AbsolutePointer.WaitForInput\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   ConInPrivate->SimplePointer.Mode = &ConInPrivate->SimplePointerMode;\r
@@ -699,13 +702,14 @@ ConSplitterTextInConstructor (
   // Allocate buffer for Simple Pointer device\r
   //\r
   Status = ConSplitterGrowBuffer (\r
-            sizeof (EFI_SIMPLE_POINTER_PROTOCOL *),\r
-            &ConInPrivate->PointerListCount,\r
-            (VOID **) &ConInPrivate->PointerList\r
-            );\r
+             sizeof (EFI_SIMPLE_POINTER_PROTOCOL *),\r
+             &ConInPrivate->PointerListCount,\r
+             (VOID **)&ConInPrivate->PointerList\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Create Event to wait for device input for Simple pointer device\r
   //\r
@@ -744,10 +748,10 @@ ConSplitterTextInConstructor (
 **/\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
-  TEXT_OUT_SPLITTER_PRIVATE_DATA      *ConOutPrivate\r
+  TEXT_OUT_SPLITTER_PRIVATE_DATA  *ConOutPrivate\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
+  EFI_STATUS                            Status;\r
   EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
 \r
   //\r
@@ -756,6 +760,7 @@ ConSplitterTextOutConstructor (
   if (FeaturePcdGet (PcdConOutUgaSupport)) {\r
     CopyMem (&ConOutPrivate->UgaDraw, &mUgaDrawProtocolTemplate, sizeof (EFI_UGA_DRAW_PROTOCOL));\r
   }\r
+\r
   if (FeaturePcdGet (PcdConOutGopSupport)) {\r
     CopyMem (&ConOutPrivate->GraphicsOutput, &mGraphicsOutputProtocolTemplate, sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL));\r
   }\r
@@ -774,21 +779,22 @@ ConSplitterTextOutConstructor (
   // Allocate buffer for Console Out device\r
   //\r
   Status = ConSplitterGrowBuffer (\r
-            sizeof (TEXT_OUT_AND_GOP_DATA),\r
-            &ConOutPrivate->TextOutListCount,\r
-            (VOID **) &ConOutPrivate->TextOutList\r
-            );\r
+             sizeof (TEXT_OUT_AND_GOP_DATA),\r
+             &ConOutPrivate->TextOutListCount,\r
+             (VOID **)&ConOutPrivate->TextOutList\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // Allocate buffer for Text Out query data\r
   //\r
   Status = ConSplitterGrowBuffer (\r
-            sizeof (TEXT_OUT_SPLITTER_QUERY_DATA),\r
-            &ConOutPrivate->TextOutQueryDataCount,\r
-            (VOID **) &ConOutPrivate->TextOutQueryData\r
-            );\r
+             sizeof (TEXT_OUT_SPLITTER_QUERY_DATA),\r
+             &ConOutPrivate->TextOutQueryDataCount,\r
+             (VOID **)&ConOutPrivate->TextOutQueryData\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -796,17 +802,17 @@ ConSplitterTextOutConstructor (
   //\r
   // Setup the default console to 80 x 25 and mode to 0\r
   //\r
-  ConOutPrivate->TextOutQueryData[0].Columns  = 80;\r
-  ConOutPrivate->TextOutQueryData[0].Rows     = 25;\r
+  ConOutPrivate->TextOutQueryData[0].Columns = 80;\r
+  ConOutPrivate->TextOutQueryData[0].Rows    = 25;\r
   TextOutSetMode (ConOutPrivate, 0);\r
 \r
-\r
   if (FeaturePcdGet (PcdConOutUgaSupport)) {\r
     //\r
     // Setup the UgaDraw to 800 x 600 x 32 bits per pixel, 60Hz.\r
     //\r
     ConSplitterUgaDrawSetMode (&ConOutPrivate->UgaDraw, 800, 600, 32, 60);\r
   }\r
+\r
   if (FeaturePcdGet (PcdConOutGopSupport)) {\r
     //\r
     // Setup resource for mode information in Graphics Output Protocol interface\r
@@ -814,9 +820,11 @@ ConSplitterTextOutConstructor (
     if ((ConOutPrivate->GraphicsOutput.Mode = AllocateZeroPool (sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE))) == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     if ((ConOutPrivate->GraphicsOutput.Mode->Info = AllocateZeroPool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     //\r
     // Setup the DevNullGraphicsOutput to 800 x 600 x 32 bits per pixel\r
     // DevNull will be updated to user-defined mode after driver has started.\r
@@ -824,12 +832,13 @@ ConSplitterTextOutConstructor (
     if ((ConOutPrivate->GraphicsOutputModeBuffer = AllocateZeroPool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION))) == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    Info = &ConOutPrivate->GraphicsOutputModeBuffer[0];\r
-    Info->Version = 0;\r
+\r
+    Info                       = &ConOutPrivate->GraphicsOutputModeBuffer[0];\r
+    Info->Version              = 0;\r
     Info->HorizontalResolution = 800;\r
-    Info->VerticalResolution = 600;\r
-    Info->PixelFormat = PixelBltOnly;\r
-    Info->PixelsPerScanLine = 800;\r
+    Info->VerticalResolution   = 600;\r
+    Info->PixelFormat          = PixelBltOnly;\r
+    Info->PixelsPerScanLine    = 800;\r
     CopyMem (ConOutPrivate->GraphicsOutput.Mode->Info, Info, sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
     ConOutPrivate->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
@@ -837,7 +846,7 @@ ConSplitterTextOutConstructor (
     // Initialize the following items, theset items remain unchanged in GraphicsOutput->SetMode()\r
     // GraphicsOutputMode->FrameBufferBase, GraphicsOutputMode->FrameBufferSize\r
     //\r
-    ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
+    ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS)(UINTN)NULL;\r
     ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize = 0;\r
 \r
     ConOutPrivate->GraphicsOutput.Mode->MaxMode = 1;\r
@@ -851,7 +860,6 @@ ConSplitterTextOutConstructor (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Test to see if the specified protocol could be supported on the specified device.\r
 \r
@@ -866,9 +874,9 @@ ConSplitterTextOutConstructor (
 **/\r
 EFI_STATUS\r
 ConSplitterSupported (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      ControllerHandle,\r
-  IN  EFI_GUID                        *Guid\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_GUID                     *Guid\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -877,10 +885,11 @@ ConSplitterSupported (
   //\r
   // Make sure the Console Splitter does not attempt to attach to itself\r
   //\r
-  if (ControllerHandle == mConIn.VirtualHandle  ||\r
-      ControllerHandle == mConOut.VirtualHandle ||\r
-      ControllerHandle == mStdErr.VirtualHandle\r
-      ) {\r
+  if ((ControllerHandle == mConIn.VirtualHandle) ||\r
+      (ControllerHandle == mConOut.VirtualHandle) ||\r
+      (ControllerHandle == mStdErr.VirtualHandle)\r
+      )\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -901,11 +910,11 @@ ConSplitterSupported (
   }\r
 \r
   gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        Guid,\r
-        This->DriverBindingHandle,\r
-        ControllerHandle\r
-        );\r
+         ControllerHandle,\r
+         Guid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -925,16 +934,16 @@ ConSplitterSupported (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\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
   return ConSplitterSupported (\r
-          This,\r
-          ControllerHandle,\r
-          &gEfiConsoleInDeviceGuid\r
-          );\r
+           This,\r
+           ControllerHandle,\r
+           &gEfiConsoleInDeviceGuid\r
+           );\r
 }\r
 \r
 /**\r
@@ -952,16 +961,16 @@ ConSplitterConInDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\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
   return ConSplitterSupported (\r
-          This,\r
-          ControllerHandle,\r
-          &gEfiSimplePointerProtocolGuid\r
-          );\r
+           This,\r
+           ControllerHandle,\r
+           &gEfiSimplePointerProtocolGuid\r
+           );\r
 }\r
 \r
 /**\r
@@ -979,19 +988,18 @@ ConSplitterSimplePointerDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterAbsolutePointerDriverBindingSupported (\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
   return ConSplitterSupported (\r
-          This,\r
-          ControllerHandle,\r
-          &gEfiAbsolutePointerProtocolGuid\r
-          );\r
+           This,\r
+           ControllerHandle,\r
+           &gEfiAbsolutePointerProtocolGuid\r
+           );\r
 }\r
 \r
-\r
 /**\r
   Test to see if Console Out Device could be supported on the Controller.\r
 \r
@@ -1007,16 +1015,16 @@ ConSplitterAbsolutePointerDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\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
   return ConSplitterSupported (\r
-          This,\r
-          ControllerHandle,\r
-          &gEfiConsoleOutDeviceGuid\r
-          );\r
+           This,\r
+           ControllerHandle,\r
+           &gEfiConsoleOutDeviceGuid\r
+           );\r
 }\r
 \r
 /**\r
@@ -1034,19 +1042,18 @@ ConSplitterConOutDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\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
   return ConSplitterSupported (\r
-          This,\r
-          ControllerHandle,\r
-          &gEfiStandardErrorDeviceGuid\r
-          );\r
+           This,\r
+           ControllerHandle,\r
+           &gEfiStandardErrorDeviceGuid\r
+           );\r
 }\r
 \r
-\r
 /**\r
   Start ConSplitter on devcie handle by opening Console Device Guid on device handle\r
   and the console virtual handle. And Get the console interface on controller handle.\r
@@ -1066,12 +1073,12 @@ ConSplitterStdErrDriverBindingSupported (
 **/\r
 EFI_STATUS\r
 ConSplitterStart (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      ControllerHandle,\r
-  IN  EFI_HANDLE                      ConSplitterVirtualHandle,\r
-  IN  EFI_GUID                        *DeviceGuid,\r
-  IN  EFI_GUID                        *InterfaceGuid,\r
-  OUT VOID                            **Interface\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ConSplitterVirtualHandle,\r
+  IN  EFI_GUID                     *DeviceGuid,\r
+  IN  EFI_GUID                     *InterfaceGuid,\r
+  OUT VOID                         **Interface\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1111,13 +1118,13 @@ ConSplitterStart (
   // Open InterfaceGuid on the virtual handle.\r
   //\r
   Status =  gBS->OpenProtocol (\r
-                ControllerHandle,\r
-                InterfaceGuid,\r
-                Interface,\r
-                This->DriverBindingHandle,\r
-                ConSplitterVirtualHandle,\r
-                EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
-                );\r
+                   ControllerHandle,\r
+                   InterfaceGuid,\r
+                   Interface,\r
+                   This->DriverBindingHandle,\r
+                   ConSplitterVirtualHandle,\r
+                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
     return EFI_SUCCESS;\r
@@ -1127,27 +1134,26 @@ ConSplitterStart (
   // close the DeviceGuid on ConSplitter VirtualHandle.\r
   //\r
   gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        DeviceGuid,\r
-        This->DriverBindingHandle,\r
-        ConSplitterVirtualHandle\r
-        );\r
+         ControllerHandle,\r
+         DeviceGuid,\r
+         This->DriverBindingHandle,\r
+         ConSplitterVirtualHandle\r
+         );\r
 \r
 Err:\r
   //\r
   // close the DeviceGuid on ControllerHandle.\r
   //\r
   gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        DeviceGuid,\r
-        This->DriverBindingHandle,\r
-        ControllerHandle\r
-        );\r
+         ControllerHandle,\r
+         DeviceGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start Console In Consplitter on device handle.\r
 \r
@@ -1163,27 +1169,27 @@ Err:
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\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
-  EFI_SIMPLE_TEXT_INPUT_PROTOCOL      *TextIn;\r
-  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL   *TextInEx;\r
+  EFI_STATUS                         Status;\r
+  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *TextIn;\r
+  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *TextInEx;\r
 \r
   //\r
   // Start ConSplitter on ControllerHandle, and create the virtual\r
   // aggregated console device on first call Start for a SimpleTextIn handle.\r
   //\r
   Status = ConSplitterStart (\r
-            This,\r
-            ControllerHandle,\r
-            mConIn.VirtualHandle,\r
-            &gEfiConsoleInDeviceGuid,\r
-            &gEfiSimpleTextInProtocolGuid,\r
-            (VOID **) &TextIn\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mConIn.VirtualHandle,\r
+             &gEfiConsoleInDeviceGuid,\r
+             &gEfiSimpleTextInProtocolGuid,\r
+             (VOID **)&TextIn\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1199,7 +1205,7 @@ ConSplitterConInDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleTextInputExProtocolGuid,\r
-                  (VOID **) &TextInEx,\r
+                  (VOID **)&TextInEx,\r
                   This->DriverBindingHandle,\r
                   mConIn.VirtualHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1215,7 +1221,6 @@ ConSplitterConInDriverBindingStart (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start Simple Pointer Consplitter on device handle.\r
 \r
@@ -1231,26 +1236,26 @@ ConSplitterConInDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\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
-  EFI_SIMPLE_POINTER_PROTOCOL *SimplePointer;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_POINTER_PROTOCOL  *SimplePointer;\r
 \r
   //\r
   // Start ConSplitter on ControllerHandle, and create the virtual\r
   // aggregated console device on first call Start for a SimplePointer handle.\r
   //\r
   Status = ConSplitterStart (\r
-            This,\r
-            ControllerHandle,\r
-            mConIn.VirtualHandle,\r
-            &gEfiSimplePointerProtocolGuid,\r
-            &gEfiSimplePointerProtocolGuid,\r
-            (VOID **) &SimplePointer\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mConIn.VirtualHandle,\r
+             &gEfiSimplePointerProtocolGuid,\r
+             &gEfiSimplePointerProtocolGuid,\r
+             (VOID **)&SimplePointer\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1261,7 +1266,6 @@ ConSplitterSimplePointerDriverBindingStart (
   return ConSplitterSimplePointerAddDevice (&mConIn, SimplePointer);\r
 }\r
 \r
-\r
 /**\r
   Start Absolute Pointer Consplitter on device handle.\r
 \r
@@ -1277,13 +1281,13 @@ ConSplitterSimplePointerDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterAbsolutePointerDriverBindingStart (\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
-  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer;\r
+  EFI_STATUS                     Status;\r
+  EFI_ABSOLUTE_POINTER_PROTOCOL  *AbsolutePointer;\r
 \r
   //\r
   // Start ConSplitter on ControllerHandle, and create the virtual\r
@@ -1295,7 +1299,7 @@ ConSplitterAbsolutePointerDriverBindingStart (
              mConIn.VirtualHandle,\r
              &gEfiAbsolutePointerProtocolGuid,\r
              &gEfiAbsolutePointerProtocolGuid,\r
-             (VOID **) &AbsolutePointer\r
+             (VOID **)&AbsolutePointer\r
              );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1308,7 +1312,6 @@ ConSplitterAbsolutePointerDriverBindingStart (
   return ConSplitterAbsolutePointerAddDevice (&mConIn, AbsolutePointer);\r
 }\r
 \r
-\r
 /**\r
   Start Console Out Consplitter on device handle.\r
 \r
@@ -1324,30 +1327,30 @@ ConSplitterAbsolutePointerDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\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
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL      *TextOut;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL         *GraphicsOutput;\r
-  EFI_UGA_DRAW_PROTOCOL                *UgaDraw;\r
-  UINTN                                SizeOfInfo;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
+  EFI_STATUS                            Status;\r
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL       *TextOut;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL          *GraphicsOutput;\r
+  EFI_UGA_DRAW_PROTOCOL                 *UgaDraw;\r
+  UINTN                                 SizeOfInfo;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
 \r
   //\r
   // Start ConSplitter on ControllerHandle, and create the virtual\r
   // aggregated console device on first call Start for a ConsoleOut handle.\r
   //\r
   Status = ConSplitterStart (\r
-            This,\r
-            ControllerHandle,\r
-            mConOut.VirtualHandle,\r
-            &gEfiConsoleOutDeviceGuid,\r
-            &gEfiSimpleTextOutProtocolGuid,\r
-            (VOID **) &TextOut\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mConOut.VirtualHandle,\r
+             &gEfiConsoleOutDeviceGuid,\r
+             &gEfiSimpleTextOutProtocolGuid,\r
+             (VOID **)&TextOut\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1360,7 +1363,7 @@ ConSplitterConOutDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  (VOID **) &GraphicsOutput,\r
+                  (VOID **)&GraphicsOutput,\r
                   This->DriverBindingHandle,\r
                   mConOut.VirtualHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1373,7 +1376,7 @@ ConSplitterConOutDriverBindingStart (
     gBS->OpenProtocol (\r
            ControllerHandle,\r
            &gEfiUgaDrawProtocolGuid,\r
-           (VOID **) &UgaDraw,\r
+           (VOID **)&UgaDraw,\r
            This->DriverBindingHandle,\r
            mConOut.VirtualHandle,\r
            EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1402,7 +1405,8 @@ ConSplitterConOutDriverBindingStart (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
-      ASSERT ( SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+\r
+      ASSERT (SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
 \r
       mConOut.UgaHorizontalResolution = Info->HorizontalResolution;\r
       mConOut.UgaVerticalResolution   = Info->VerticalResolution;\r
@@ -1410,22 +1414,20 @@ ConSplitterConOutDriverBindingStart (
       mConOut.UgaRefreshRate          = 60;\r
 \r
       FreePool (Info);\r
-\r
     } else if (UgaDraw != NULL) {\r
       Status = UgaDraw->GetMode (\r
-                 UgaDraw,\r
-                 &mConOut.UgaHorizontalResolution,\r
-                 &mConOut.UgaVerticalResolution,\r
-                 &mConOut.UgaColorDepth,\r
-                 &mConOut.UgaRefreshRate\r
-                 );\r
+                          UgaDraw,\r
+                          &mConOut.UgaHorizontalResolution,\r
+                          &mConOut.UgaVerticalResolution,\r
+                          &mConOut.UgaColorDepth,\r
+                          &mConOut.UgaRefreshRate\r
+                          );\r
     }\r
   }\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Start Standard Error Consplitter on device handle.\r
 \r
@@ -1441,9 +1443,9 @@ ConSplitterConOutDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\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
@@ -1454,13 +1456,13 @@ ConSplitterStdErrDriverBindingStart (
   // aggregated console device on first call Start for a StandardError handle.\r
   //\r
   Status = ConSplitterStart (\r
-            This,\r
-            ControllerHandle,\r
-            mStdErr.VirtualHandle,\r
-            &gEfiStandardErrorDeviceGuid,\r
-            &gEfiSimpleTextOutProtocolGuid,\r
-            (VOID **) &TextOut\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mStdErr.VirtualHandle,\r
+             &gEfiStandardErrorDeviceGuid,\r
+             &gEfiSimpleTextOutProtocolGuid,\r
+             (VOID **)&TextOut\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1476,12 +1478,11 @@ ConSplitterStdErrDriverBindingStart (
   // their MaxMode and QueryData should be the intersection of both.\r
   //\r
   Status = ConSplitterTextOutAddDevice (&mStdErr, TextOut, NULL, NULL);\r
-  ConSplitterTextOutSetAttribute (&mStdErr.TextOut, EFI_TEXT_ATTR (EFI_MAGENTA, EFI_BLACK));\r
+  ConSplitterTextOutSetAttribute (&mStdErr.TextOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
 \r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Stop ConSplitter on device handle by closing Console Device Guid on device handle\r
   and the console virtual handle.\r
@@ -1500,12 +1501,12 @@ ConSplitterStdErrDriverBindingStart (
 **/\r
 EFI_STATUS\r
 ConSplitterStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
-  IN  EFI_HANDLE                      ControllerHandle,\r
-  IN  EFI_HANDLE                      ConSplitterVirtualHandle,\r
-  IN  EFI_GUID                        *DeviceGuid,\r
-  IN  EFI_GUID                        *InterfaceGuid,\r
-  IN  VOID                            **Interface\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   ConSplitterVirtualHandle,\r
+  IN  EFI_GUID                     *DeviceGuid,\r
+  IN  EFI_GUID                     *InterfaceGuid,\r
+  IN  VOID                         **Interface\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -1521,27 +1522,27 @@ ConSplitterStop (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // close the protocol referred.\r
   //\r
   gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        DeviceGuid,\r
-        This->DriverBindingHandle,\r
-        ConSplitterVirtualHandle\r
-        );\r
+         ControllerHandle,\r
+         DeviceGuid,\r
+         This->DriverBindingHandle,\r
+         ConSplitterVirtualHandle\r
+         );\r
 \r
   gBS->CloseProtocol (\r
-        ControllerHandle,\r
-        DeviceGuid,\r
-        This->DriverBindingHandle,\r
-        ControllerHandle\r
-        );\r
+         ControllerHandle,\r
+         DeviceGuid,\r
+         This->DriverBindingHandle,\r
+         ControllerHandle\r
+         );\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Stop Console In ConSplitter on ControllerHandle by closing Console In Device GUID.\r
 \r
@@ -1558,15 +1559,15 @@ ConSplitterStop (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\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
-  EFI_SIMPLE_TEXT_INPUT_PROTOCOL    *TextIn;\r
-  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInEx;\r
+  EFI_STATUS                         Status;\r
+  EFI_SIMPLE_TEXT_INPUT_PROTOCOL     *TextIn;\r
+  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *TextInEx;\r
 \r
   if (NumberOfChildren == 0) {\r
     return EFI_SUCCESS;\r
@@ -1575,7 +1576,7 @@ ConSplitterConInDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleTextInputExProtocolGuid,\r
-                  (VOID **) &TextInEx,\r
+                  (VOID **)&TextInEx,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -1595,13 +1596,13 @@ ConSplitterConInDriverBindingStop (
   // Close Simple Text In protocol on controller handle and virtual handle.\r
   //\r
   Status = ConSplitterStop (\r
-            This,\r
-            ControllerHandle,\r
-            mConIn.VirtualHandle,\r
-            &gEfiConsoleInDeviceGuid,\r
-            &gEfiSimpleTextInProtocolGuid,\r
-            (VOID **) &TextIn\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mConIn.VirtualHandle,\r
+             &gEfiConsoleInDeviceGuid,\r
+             &gEfiSimpleTextInProtocolGuid,\r
+             (VOID **)&TextIn\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1612,7 +1613,6 @@ ConSplitterConInDriverBindingStop (
   return ConSplitterTextInDeleteDevice (&mConIn, TextIn);\r
 }\r
 \r
-\r
 /**\r
   Stop Simple Pointer protocol ConSplitter on ControllerHandle by closing\r
   Simple Pointer protocol.\r
@@ -1630,14 +1630,14 @@ ConSplitterConInDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\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
-  EFI_SIMPLE_POINTER_PROTOCOL *SimplePointer;\r
+  EFI_STATUS                   Status;\r
+  EFI_SIMPLE_POINTER_PROTOCOL  *SimplePointer;\r
 \r
   if (NumberOfChildren == 0) {\r
     return EFI_SUCCESS;\r
@@ -1647,13 +1647,13 @@ ConSplitterSimplePointerDriverBindingStop (
   // Close Simple Pointer protocol on controller handle and virtual handle.\r
   //\r
   Status = ConSplitterStop (\r
-            This,\r
-            ControllerHandle,\r
-            mConIn.VirtualHandle,\r
-            &gEfiSimplePointerProtocolGuid,\r
-            &gEfiSimplePointerProtocolGuid,\r
-            (VOID **) &SimplePointer\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mConIn.VirtualHandle,\r
+             &gEfiSimplePointerProtocolGuid,\r
+             &gEfiSimplePointerProtocolGuid,\r
+             (VOID **)&SimplePointer\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1664,7 +1664,6 @@ ConSplitterSimplePointerDriverBindingStop (
   return ConSplitterSimplePointerDeleteDevice (&mConIn, SimplePointer);\r
 }\r
 \r
-\r
 /**\r
   Stop Absolute Pointer protocol ConSplitter on ControllerHandle by closing\r
   Absolute Pointer protocol.\r
@@ -1682,14 +1681,14 @@ ConSplitterSimplePointerDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterAbsolutePointerDriverBindingStop (\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
-  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer;\r
+  EFI_STATUS                     Status;\r
+  EFI_ABSOLUTE_POINTER_PROTOCOL  *AbsolutePointer;\r
 \r
   if (NumberOfChildren == 0) {\r
     return EFI_SUCCESS;\r
@@ -1704,7 +1703,7 @@ ConSplitterAbsolutePointerDriverBindingStop (
              mConIn.VirtualHandle,\r
              &gEfiAbsolutePointerProtocolGuid,\r
              &gEfiAbsolutePointerProtocolGuid,\r
-             (VOID **) &AbsolutePointer\r
+             (VOID **)&AbsolutePointer\r
              );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -1716,7 +1715,6 @@ ConSplitterAbsolutePointerDriverBindingStop (
   return ConSplitterAbsolutePointerDeleteDevice (&mConIn, AbsolutePointer);\r
 }\r
 \r
-\r
 /**\r
   Stop Console Out ConSplitter on device handle by closing Console Out Devcie GUID.\r
 \r
@@ -1733,10 +1731,10 @@ ConSplitterAbsolutePointerDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\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
@@ -1750,13 +1748,13 @@ ConSplitterConOutDriverBindingStop (
   // Close Absolute Pointer protocol on controller handle and virtual handle.\r
   //\r
   Status = ConSplitterStop (\r
-            This,\r
-            ControllerHandle,\r
-            mConOut.VirtualHandle,\r
-            &gEfiConsoleOutDeviceGuid,\r
-            &gEfiSimpleTextOutProtocolGuid,\r
-            (VOID **) &TextOut\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mConOut.VirtualHandle,\r
+             &gEfiConsoleOutDeviceGuid,\r
+             &gEfiSimpleTextOutProtocolGuid,\r
+             (VOID **)&TextOut\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1767,7 +1765,6 @@ ConSplitterConOutDriverBindingStop (
   return ConSplitterTextOutDeleteDevice (&mConOut, TextOut);\r
 }\r
 \r
-\r
 /**\r
   Stop Standard Error ConSplitter on ControllerHandle by closing Standard Error GUID.\r
 \r
@@ -1784,10 +1781,10 @@ ConSplitterConOutDriverBindingStop (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\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
@@ -1801,23 +1798,23 @@ ConSplitterStdErrDriverBindingStop (
   // Close Standard Error Device on controller handle and virtual handle.\r
   //\r
   Status = ConSplitterStop (\r
-            This,\r
-            ControllerHandle,\r
-            mStdErr.VirtualHandle,\r
-            &gEfiStandardErrorDeviceGuid,\r
-            &gEfiSimpleTextOutProtocolGuid,\r
-            (VOID **) &TextOut\r
-            );\r
+             This,\r
+             ControllerHandle,\r
+             mStdErr.VirtualHandle,\r
+             &gEfiStandardErrorDeviceGuid,\r
+             &gEfiSimpleTextOutProtocolGuid,\r
+             (VOID **)&TextOut\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   //\r
   // Delete this console error out device's data structures.\r
   //\r
   return ConSplitterTextOutDeleteDevice (&mStdErr, TextOut);\r
 }\r
 \r
-\r
 /**\r
   Take the passed in Buffer of size ElementSize and grow the buffer\r
   by CONSOLE_SPLITTER_ALLOC_UNIT * ElementSize bytes.\r
@@ -1835,9 +1832,9 @@ ConSplitterStdErrDriverBindingStop (
 **/\r
 EFI_STATUS\r
 ConSplitterGrowBuffer (\r
-  IN      UINTN                       ElementSize,\r
-  IN OUT  UINTN                       *Count,\r
-  IN OUT  VOID                        **Buffer\r
+  IN      UINTN  ElementSize,\r
+  IN OUT  UINTN  *Count,\r
+  IN OUT  VOID   **Buffer\r
   )\r
 {\r
   VOID  *Ptr;\r
@@ -1855,12 +1852,12 @@ ConSplitterGrowBuffer (
   if (Ptr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   *Count += CONSOLE_SPLITTER_ALLOC_UNIT;\r
   *Buffer = Ptr;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Add Text Input Device in Consplitter Text Input list.\r
 \r
@@ -1884,14 +1881,15 @@ ConSplitterTextInAddDevice (
   //\r
   if (Private->CurrentNumberOfConsoles >= Private->TextInListCount) {\r
     Status = ConSplitterGrowBuffer (\r
-              sizeof (EFI_SIMPLE_TEXT_INPUT_PROTOCOL *),\r
-              &Private->TextInListCount,\r
-              (VOID **) &Private->TextInList\r
-              );\r
+               sizeof (EFI_SIMPLE_TEXT_INPUT_PROTOCOL *),\r
+               &Private->TextInListCount,\r
+               (VOID **)&Private->TextInList\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
   }\r
+\r
   //\r
   // Add the new text-in device data structure into the Text In List.\r
   //\r
@@ -1906,7 +1904,6 @@ ConSplitterTextInAddDevice (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Remove Text Input Device from Consplitter Text Input list.\r
 \r
@@ -1923,14 +1920,15 @@ ConSplitterTextInDeleteDevice (
   IN  EFI_SIMPLE_TEXT_INPUT_PROTOCOL  *TextIn\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
+\r
   //\r
   // Remove the specified text-in device data structure from the Text In List,\r
   // and rearrange the remaining data structures in the Text In List.\r
   //\r
   for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) {\r
     if (Private->TextInList[Index] == TextIn) {\r
-      for (; Index < Private->CurrentNumberOfConsoles - 1; Index++) {\r
+      for ( ; Index < Private->CurrentNumberOfConsoles - 1; Index++) {\r
         Private->TextInList[Index] = Private->TextInList[Index + 1];\r
       }\r
 \r
@@ -1954,8 +1952,8 @@ ConSplitterTextInDeleteDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterTextInExAddDevice (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA         *Private,\r
-  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL     *TextInEx\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA      *Private,\r
+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *TextInEx\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -1974,7 +1972,7 @@ ConSplitterTextInExAddDevice (
       Status = ConSplitterGrowBuffer (\r
                  sizeof (EFI_HANDLE),\r
                  &TextInExListCount,\r
-                 (VOID **) &CurrentNotify->NotifyHandleList\r
+                 (VOID **)&CurrentNotify->NotifyHandleList\r
                  );\r
       if (EFI_ERROR (Status)) {\r
         return EFI_OUT_OF_RESOURCES;\r
@@ -1982,20 +1980,20 @@ ConSplitterTextInExAddDevice (
     }\r
 \r
     TextInExListCount = Private->TextInExListCount;\r
-    Status = ConSplitterGrowBuffer (\r
-               sizeof (EFI_KEY_DATA),\r
-               &TextInExListCount,\r
-               (VOID **) &Private->KeyQueue\r
-               );\r
+    Status            = ConSplitterGrowBuffer (\r
+                          sizeof (EFI_KEY_DATA),\r
+                          &TextInExListCount,\r
+                          (VOID **)&Private->KeyQueue\r
+                          );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
     Status = ConSplitterGrowBuffer (\r
-              sizeof (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *),\r
-              &Private->TextInExListCount,\r
-              (VOID **) &Private->TextInExList\r
-              );\r
+               sizeof (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *),\r
+               &Private->TextInExListCount,\r
+               (VOID **)&Private->TextInExList\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -2006,12 +2004,12 @@ ConSplitterTextInExAddDevice (
   //\r
   for (Link = Private->NotifyList.ForwardLink; Link != &Private->NotifyList; Link = Link->ForwardLink) {\r
     CurrentNotify = TEXT_IN_EX_SPLITTER_NOTIFY_FROM_THIS (Link);\r
-    Status = TextInEx->RegisterKeyNotify (\r
-                         TextInEx,\r
-                         &CurrentNotify->KeyData,\r
-                         CurrentNotify->KeyNotificationFn,\r
-                         &CurrentNotify->NotifyHandleList[Private->CurrentNumberOfExConsoles]\r
-                         );\r
+    Status        = TextInEx->RegisterKeyNotify (\r
+                                TextInEx,\r
+                                &CurrentNotify->KeyData,\r
+                                CurrentNotify->KeyNotificationFn,\r
+                                &CurrentNotify->NotifyHandleList[Private->CurrentNumberOfExConsoles]\r
+                                );\r
     if (EFI_ERROR (Status)) {\r
       for (Link = Link->BackLink; Link != &Private->NotifyList; Link = Link->BackLink) {\r
         CurrentNotify = TEXT_IN_EX_SPLITTER_NOTIFY_FROM_THIS (Link);\r
@@ -2020,6 +2018,7 @@ ConSplitterTextInExAddDevice (
                     CurrentNotify->NotifyHandleList[Private->CurrentNumberOfExConsoles]\r
                     );\r
       }\r
+\r
       return Status;\r
     }\r
   }\r
@@ -2055,18 +2054,19 @@ ConSplitterTextInExAddDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterTextInExDeleteDevice (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA         *Private,\r
-  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL     *TextInEx\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA      *Private,\r
+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *TextInEx\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
+\r
   //\r
   // Remove the specified text-in device data structure from the Text Input Ex List,\r
   // and rearrange the remaining data structures in the Text In List.\r
   //\r
   for (Index = 0; Index < Private->CurrentNumberOfExConsoles; Index++) {\r
     if (Private->TextInExList[Index] == TextInEx) {\r
-      for (; Index < Private->CurrentNumberOfExConsoles - 1; Index++) {\r
+      for ( ; Index < Private->CurrentNumberOfExConsoles - 1; Index++) {\r
         Private->TextInExList[Index] = Private->TextInExList[Index + 1];\r
       }\r
 \r
@@ -2078,7 +2078,6 @@ ConSplitterTextInExDeleteDevice (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Add Simple Pointer Device in Consplitter Simple Pointer list.\r
 \r
@@ -2091,8 +2090,8 @@ ConSplitterTextInExDeleteDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterSimplePointerAddDevice (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
-  IN  EFI_SIMPLE_POINTER_PROTOCOL     *SimplePointer\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  IN  EFI_SIMPLE_POINTER_PROTOCOL    *SimplePointer\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -2102,14 +2101,15 @@ ConSplitterSimplePointerAddDevice (
   //\r
   if (Private->CurrentNumberOfPointers >= Private->PointerListCount) {\r
     Status = ConSplitterGrowBuffer (\r
-              sizeof (EFI_SIMPLE_POINTER_PROTOCOL *),\r
-              &Private->PointerListCount,\r
-              (VOID **) &Private->PointerList\r
-              );\r
+               sizeof (EFI_SIMPLE_POINTER_PROTOCOL *),\r
+               &Private->PointerListCount,\r
+               (VOID **)&Private->PointerList\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
   }\r
+\r
   //\r
   // Add the new text-in device data structure into the Simple Pointer List.\r
   //\r
@@ -2119,7 +2119,6 @@ ConSplitterSimplePointerAddDevice (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Remove Simple Pointer Device from Consplitter Simple Pointer list.\r
 \r
@@ -2132,18 +2131,19 @@ ConSplitterSimplePointerAddDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterSimplePointerDeleteDevice (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
-  IN  EFI_SIMPLE_POINTER_PROTOCOL     *SimplePointer\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  IN  EFI_SIMPLE_POINTER_PROTOCOL    *SimplePointer\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
+\r
   //\r
   // Remove the specified text-in device data structure from the Simple Pointer List,\r
   // and rearrange the remaining data structures in the Text In List.\r
   //\r
   for (Index = 0; Index < Private->CurrentNumberOfPointers; Index++) {\r
     if (Private->PointerList[Index] == SimplePointer) {\r
-      for (; Index < Private->CurrentNumberOfPointers - 1; Index++) {\r
+      for ( ; Index < Private->CurrentNumberOfPointers - 1; Index++) {\r
         Private->PointerList[Index] = Private->PointerList[Index + 1];\r
       }\r
 \r
@@ -2155,7 +2155,6 @@ ConSplitterSimplePointerDeleteDevice (
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
 /**\r
   Add Absolute Pointer Device in Consplitter Absolute Pointer list.\r
 \r
@@ -2168,8 +2167,8 @@ ConSplitterSimplePointerDeleteDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterAbsolutePointerAddDevice (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA     *Private,\r
-  IN  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  IN  EFI_ABSOLUTE_POINTER_PROTOCOL  *AbsolutePointer\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -2179,14 +2178,15 @@ ConSplitterAbsolutePointerAddDevice (
   //\r
   if (Private->CurrentNumberOfAbsolutePointers >= Private->AbsolutePointerListCount) {\r
     Status = ConSplitterGrowBuffer (\r
-              sizeof (EFI_ABSOLUTE_POINTER_PROTOCOL *),\r
-              &Private->AbsolutePointerListCount,\r
-              (VOID **) &Private->AbsolutePointerList\r
-              );\r
+               sizeof (EFI_ABSOLUTE_POINTER_PROTOCOL *),\r
+               &Private->AbsolutePointerListCount,\r
+               (VOID **)&Private->AbsolutePointerList\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
   }\r
+\r
   //\r
   // Add the new text-in device data structure into the Absolute Pointer List.\r
   //\r
@@ -2196,7 +2196,6 @@ ConSplitterAbsolutePointerAddDevice (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Remove Absolute Pointer Device from Consplitter Absolute Pointer list.\r
 \r
@@ -2209,18 +2208,19 @@ ConSplitterAbsolutePointerAddDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterAbsolutePointerDeleteDevice (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA     *Private,\r
-  IN  EFI_ABSOLUTE_POINTER_PROTOCOL     *AbsolutePointer\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  IN  EFI_ABSOLUTE_POINTER_PROTOCOL  *AbsolutePointer\r
   )\r
 {\r
-  UINTN Index;\r
+  UINTN  Index;\r
+\r
   //\r
   // Remove the specified text-in device data structure from the Absolute Pointer List,\r
   // and rearrange the remaining data structures from the Absolute Pointer List.\r
   //\r
   for (Index = 0; Index < Private->CurrentNumberOfAbsolutePointers; Index++) {\r
     if (Private->AbsolutePointerList[Index] == AbsolutePointer) {\r
-      for (; Index < Private->CurrentNumberOfAbsolutePointers - 1; Index++) {\r
+      for ( ; Index < Private->CurrentNumberOfAbsolutePointers - 1; Index++) {\r
         Private->AbsolutePointerList[Index] = Private->AbsolutePointerList[Index + 1];\r
       }\r
 \r
@@ -2248,15 +2248,15 @@ ConSplitterGrowMapTable (
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r
   )\r
 {\r
-  UINTN Size;\r
-  UINTN NewSize;\r
-  UINTN TotalSize;\r
-  INT32 *TextOutModeMap;\r
-  INT32 *OldTextOutModeMap;\r
-  INT32 *SrcAddress;\r
-  INT32 Index;\r
-  UINTN OldStepSize;\r
-  UINTN NewStepSize;\r
+  UINTN  Size;\r
+  UINTN  NewSize;\r
+  UINTN  TotalSize;\r
+  INT32  *TextOutModeMap;\r
+  INT32  *OldTextOutModeMap;\r
+  INT32  *SrcAddress;\r
+  INT32  Index;\r
+  UINTN  OldStepSize;\r
+  UINTN  NewStepSize;\r
 \r
   NewSize           = Private->TextOutListCount * sizeof (INT32);\r
   OldTextOutModeMap = Private->TextOutModeMap;\r
@@ -2265,7 +2265,7 @@ ConSplitterGrowMapTable (
   //\r
   // Allocate new buffer for Text Out List.\r
   //\r
-  TextOutModeMap    = AllocatePool (TotalSize);\r
+  TextOutModeMap = AllocatePool (TotalSize);\r
   if (TextOutModeMap == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -2290,11 +2290,10 @@ ConSplitterGrowMapTable (
   // QueryDataCount\r
   //\r
   if (OldTextOutModeMap != NULL) {\r
-\r
     Size        = Private->CurrentNumberOfConsoles * sizeof (INT32);\r
     Index       = 0;\r
     SrcAddress  = OldTextOutModeMap;\r
-    NewStepSize = NewSize / sizeof(INT32);\r
+    NewStepSize = NewSize / sizeof (INT32);\r
     // If Private->CurrentNumberOfConsoles is not zero and OldTextOutModeMap\r
     // is not NULL, it indicates that the original TextOutModeMap is not enough\r
     // for the new console devices and has been enlarged by CONSOLE_SPLITTER_ALLOC_UNIT columns.\r
@@ -2316,6 +2315,7 @@ ConSplitterGrowMapTable (
       SrcAddress += OldStepSize;\r
       Index++;\r
     }\r
+\r
     //\r
     // Free the old buffer\r
     //\r
@@ -2325,7 +2325,6 @@ ConSplitterGrowMapTable (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Add new device's output mode to console splitter's mode list.\r
 \r
@@ -2338,8 +2337,8 @@ ConSplitterGrowMapTable (
 **/\r
 EFI_STATUS\r
 ConSplitterAddOutputMode (\r
-  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA     *Private,\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut\r
+  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA   *Private,\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *TextOut\r
   )\r
 {\r
   EFI_STATUS  Status;\r
@@ -2347,23 +2346,24 @@ ConSplitterAddOutputMode (
   INT32       Mode;\r
   UINTN       Index;\r
 \r
-  MaxMode                       = TextOut->Mode->MaxMode;\r
-  Private->TextOutMode.MaxMode  = MaxMode;\r
+  MaxMode                      = TextOut->Mode->MaxMode;\r
+  Private->TextOutMode.MaxMode = MaxMode;\r
 \r
   //\r
   // Grow the buffer if query data buffer is not large enough to\r
   // hold all the mode supported by the first console.\r
   //\r
-  while (MaxMode > (INT32) Private->TextOutQueryDataCount) {\r
+  while (MaxMode > (INT32)Private->TextOutQueryDataCount) {\r
     Status = ConSplitterGrowBuffer (\r
-              sizeof (TEXT_OUT_SPLITTER_QUERY_DATA),\r
-              &Private->TextOutQueryDataCount,\r
-              (VOID **) &Private->TextOutQueryData\r
-              );\r
+               sizeof (TEXT_OUT_SPLITTER_QUERY_DATA),\r
+               &Private->TextOutQueryDataCount,\r
+               (VOID **)&Private->TextOutQueryData\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
   }\r
+\r
   //\r
   // Allocate buffer for the output mode map\r
   //\r
@@ -2371,6 +2371,7 @@ ConSplitterAddOutputMode (
   if (EFI_ERROR (Status)) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   //\r
   // As the first textout device, directly add the mode in to QueryData\r
   // and at the same time record the mapping between QueryData and TextOut.\r
@@ -2379,19 +2380,20 @@ ConSplitterAddOutputMode (
   Index = 0;\r
   while (Mode < MaxMode) {\r
     Status = TextOut->QueryMode (\r
-                  TextOut,\r
-                  Mode,\r
-                  &Private->TextOutQueryData[Mode].Columns,\r
-                  &Private->TextOutQueryData[Mode].Rows\r
-                  );\r
+                        TextOut,\r
+                        Mode,\r
+                        &Private->TextOutQueryData[Mode].Columns,\r
+                        &Private->TextOutQueryData[Mode].Rows\r
+                        );\r
     //\r
     // If mode 1 (80x50) is not supported, make sure mode 1 in TextOutQueryData\r
     // is clear to 0x0.\r
     //\r
-    if ((EFI_ERROR(Status)) && (Mode == 1)) {\r
+    if ((EFI_ERROR (Status)) && (Mode == 1)) {\r
       Private->TextOutQueryData[Mode].Columns = 0;\r
-      Private->TextOutQueryData[Mode].Rows = 0;\r
+      Private->TextOutQueryData[Mode].Rows    = 0;\r
     }\r
+\r
     Private->TextOutModeMap[Index] = Mode;\r
     Mode++;\r
     Index += Private->TextOutListCount;\r
@@ -2418,20 +2420,20 @@ ConSplitterAddOutputMode (
 **/\r
 VOID\r
 ConSplitterGetIntersection (\r
-  IN     INT32                        *TextOutModeMap,\r
-  IN     INT32                        *NewlyAddedMap,\r
-  IN     UINTN                        MapStepSize,\r
-  IN     UINTN                        NewMapStepSize,\r
-  IN OUT INT32                        *MaxMode,\r
-  IN OUT INT32                        *CurrentMode\r
+  IN     INT32  *TextOutModeMap,\r
+  IN     INT32  *NewlyAddedMap,\r
+  IN     UINTN  MapStepSize,\r
+  IN     UINTN  NewMapStepSize,\r
+  IN OUT INT32  *MaxMode,\r
+  IN OUT INT32  *CurrentMode\r
   )\r
 {\r
-  INT32 Index;\r
-  INT32 *CurrentMapEntry;\r
-  INT32 *NextMapEntry;\r
-  INT32 *NewMapEntry;\r
-  INT32 CurrentMaxMode;\r
-  INT32 Mode;\r
+  INT32  Index;\r
+  INT32  *CurrentMapEntry;\r
+  INT32  *NextMapEntry;\r
+  INT32  *NewMapEntry;\r
+  INT32  CurrentMaxMode;\r
+  INT32  Mode;\r
 \r
   //\r
   // According to EFI/UEFI spec, mode 0 and mode 1 have been reserved\r
@@ -2443,8 +2445,8 @@ ConSplitterGetIntersection (
   NextMapEntry    = CurrentMapEntry;\r
   NewMapEntry     = &NewlyAddedMap[NewMapStepSize * 2];\r
 \r
-  CurrentMaxMode  = *MaxMode;\r
-  Mode            = *CurrentMode;\r
+  CurrentMaxMode = *MaxMode;\r
+  Mode           = *CurrentMode;\r
 \r
   while (Index < CurrentMaxMode) {\r
     if (*NewMapEntry == -1) {\r
@@ -2457,6 +2459,7 @@ ConSplitterGetIntersection (
       } else if (Index < *CurrentMode) {\r
         Mode--;\r
       }\r
+\r
       (*MaxMode)--;\r
     } else {\r
       if (CurrentMapEntry != NextMapEntry) {\r
@@ -2473,7 +2476,7 @@ ConSplitterGetIntersection (
 \r
   *CurrentMode = Mode;\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -2485,8 +2488,8 @@ ConSplitterGetIntersection (
 **/\r
 VOID\r
 ConSplitterSyncOutputMode (\r
-  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA     *Private,\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut\r
+  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA   *Private,\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *TextOut\r
   )\r
 {\r
   INT32                         CurrentMaxMode;\r
@@ -2504,32 +2507,34 @@ ConSplitterSyncOutputMode (
   //\r
   // Must make sure that current mode won't change even if mode number changes\r
   //\r
-  CurrentMaxMode    = Private->TextOutMode.MaxMode;\r
-  TextOutModeMap    = Private->TextOutModeMap;\r
-  StepSize          = Private->TextOutListCount;\r
-  TextOutQueryData  = Private->TextOutQueryData;\r
+  CurrentMaxMode   = Private->TextOutMode.MaxMode;\r
+  TextOutModeMap   = Private->TextOutModeMap;\r
+  StepSize         = Private->TextOutListCount;\r
+  TextOutQueryData = Private->TextOutQueryData;\r
 \r
   //\r
   // Query all the mode that the newly added TextOut supports\r
   //\r
-  Mode      = 0;\r
-  MapTable  = TextOutModeMap + Private->CurrentNumberOfConsoles;\r
+  Mode     = 0;\r
+  MapTable = TextOutModeMap + Private->CurrentNumberOfConsoles;\r
   while (Mode < TextOut->Mode->MaxMode) {\r
     Status = TextOut->QueryMode (TextOut, Mode, &Columns, &Rows);\r
 \r
-    if (EFI_ERROR(Status)) {\r
+    if (EFI_ERROR (Status)) {\r
       if (Mode == 1) {\r
         //\r
         // If mode 1 (80x50) is not supported, make sure mode 1 in TextOutQueryData\r
         // is clear to 0x0.\r
         //\r
-        MapTable[StepSize] = Mode;\r
+        MapTable[StepSize]             = Mode;\r
         TextOutQueryData[Mode].Columns = 0;\r
-        TextOutQueryData[Mode].Rows = 0;\r
+        TextOutQueryData[Mode].Rows    = 0;\r
       }\r
+\r
       Mode++;\r
       continue;\r
     }\r
+\r
     //\r
     // Search the intersection map and QueryData database to see if they intersects\r
     //\r
@@ -2540,10 +2545,13 @@ ConSplitterSyncOutputMode (
         MapTable[Index * StepSize] = Mode;\r
         break;\r
       }\r
+\r
       Index++;\r
     }\r
+\r
     Mode++;\r
   }\r
+\r
   //\r
   // Now search the TextOutModeMap table to find the intersection of supported\r
   // mode between ConSplitter and the newly added device.\r
@@ -2557,10 +2565,9 @@ ConSplitterSyncOutputMode (
     &Private->TextOutMode.Mode\r
     );\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
-\r
 /**\r
   Sync output device between ConOut and StdErr output.\r
 \r
@@ -2627,32 +2634,33 @@ ConSplitterGetIntersectionBetweenConOutAndStrErr (
   if (!FoundTheSameTextOut) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Must make sure that current mode won't change even if mode number changes\r
   //\r
-  ConOutMaxMode     = mConOut.TextOutMode.MaxMode;\r
-  ConOutModeMap     = mConOut.TextOutModeMap;\r
-  ConOutStepSize    = mConOut.TextOutListCount;\r
-  ConOutQueryData   = mConOut.TextOutQueryData;\r
+  ConOutMaxMode   = mConOut.TextOutMode.MaxMode;\r
+  ConOutModeMap   = mConOut.TextOutModeMap;\r
+  ConOutStepSize  = mConOut.TextOutListCount;\r
+  ConOutQueryData = mConOut.TextOutQueryData;\r
 \r
-  StdErrMaxMode     = mStdErr.TextOutMode.MaxMode;\r
-  StdErrModeMap     = mStdErr.TextOutModeMap;\r
-  StdErrStepSize    = mStdErr.TextOutListCount;\r
-  StdErrQueryData   = mStdErr.TextOutQueryData;\r
+  StdErrMaxMode   = mStdErr.TextOutMode.MaxMode;\r
+  StdErrModeMap   = mStdErr.TextOutModeMap;\r
+  StdErrStepSize  = mStdErr.TextOutListCount;\r
+  StdErrQueryData = mStdErr.TextOutQueryData;\r
 \r
   //\r
   // Allocate the map table and set the map table's index to -1.\r
   //\r
-  ConOutMapTableSize  = ConOutMaxMode * sizeof (INT32);\r
-  ConOutMapTable      = AllocateZeroPool (ConOutMapTableSize);\r
+  ConOutMapTableSize = ConOutMaxMode * sizeof (INT32);\r
+  ConOutMapTable     = AllocateZeroPool (ConOutMapTableSize);\r
   if (ConOutMapTable == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   SetMem (ConOutMapTable, ConOutMapTableSize, 0xFF);\r
 \r
-  StdErrMapTableSize  = StdErrMaxMode * sizeof (INT32);\r
-  StdErrMapTable      = AllocateZeroPool (StdErrMapTableSize);\r
+  StdErrMapTableSize = StdErrMaxMode * sizeof (INT32);\r
+  StdErrMapTable     = AllocateZeroPool (StdErrMapTableSize);\r
   if (StdErrMapTable == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -2668,7 +2676,7 @@ ConSplitterGetIntersectionBetweenConOutAndStrErr (
     //\r
     // Search the intersection map and QueryData database to see if they intersect\r
     //\r
-    Index = 0;\r
+    Index         = 0;\r
     ConOutMode    = *(ConOutModeMap + Mode * ConOutStepSize);\r
     ConOutRows    = ConOutQueryData[ConOutMode].Rows;\r
     ConOutColumns = ConOutQueryData[ConOutMode].Columns;\r
@@ -2687,6 +2695,7 @@ ConSplitterGetIntersectionBetweenConOutAndStrErr (
 \r
     Mode++;\r
   }\r
+\r
   //\r
   // Now search the TextOutModeMap table to find the intersection of supported\r
   // mode between ConSplitter and the newly added device.\r
@@ -2723,7 +2732,6 @@ ConSplitterGetIntersectionBetweenConOutAndStrErr (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Add Graphics Output modes into Consplitter Text Out list.\r
 \r
@@ -2742,22 +2750,22 @@ ConSplitterAddGraphicsOutputMode (
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  UINTN                                Index;\r
-  UINTN                                CurrentIndex;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Mode;\r
-  UINTN                                SizeOfInfo;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE    *CurrentGraphicsOutputMode;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *ModeBuffer;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *MatchedMode;\r
-  UINTN                                NumberIndex;\r
-  BOOLEAN                              Match;\r
-  BOOLEAN                              AlreadyExist;\r
-  UINT32                               UgaHorizontalResolution;\r
-  UINT32                               UgaVerticalResolution;\r
-  UINT32                               UgaColorDepth;\r
-  UINT32                               UgaRefreshRate;\r
+  EFI_STATUS                            Status;\r
+  UINTN                                 Index;\r
+  UINTN                                 CurrentIndex;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Mode;\r
+  UINTN                                 SizeOfInfo;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE     *CurrentGraphicsOutputMode;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *ModeBuffer;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *MatchedMode;\r
+  UINTN                                 NumberIndex;\r
+  BOOLEAN                               Match;\r
+  BOOLEAN                               AlreadyExist;\r
+  UINT32                                UgaHorizontalResolution;\r
+  UINT32                                UgaVerticalResolution;\r
+  UINT32                                UgaColorDepth;\r
+  UINT32                                UgaRefreshRate;\r
 \r
   ASSERT (GraphicsOutput != NULL || UgaDraw != NULL);\r
 \r
@@ -2778,43 +2786,45 @@ ConSplitterAddGraphicsOutputMode (
 \r
   if (GraphicsOutput != NULL) {\r
     if (Private->CurrentNumberOfGraphicsOutput == 0) {\r
-        //\r
-        // This is the first Graphics Output device added\r
-        //\r
-        CurrentGraphicsOutputMode->MaxMode = GraphicsOutput->Mode->MaxMode;\r
-        CurrentGraphicsOutputMode->Mode = GraphicsOutput->Mode->Mode;\r
-        CopyMem (CurrentGraphicsOutputMode->Info, GraphicsOutput->Mode->Info, GraphicsOutput->Mode->SizeOfInfo);\r
-        CurrentGraphicsOutputMode->SizeOfInfo = GraphicsOutput->Mode->SizeOfInfo;\r
-        CurrentGraphicsOutputMode->FrameBufferBase = GraphicsOutput->Mode->FrameBufferBase;\r
-        CurrentGraphicsOutputMode->FrameBufferSize = GraphicsOutput->Mode->FrameBufferSize;\r
+      //\r
+      // This is the first Graphics Output device added\r
+      //\r
+      CurrentGraphicsOutputMode->MaxMode = GraphicsOutput->Mode->MaxMode;\r
+      CurrentGraphicsOutputMode->Mode    = GraphicsOutput->Mode->Mode;\r
+      CopyMem (CurrentGraphicsOutputMode->Info, GraphicsOutput->Mode->Info, GraphicsOutput->Mode->SizeOfInfo);\r
+      CurrentGraphicsOutputMode->SizeOfInfo      = GraphicsOutput->Mode->SizeOfInfo;\r
+      CurrentGraphicsOutputMode->FrameBufferBase = GraphicsOutput->Mode->FrameBufferBase;\r
+      CurrentGraphicsOutputMode->FrameBufferSize = GraphicsOutput->Mode->FrameBufferSize;\r
 \r
-        //\r
-        // Allocate resource for the private mode buffer\r
-        //\r
-        ModeBuffer = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION) * GraphicsOutput->Mode->MaxMode);\r
-        if (ModeBuffer == NULL) {\r
-          return EFI_OUT_OF_RESOURCES;\r
-        }\r
-        FreePool (Private->GraphicsOutputModeBuffer);\r
-        Private->GraphicsOutputModeBuffer = ModeBuffer;\r
+      //\r
+      // Allocate resource for the private mode buffer\r
+      //\r
+      ModeBuffer = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION) * GraphicsOutput->Mode->MaxMode);\r
+      if (ModeBuffer == NULL) {\r
+        return EFI_OUT_OF_RESOURCES;\r
+      }\r
+\r
+      FreePool (Private->GraphicsOutputModeBuffer);\r
+      Private->GraphicsOutputModeBuffer = ModeBuffer;\r
 \r
+      //\r
+      // Store all supported display modes to the private mode buffer\r
+      //\r
+      Mode = ModeBuffer;\r
+      for (Index = 0; Index < GraphicsOutput->Mode->MaxMode; Index++) {\r
         //\r
-        // Store all supported display modes to the private mode buffer\r
+        // The Info buffer would be allocated by callee\r
         //\r
-        Mode = ModeBuffer;\r
-        for (Index = 0; Index < GraphicsOutput->Mode->MaxMode; Index++) {\r
-          //\r
-          // The Info buffer would be allocated by callee\r
-          //\r
-          Status = GraphicsOutput->QueryMode (GraphicsOutput, (UINT32) Index, &SizeOfInfo, &Info);\r
-          if (EFI_ERROR (Status)) {\r
-            return Status;\r
-          }\r
-          ASSERT ( SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
-          CopyMem (Mode, Info, SizeOfInfo);\r
-          Mode++;\r
-          FreePool (Info);\r
+        Status = GraphicsOutput->QueryMode (GraphicsOutput, (UINT32)Index, &SizeOfInfo, &Info);\r
+        if (EFI_ERROR (Status)) {\r
+          return Status;\r
         }\r
+\r
+        ASSERT (SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+        CopyMem (Mode, Info, SizeOfInfo);\r
+        Mode++;\r
+        FreePool (Info);\r
+      }\r
     } else {\r
       //\r
       // Check intersection of display mode\r
@@ -2825,7 +2835,7 @@ ConSplitterAddGraphicsOutputMode (
       }\r
 \r
       MatchedMode = ModeBuffer;\r
-      Mode = &Private->GraphicsOutputModeBuffer[0];\r
+      Mode        = &Private->GraphicsOutputModeBuffer[0];\r
       for (Index = 0; Index < CurrentGraphicsOutputMode->MaxMode; Index++) {\r
         Match = FALSE;\r
 \r
@@ -2833,12 +2843,14 @@ ConSplitterAddGraphicsOutputMode (
           //\r
           // The Info buffer would be allocated by callee\r
           //\r
-          Status = GraphicsOutput->QueryMode (GraphicsOutput, (UINT32) NumberIndex, &SizeOfInfo, &Info);\r
+          Status = GraphicsOutput->QueryMode (GraphicsOutput, (UINT32)NumberIndex, &SizeOfInfo, &Info);\r
           if (EFI_ERROR (Status)) {\r
             return Status;\r
           }\r
+\r
           if ((Info->HorizontalResolution == Mode->HorizontalResolution) &&\r
-              (Info->VerticalResolution == Mode->VerticalResolution)) {\r
+              (Info->VerticalResolution == Mode->VerticalResolution))\r
+          {\r
             //\r
             // If GOP device supports one mode in current mode buffer,\r
             // it will be added into matched mode buffer\r
@@ -2847,6 +2859,7 @@ ConSplitterAddGraphicsOutputMode (
             FreePool (Info);\r
             break;\r
           }\r
+\r
           FreePool (Info);\r
         }\r
 \r
@@ -2858,7 +2871,8 @@ ConSplitterAddGraphicsOutputMode (
           //\r
           for (Info = ModeBuffer; Info < MatchedMode; Info++) {\r
             if ((Info->HorizontalResolution == Mode->HorizontalResolution) &&\r
-                (Info->VerticalResolution == Mode->VerticalResolution)) {\r
+                (Info->VerticalResolution == Mode->VerticalResolution))\r
+            {\r
               AlreadyExist = TRUE;\r
               break;\r
             }\r
@@ -2870,7 +2884,7 @@ ConSplitterAddGraphicsOutputMode (
             //\r
             // Physical frame buffer is no longer available, change PixelFormat to PixelBltOnly\r
             //\r
-            MatchedMode->Version = 0;\r
+            MatchedMode->Version     = 0;\r
             MatchedMode->PixelFormat = PixelBltOnly;\r
             ZeroMem (&MatchedMode->PixelInformation, sizeof (EFI_PIXEL_BITMASK));\r
 \r
@@ -2890,11 +2904,11 @@ ConSplitterAddGraphicsOutputMode (
       //\r
       // Physical frame buffer is no longer available when there are more than one physical GOP devices\r
       //\r
-      CurrentGraphicsOutputMode->MaxMode = (UINT32) (((UINTN) MatchedMode - (UINTN) ModeBuffer) / sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+      CurrentGraphicsOutputMode->MaxMode           = (UINT32)(((UINTN)MatchedMode - (UINTN)ModeBuffer) / sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
       CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;\r
       ZeroMem (&CurrentGraphicsOutputMode->Info->PixelInformation, sizeof (EFI_PIXEL_BITMASK));\r
-      CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
+      CurrentGraphicsOutputMode->SizeOfInfo      = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
+      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS)(UINTN)NULL;\r
       CurrentGraphicsOutputMode->FrameBufferSize = 0;\r
     }\r
 \r
@@ -2904,11 +2918,13 @@ ConSplitterAddGraphicsOutputMode (
     for (Index = 0; Index < CurrentGraphicsOutputMode->MaxMode; Index++) {\r
       Mode = &Private->GraphicsOutputModeBuffer[Index];\r
       if ((Mode->HorizontalResolution == GraphicsOutput->Mode->Info->HorizontalResolution) &&\r
-         (Mode->VerticalResolution == GraphicsOutput->Mode->Info->VerticalResolution)) {\r
+          (Mode->VerticalResolution == GraphicsOutput->Mode->Info->VerticalResolution))\r
+      {\r
         CurrentIndex = Index;\r
         break;\r
       }\r
     }\r
+\r
     if (Index >= CurrentGraphicsOutputMode->MaxMode) {\r
       //\r
       // if user defined mode is not found, set to default mode 800x600\r
@@ -2934,15 +2950,15 @@ ConSplitterAddGraphicsOutputMode (
                &UgaRefreshRate\r
                );\r
 \r
-    CurrentGraphicsOutputMode->MaxMode = 1;\r
-    Info = CurrentGraphicsOutputMode->Info;\r
-    Info->Version = 0;\r
+    CurrentGraphicsOutputMode->MaxMode         = 1;\r
+    Info                                       = CurrentGraphicsOutputMode->Info;\r
+    Info->Version                              = 0;\r
     Info->HorizontalResolution                 = UgaHorizontalResolution;\r
     Info->VerticalResolution                   = UgaVerticalResolution;\r
     Info->PixelFormat                          = PixelBltOnly;\r
     Info->PixelsPerScanLine                    = UgaHorizontalResolution;\r
     CurrentGraphicsOutputMode->SizeOfInfo      = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
+    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS)(UINTN)NULL;\r
     CurrentGraphicsOutputMode->FrameBufferSize = 0;\r
 \r
     //\r
@@ -2961,6 +2977,7 @@ Done:
   if (GraphicsOutput != NULL) {\r
     Private->CurrentNumberOfGraphicsOutput++;\r
   }\r
+\r
   if (UgaDraw != NULL) {\r
     Private->CurrentNumberOfUgaDraw++;\r
   }\r
@@ -2972,26 +2989,31 @@ Done:
   Mode = &Private->GraphicsOutputModeBuffer[CurrentIndex];\r
   if ((GraphicsOutput != NULL) &&\r
       (Mode->HorizontalResolution == CurrentGraphicsOutputMode->Info->HorizontalResolution) &&\r
-      (Mode->VerticalResolution == CurrentGraphicsOutputMode->Info->VerticalResolution)) {\r
-    CurrentGraphicsOutputMode->Mode = (UINT32) CurrentIndex;\r
+      (Mode->VerticalResolution == CurrentGraphicsOutputMode->Info->VerticalResolution))\r
+  {\r
+    CurrentGraphicsOutputMode->Mode = (UINT32)CurrentIndex;\r
     if ((Mode->HorizontalResolution != GraphicsOutput->Mode->Info->HorizontalResolution) ||\r
-        (Mode->VerticalResolution != GraphicsOutput->Mode->Info->VerticalResolution)) {\r
+        (Mode->VerticalResolution != GraphicsOutput->Mode->Info->VerticalResolution))\r
+    {\r
       //\r
       // If all existing video device has been set to common mode, only set new GOP device to\r
       // the common mode\r
       //\r
-      for (NumberIndex = 0; NumberIndex < GraphicsOutput->Mode->MaxMode; NumberIndex ++) {\r
-        Status = GraphicsOutput->QueryMode (GraphicsOutput, (UINT32) NumberIndex, &SizeOfInfo, &Info);\r
+      for (NumberIndex = 0; NumberIndex < GraphicsOutput->Mode->MaxMode; NumberIndex++) {\r
+        Status = GraphicsOutput->QueryMode (GraphicsOutput, (UINT32)NumberIndex, &SizeOfInfo, &Info);\r
         if (EFI_ERROR (Status)) {\r
           return Status;\r
         }\r
+\r
         if ((Info->HorizontalResolution == Mode->HorizontalResolution) && (Info->VerticalResolution == Mode->VerticalResolution)) {\r
           FreePool (Info);\r
           break;\r
         }\r
+\r
         FreePool (Info);\r
       }\r
-      Status = GraphicsOutput->SetMode (GraphicsOutput, (UINT32) NumberIndex);\r
+\r
+      Status = GraphicsOutput->SetMode (GraphicsOutput, (UINT32)NumberIndex);\r
     }\r
   } else {\r
     //\r
@@ -3001,14 +3023,14 @@ Done:
     //\r
     // Graphics console can ensure all GOP devices have the same mode which can be taken as current mode.\r
     //\r
-    Status = Private->GraphicsOutput.SetMode (&Private->GraphicsOutput, (UINT32) CurrentIndex);\r
-    if (EFI_ERROR(Status)) {\r
+    Status = Private->GraphicsOutput.SetMode (&Private->GraphicsOutput, (UINT32)CurrentIndex);\r
+    if (EFI_ERROR (Status)) {\r
       //\r
       // If user defined mode is not valid for display device, set to the default mode 800x600.\r
       //\r
       (Private->GraphicsOutputModeBuffer[0]).HorizontalResolution = 800;\r
       (Private->GraphicsOutputModeBuffer[0]).VerticalResolution   = 600;\r
-      Status = Private->GraphicsOutput.SetMode (&Private->GraphicsOutput, 0);\r
+      Status                                                      = Private->GraphicsOutput.SetMode (&Private->GraphicsOutput, 0);\r
     }\r
   }\r
 \r
@@ -3041,10 +3063,10 @@ ConsplitterSetConsoleOutMode (
   CONSOLE_OUT_MODE                 MaxModeInfo;\r
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *TextOut;\r
 \r
-  PreferMode   = 0xFF;\r
-  BaseMode     = 0xFF;\r
-  TextOut      = &Private->TextOut;\r
-  MaxMode      = (UINTN) (TextOut->Mode->MaxMode);\r
+  PreferMode = 0xFF;\r
+  BaseMode   = 0xFF;\r
+  TextOut    = &Private->TextOut;\r
+  MaxMode    = (UINTN)(TextOut->Mode->MaxMode);\r
 \r
   MaxModeInfo.Column = 0;\r
   MaxModeInfo.Row    = 0;\r
@@ -3056,12 +3078,12 @@ ConsplitterSetConsoleOutMode (
   //\r
   for (Mode = 0; Mode < MaxMode; Mode++) {\r
     Status = TextOut->QueryMode (TextOut, Mode, &Col, &Row);\r
-    if (!EFI_ERROR(Status)) {\r
+    if (!EFI_ERROR (Status)) {\r
       if ((ModeInfo.Column != 0) && (ModeInfo.Row != 0)) {\r
         //\r
         // Use user defined column and row\r
         //\r
-        if (Col == ModeInfo.Column && Row == ModeInfo.Row) {\r
+        if ((Col == ModeInfo.Column) && (Row == ModeInfo.Row)) {\r
           PreferMode = Mode;\r
         }\r
       } else {\r
@@ -3070,12 +3092,13 @@ ConsplitterSetConsoleOutMode (
         // find and set the highest text mode.\r
         //\r
         if ((Col >= MaxModeInfo.Column) && (Row >= MaxModeInfo.Row)) {\r
-          MaxModeInfo.Column  = Col;\r
-          MaxModeInfo.Row     = Row;\r
-          PreferMode          = Mode;\r
+          MaxModeInfo.Column = Col;\r
+          MaxModeInfo.Row    = Row;\r
+          PreferMode         = Mode;\r
         }\r
       }\r
-      if (Col == 80 && Row == 25) {\r
+\r
+      if ((Col == 80) && (Row == 25)) {\r
         BaseMode = Mode;\r
       }\r
     }\r
@@ -3085,23 +3108,22 @@ ConsplitterSetConsoleOutMode (
   // Set prefer mode to Text Out devices.\r
   //\r
   Status = TextOut->SetMode (TextOut, PreferMode);\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     //\r
     // if current mode setting is failed, default 80x25 mode will be set.\r
     //\r
     Status = TextOut->SetMode (TextOut, BaseMode);\r
-    ASSERT(!EFI_ERROR(Status));\r
+    ASSERT (!EFI_ERROR (Status));\r
 \r
     Status = PcdSet32S (PcdConOutColumn, 80);\r
-    ASSERT(!EFI_ERROR(Status));\r
+    ASSERT (!EFI_ERROR (Status));\r
     Status = PcdSet32S (PcdConOutRow, 25);\r
-    ASSERT(!EFI_ERROR(Status));\r
+    ASSERT (!EFI_ERROR (Status));\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
-\r
 /**\r
   Add Text Output Device in Consplitter Text Output list.\r
 \r
@@ -3116,23 +3138,23 @@ ConsplitterSetConsoleOutMode (
 **/\r
 EFI_STATUS\r
 ConSplitterTextOutAddDevice (\r
-  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA     *Private,\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut,\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *GraphicsOutput,\r
-  IN  EFI_UGA_DRAW_PROTOCOL              *UgaDraw\r
+  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA   *Private,\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *TextOut,\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL     *GraphicsOutput,\r
+  IN  EFI_UGA_DRAW_PROTOCOL            *UgaDraw\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  UINTN                                CurrentNumOfConsoles;\r
-  INT32                                MaxMode;\r
-  UINT32                               UgaHorizontalResolution;\r
-  UINT32                               UgaVerticalResolution;\r
-  UINT32                               UgaColorDepth;\r
-  UINT32                               UgaRefreshRate;\r
-  TEXT_OUT_AND_GOP_DATA                *TextAndGop;\r
-  UINTN                                SizeOfInfo;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
-  EFI_STATUS                           DeviceStatus;\r
+  EFI_STATUS                            Status;\r
+  UINTN                                 CurrentNumOfConsoles;\r
+  INT32                                 MaxMode;\r
+  UINT32                                UgaHorizontalResolution;\r
+  UINT32                                UgaVerticalResolution;\r
+  UINT32                                UgaColorDepth;\r
+  UINT32                                UgaRefreshRate;\r
+  TEXT_OUT_AND_GOP_DATA                 *TextAndGop;\r
+  UINTN                                 SizeOfInfo;\r
+  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
+  EFI_STATUS                            DeviceStatus;\r
 \r
   Status                      = EFI_SUCCESS;\r
   CurrentNumOfConsoles        = Private->CurrentNumberOfConsoles;\r
@@ -3143,13 +3165,14 @@ ConSplitterTextOutAddDevice (
   //\r
   while (CurrentNumOfConsoles >= Private->TextOutListCount) {\r
     Status = ConSplitterGrowBuffer (\r
-              sizeof (TEXT_OUT_AND_GOP_DATA),\r
-              &Private->TextOutListCount,\r
-              (VOID **) &Private->TextOutList\r
-              );\r
+               sizeof (TEXT_OUT_AND_GOP_DATA),\r
+               &Private->TextOutListCount,\r
+               (VOID **)&Private->TextOutList\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
+\r
     //\r
     // Also need to reallocate the TextOutModeMap table\r
     //\r
@@ -3159,7 +3182,7 @@ ConSplitterTextOutAddDevice (
     }\r
   }\r
 \r
-  TextAndGop          = &Private->TextOutList[CurrentNumOfConsoles];\r
+  TextAndGop = &Private->TextOutList[CurrentNumOfConsoles];\r
 \r
   TextAndGop->TextOut        = TextOut;\r
   TextAndGop->GraphicsOutput = GraphicsOutput;\r
@@ -3183,7 +3206,7 @@ ConSplitterTextOutAddDevice (
   //\r
   ConSplitterGetIntersectionBetweenConOutAndStrErr ();\r
 \r
-  MaxMode     = Private->TextOutMode.MaxMode;\r
+  MaxMode = Private->TextOutMode.MaxMode;\r
   ASSERT (MaxMode >= 1);\r
 \r
   DeviceStatus = EFI_DEVICE_ERROR;\r
@@ -3205,50 +3228,52 @@ ConSplitterTextOutAddDevice (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
-      ASSERT ( SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+\r
+      ASSERT (SizeOfInfo <= sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
 \r
       UgaHorizontalResolution = Info->HorizontalResolution;\r
       UgaVerticalResolution   = Info->VerticalResolution;\r
 \r
       FreePool (Info);\r
-\r
     } else if (UgaDraw != NULL) {\r
       Status = UgaDraw->GetMode (\r
-                    UgaDraw,\r
-                    &UgaHorizontalResolution,\r
-                    &UgaVerticalResolution,\r
-                    &UgaColorDepth,\r
-                    &UgaRefreshRate\r
-                    );\r
+                          UgaDraw,\r
+                          &UgaHorizontalResolution,\r
+                          &UgaVerticalResolution,\r
+                          &UgaColorDepth,\r
+                          &UgaRefreshRate\r
+                          );\r
       if (!EFI_ERROR (Status) && EFI_ERROR (DeviceStatus)) {\r
         //\r
         // if GetMode is successfully and UGA device hasn't been set, set it\r
         //\r
         Status = ConSplitterUgaDrawSetMode (\r
-                    &Private->UgaDraw,\r
-                    UgaHorizontalResolution,\r
-                    UgaVerticalResolution,\r
-                    UgaColorDepth,\r
-                    UgaRefreshRate\r
-                    );\r
+                   &Private->UgaDraw,\r
+                   UgaHorizontalResolution,\r
+                   UgaVerticalResolution,\r
+                   UgaColorDepth,\r
+                   UgaRefreshRate\r
+                   );\r
       }\r
+\r
       //\r
       // If GetMode/SetMode is failed, set to 800x600 mode\r
       //\r
-      if(EFI_ERROR (Status)) {\r
+      if (EFI_ERROR (Status)) {\r
         Status = ConSplitterUgaDrawSetMode (\r
-                    &Private->UgaDraw,\r
-                    800,\r
-                    600,\r
-                    32,\r
-                    60\r
-                    );\r
+                   &Private->UgaDraw,\r
+                   800,\r
+                   600,\r
+                   32,\r
+                   60\r
+                   );\r
       }\r
     }\r
   }\r
 \r
   if (((!EFI_ERROR (DeviceStatus)) || (!EFI_ERROR (Status))) &&\r
-      ((Private->CurrentNumberOfGraphicsOutput + Private->CurrentNumberOfUgaDraw) == 1)) {\r
+      ((Private->CurrentNumberOfGraphicsOutput + Private->CurrentNumberOfUgaDraw) == 1))\r
+  {\r
     if (!FeaturePcdGet (PcdConOutGopSupport)) {\r
       //\r
       // If Graphics Outpurt protocol not supported, UGA Draw protocol is installed\r
@@ -3298,7 +3323,6 @@ ConSplitterTextOutAddDevice (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Remove Text Out Device in Consplitter Text Out list.\r
 \r
@@ -3311,30 +3335,32 @@ ConSplitterTextOutAddDevice (
 **/\r
 EFI_STATUS\r
 ConSplitterTextOutDeleteDevice (\r
-  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA     *Private,\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *TextOut\r
+  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA   *Private,\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *TextOut\r
   )\r
 {\r
-  INT32                 Index;\r
-  UINTN                 CurrentNumOfConsoles;\r
-  TEXT_OUT_AND_GOP_DATA *TextOutList;\r
-  EFI_STATUS            Status;\r
+  INT32                  Index;\r
+  UINTN                  CurrentNumOfConsoles;\r
+  TEXT_OUT_AND_GOP_DATA  *TextOutList;\r
+  EFI_STATUS             Status;\r
 \r
   //\r
   // Remove the specified text-out device data structure from the Text out List,\r
   // and rearrange the remaining data structures in the Text out List.\r
   //\r
-  CurrentNumOfConsoles  = Private->CurrentNumberOfConsoles;\r
-  Index                 = (INT32) CurrentNumOfConsoles - 1;\r
-  TextOutList           = Private->TextOutList;\r
+  CurrentNumOfConsoles = Private->CurrentNumberOfConsoles;\r
+  Index                = (INT32)CurrentNumOfConsoles - 1;\r
+  TextOutList          = Private->TextOutList;\r
   while (Index >= 0) {\r
     if (TextOutList->TextOut == TextOut) {\r
       if (TextOutList->UgaDraw != NULL) {\r
         Private->CurrentNumberOfUgaDraw--;\r
       }\r
+\r
       if (TextOutList->GraphicsOutput != NULL) {\r
         Private->CurrentNumberOfGraphicsOutput--;\r
       }\r
+\r
       CopyMem (TextOutList, TextOutList + 1, sizeof (TEXT_OUT_AND_GOP_DATA) * Index);\r
       CurrentNumOfConsoles--;\r
       break;\r
@@ -3343,6 +3369,7 @@ ConSplitterTextOutDeleteDevice (
     Index--;\r
     TextOutList++;\r
   }\r
+\r
   //\r
   // The specified TextOut is not managed by the ConSplitter driver\r
   //\r
@@ -3369,13 +3396,13 @@ ConSplitterTextOutDeleteDevice (
                       );\r
     } else {\r
       Status = gBS->UninstallMultipleProtocolInterfaces (\r
-             Private->VirtualHandle,\r
-             &gEfiUgaDrawProtocolGuid,\r
-             &Private->UgaDraw,\r
-             &gEfiGraphicsOutputProtocolGuid,\r
-             &Private->GraphicsOutput,\r
-             NULL\r
-             );\r
+                      Private->VirtualHandle,\r
+                      &gEfiUgaDrawProtocolGuid,\r
+                      &Private->UgaDraw,\r
+                      &gEfiGraphicsOutputProtocolGuid,\r
+                      &Private->GraphicsOutput,\r
+                      NULL\r
+                      );\r
     }\r
   }\r
 \r
@@ -3383,14 +3410,15 @@ ConSplitterTextOutDeleteDevice (
     //\r
     // If the number of consoles is zero, reset all parameters\r
     //\r
-    Private->CurrentNumberOfConsoles      = 0;\r
-    Private->TextOutMode.MaxMode          = 1;\r
-    Private->TextOutQueryData[0].Columns  = 80;\r
-    Private->TextOutQueryData[0].Rows     = 25;\r
+    Private->CurrentNumberOfConsoles     = 0;\r
+    Private->TextOutMode.MaxMode         = 1;\r
+    Private->TextOutQueryData[0].Columns = 80;\r
+    Private->TextOutQueryData[0].Rows    = 25;\r
     TextOutSetMode (Private, 0);\r
 \r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // Max Mode is really an intersection of the QueryMode command to all\r
   // devices. So we must copy the QueryMode of the first device to\r
@@ -3413,10 +3441,10 @@ ConSplitterTextOutDeleteDevice (
   //\r
   // Now add one by one\r
   //\r
-  Index = 1;\r
+  Index                            = 1;\r
   Private->CurrentNumberOfConsoles = 1;\r
   TextOutList++;\r
-  while ((UINTN) Index < CurrentNumOfConsoles) {\r
+  while ((UINTN)Index < CurrentNumOfConsoles) {\r
     ConSplitterSyncOutputMode (Private, TextOutList->TextOut);\r
     Index++;\r
     Private->CurrentNumberOfConsoles++;\r
@@ -3428,7 +3456,6 @@ ConSplitterTextOutDeleteDevice (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Reset the input device and optionally run diagnostics\r
 \r
@@ -3447,23 +3474,23 @@ ConSplitterTextInReset (
   IN  BOOLEAN                         ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_STATUS                    ReturnStatus;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  EFI_STATUS                     ReturnStatus;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
-  Private                       = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
+  Private = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  Private->KeyEventSignalState  = FALSE;\r
+  Private->KeyEventSignalState = FALSE;\r
 \r
   //\r
   // return the worst status met\r
   //\r
   for (Index = 0, ReturnStatus = EFI_SUCCESS; Index < Private->CurrentNumberOfConsoles; Index++) {\r
     Status = Private->TextInList[Index]->Reset (\r
-                                          Private->TextInList[Index],\r
-                                          ExtendedVerification\r
-                                          );\r
+                                           Private->TextInList[Index],\r
+                                           ExtendedVerification\r
+                                           );\r
     if (EFI_ERROR (Status)) {\r
       ReturnStatus = Status;\r
     }\r
@@ -3492,13 +3519,14 @@ ConSplitterTextInReset (
 **/\r
 EFI_STATUS\r
 ConSplitterTextInExDequeueKey (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
-  OUT EFI_KEY_DATA                    *KeyData\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  OUT EFI_KEY_DATA                   *KeyData\r
   )\r
 {\r
   if (Private->CurrentNumberOfKeys == 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   //\r
   // Return the first saved key.\r
   //\r
@@ -3528,8 +3556,8 @@ ConSplitterTextInExDequeueKey (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextInPrivateReadKeyStroke (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
-  OUT EFI_INPUT_KEY                   *Key\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  OUT EFI_INPUT_KEY                  *Key\r
   )\r
 {\r
   EFI_STATUS    Status;\r
@@ -3544,14 +3572,15 @@ ConSplitterTextInPrivateReadKeyStroke (
     if (EFI_ERROR (Status)) {\r
       break;\r
     }\r
+\r
     if ((KeyData.Key.ScanCode != CHAR_NULL) || (KeyData.Key.UnicodeChar != SCAN_NULL)) {\r
       CopyMem (Key, &KeyData.Key, sizeof (EFI_INPUT_KEY));\r
       return Status;\r
     }\r
   }\r
 \r
-  Key->UnicodeChar  = 0;\r
-  Key->ScanCode     = SCAN_NULL;\r
+  Key->UnicodeChar = 0;\r
+  Key->ScanCode    = SCAN_NULL;\r
 \r
   //\r
   // if no physical console input device exists, return EFI_NOT_READY;\r
@@ -3560,9 +3589,9 @@ ConSplitterTextInPrivateReadKeyStroke (
   //\r
   for (Index = 0; Index < Private->CurrentNumberOfConsoles;) {\r
     Status = Private->TextInList[Index]->ReadKeyStroke (\r
-                                          Private->TextInList[Index],\r
-                                          &KeyData.Key\r
-                                          );\r
+                                           Private->TextInList[Index],\r
+                                           &KeyData.Key\r
+                                           );\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // If it is not partial keystorke, return the key. Otherwise, continue\r
@@ -3583,8 +3612,6 @@ ConSplitterTextInPrivateReadKeyStroke (
   return EFI_NOT_READY;\r
 }\r
 \r
-\r
-\r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
   be used to test for existence of a keystroke via WaitForEvent () call.\r
@@ -3605,7 +3632,7 @@ ConSplitterTextInReadKeyStroke (
   OUT EFI_INPUT_KEY                   *Key\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
 \r
   Private = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
@@ -3615,7 +3642,7 @@ ConSplitterTextInReadKeyStroke (
   // Signal ConnectConIn event on first call in Lazy ConIn mode\r
   //\r
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {\r
-    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));\r
+    DEBUG ((DEBUG_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));\r
     gBS->SignalEvent (Private->ConnectConInEvent);\r
     mConInIsConnect = TRUE;\r
   }\r
@@ -3623,7 +3650,6 @@ ConSplitterTextInReadKeyStroke (
   return ConSplitterTextInPrivateReadKeyStroke (Private, Key);\r
 }\r
 \r
-\r
 /**\r
   This event aggregates all the events of the ConIn devices in the spliter.\r
 \r
@@ -3638,22 +3664,22 @@ ConSplitterTextInReadKeyStroke (
 VOID\r
 EFIAPI\r
 ConSplitterTextInWaitForKey (\r
-  IN  EFI_EVENT                       Event,\r
-  IN  VOID                            *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
-  Private = (TEXT_IN_SPLITTER_PRIVATE_DATA *) Context;\r
+  Private = (TEXT_IN_SPLITTER_PRIVATE_DATA *)Context;\r
 \r
   if (Private->KeyEventSignalState) {\r
     //\r
     // If KeyEventSignalState is flagged before, and not cleared by Reset() or ReadKeyStroke()\r
     //\r
     gBS->SignalEvent (Event);\r
-    return ;\r
+    return;\r
   }\r
 \r
   //\r
@@ -3668,8 +3694,6 @@ ConSplitterTextInWaitForKey (
   }\r
 }\r
 \r
-\r
-\r
 /**\r
   Test if the key has been registered on input device.\r
 \r
@@ -3693,27 +3717,29 @@ IsKeyRegistered (
   ASSERT (RegsiteredData != NULL && InputData != NULL);\r
 \r
   if ((RegsiteredData->Key.ScanCode    != InputData->Key.ScanCode) ||\r
-      (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar)) {\r
+      (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))\r
+  {\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Assume KeyShiftState/KeyToggleState = 0 in Registered key data means these state could be ignored.\r
   //\r
-  if (RegsiteredData->KeyState.KeyShiftState != 0 &&\r
-      RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState) {\r
+  if ((RegsiteredData->KeyState.KeyShiftState != 0) &&\r
+      (RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState))\r
+  {\r
     return FALSE;\r
   }\r
-  if (RegsiteredData->KeyState.KeyToggleState != 0 &&\r
-      RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState) {\r
+\r
+  if ((RegsiteredData->KeyState.KeyToggleState != 0) &&\r
+      (RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState))\r
+  {\r
     return FALSE;\r
   }\r
 \r
   return TRUE;\r
-\r
 }\r
 \r
-\r
 /**\r
   Reset the input device and optionally run diagnostics\r
 \r
@@ -3732,14 +3758,14 @@ ConSplitterTextInResetEx (
   IN BOOLEAN                            ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_STATUS                    ReturnStatus;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  EFI_STATUS                     ReturnStatus;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
-  Private                       = TEXT_IN_EX_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
+  Private = TEXT_IN_EX_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  Private->KeyEventSignalState  = FALSE;\r
+  Private->KeyEventSignalState = FALSE;\r
 \r
   //\r
   // return the worst status met\r
@@ -3763,10 +3789,8 @@ ConSplitterTextInResetEx (
   }\r
 \r
   return ReturnStatus;\r
-\r
 }\r
 \r
-\r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
   be used to test for existence of a keystroke via WaitForEvent () call.\r
@@ -3786,16 +3810,15 @@ ConSplitterTextInResetEx (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextInReadKeyStrokeEx (\r
-  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,\r
-  OUT EFI_KEY_DATA                      *KeyData\r
+  IN  EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL  *This,\r
+  OUT EFI_KEY_DATA                       *KeyData\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  EFI_STATUS                    Status;\r
-  UINTN                         Index;\r
-  EFI_KEY_STATE                 KeyState;\r
-  EFI_KEY_DATA                  CurrentKeyData;\r
-\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  EFI_STATUS                     Status;\r
+  UINTN                          Index;\r
+  EFI_KEY_STATE                  KeyState;\r
+  EFI_KEY_DATA                   CurrentKeyData;\r
 \r
   if (KeyData == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -3809,7 +3832,7 @@ ConSplitterTextInReadKeyStrokeEx (
   // Signal ConnectConIn event on first call in Lazy ConIn mode\r
   //\r
   if (!mConInIsConnect && PcdGetBool (PcdConInConnectOnDemand)) {\r
-    DEBUG ((EFI_D_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));\r
+    DEBUG ((DEBUG_INFO, "Connect ConIn in first ReadKeyStoke in Lazy ConIn mode.\n"));\r
     gBS->SignalEvent (Private->ConnectConInEvent);\r
     mConInIsConnect = TRUE;\r
   }\r
@@ -3821,6 +3844,7 @@ ConSplitterTextInReadKeyStrokeEx (
   if (!EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ASSERT (Private->CurrentNumberOfKeys == 0);\r
 \r
   ZeroMem (&KeyState, sizeof (KeyState));\r
@@ -3846,6 +3870,7 @@ ConSplitterTextInReadKeyStrokeEx (
     if ((CurrentKeyData.KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) {\r
       KeyState.KeyShiftState |= CurrentKeyData.KeyState.KeyShiftState;\r
     }\r
+\r
     if ((CurrentKeyData.KeyState.KeyToggleState & EFI_TOGGLE_STATE_VALID) != 0) {\r
       KeyState.KeyToggleState |= CurrentKeyData.KeyState.KeyToggleState;\r
     }\r
@@ -3859,7 +3884,8 @@ ConSplitterTextInReadKeyStrokeEx (
       //\r
       if ((Private->VirtualKeyStateExported) ||\r
           (CurrentKeyData.Key.ScanCode != CHAR_NULL) ||\r
-          (CurrentKeyData.Key.UnicodeChar != SCAN_NULL)) {\r
+          (CurrentKeyData.Key.UnicodeChar != SCAN_NULL))\r
+      {\r
         CopyMem (\r
           &Private->KeyQueue[Private->CurrentNumberOfKeys],\r
           &CurrentKeyData,\r
@@ -3893,7 +3919,6 @@ ConSplitterTextInReadKeyStrokeEx (
   return EFI_NOT_READY;\r
 }\r
 \r
-\r
 /**\r
   Set certain state for the input device.\r
 \r
@@ -3916,10 +3941,10 @@ ConSplitterTextInSetState (
   IN EFI_KEY_TOGGLE_STATE               *KeyToggleState\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  EFI_STATUS                    Status;\r
-  UINTN                         Index;\r
-  EFI_KEY_TOGGLE_STATE          PhysicalKeyToggleState;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  EFI_STATUS                     Status;\r
+  UINTN                          Index;\r
+  EFI_KEY_TOGGLE_STATE           PhysicalKeyToggleState;\r
 \r
   if (KeyToggleState == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -3957,10 +3982,8 @@ ConSplitterTextInSetState (
   Private->VirtualKeyStateExported = (((*KeyToggleState) & EFI_KEY_STATE_EXPOSED) != 0);\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
-\r
 /**\r
   Register a notification function for a particular keystroke for the input device.\r
 \r
@@ -3992,15 +4015,14 @@ ConSplitterTextInRegisterKeyNotify (
   OUT VOID                              **NotifyHandle\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  EFI_STATUS                    Status;\r
-  UINTN                         Index;\r
-  TEXT_IN_EX_SPLITTER_NOTIFY    *NewNotify;\r
-  LIST_ENTRY                    *Link;\r
-  TEXT_IN_EX_SPLITTER_NOTIFY    *CurrentNotify;\r
-\r
-\r
-  if (KeyData == NULL || NotifyHandle == NULL || KeyNotificationFunction == NULL) {\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  EFI_STATUS                     Status;\r
+  UINTN                          Index;\r
+  TEXT_IN_EX_SPLITTER_NOTIFY     *NewNotify;\r
+  LIST_ENTRY                     *Link;\r
+  TEXT_IN_EX_SPLITTER_NOTIFY     *CurrentNotify;\r
+\r
+  if ((KeyData == NULL) || (NotifyHandle == NULL) || (KeyNotificationFunction == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -4022,15 +4044,17 @@ ConSplitterTextInRegisterKeyNotify (
   //\r
   // Allocate resource to save the notification function\r
   //\r
-  NewNotify = (TEXT_IN_EX_SPLITTER_NOTIFY *) AllocateZeroPool (sizeof (TEXT_IN_EX_SPLITTER_NOTIFY));\r
+  NewNotify = (TEXT_IN_EX_SPLITTER_NOTIFY *)AllocateZeroPool (sizeof (TEXT_IN_EX_SPLITTER_NOTIFY));\r
   if (NewNotify == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
-  NewNotify->NotifyHandleList = (VOID **) AllocateZeroPool (sizeof (VOID *) *  Private->TextInExListCount);\r
+\r
+  NewNotify->NotifyHandleList = (VOID **)AllocateZeroPool (sizeof (VOID *) *  Private->TextInExListCount);\r
   if (NewNotify->NotifyHandleList == NULL) {\r
     gBS->FreePool (NewNotify);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
+\r
   NewNotify->Signature         = TEXT_IN_EX_SPLITTER_NOTIFY_SIGNATURE;\r
   NewNotify->KeyNotificationFn = KeyNotificationFunction;\r
   CopyMem (&NewNotify->KeyData, KeyData, sizeof (EFI_KEY_DATA));\r
@@ -4056,6 +4080,7 @@ ConSplitterTextInRegisterKeyNotify (
                                         NewNotify->NotifyHandleList[Index]\r
                                         );\r
       }\r
+\r
       gBS->FreePool (NewNotify->NotifyHandleList);\r
       gBS->FreePool (NewNotify);\r
       return Status;\r
@@ -4064,13 +4089,11 @@ ConSplitterTextInRegisterKeyNotify (
 \r
   InsertTailList (&Private->NotifyList, &NewNotify->NotifyEntry);\r
 \r
-  *NotifyHandle                = NewNotify;\r
+  *NotifyHandle = NewNotify;\r
 \r
   return EFI_SUCCESS;\r
-\r
 }\r
 \r
-\r
 /**\r
   Remove a registered notification function from a particular keystroke.\r
 \r
@@ -4090,10 +4113,10 @@ ConSplitterTextInUnregisterKeyNotify (
   IN VOID                               *NotificationHandle\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
-  TEXT_IN_EX_SPLITTER_NOTIFY    *CurrentNotify;\r
-  LIST_ENTRY                    *Link;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
+  TEXT_IN_EX_SPLITTER_NOTIFY     *CurrentNotify;\r
+  LIST_ENTRY                     *Link;\r
 \r
   if (NotificationHandle == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -4110,6 +4133,7 @@ ConSplitterTextInUnregisterKeyNotify (
                                         CurrentNotify->NotifyHandleList[Index]\r
                                         );\r
       }\r
+\r
       RemoveEntryList (&CurrentNotify->NotifyEntry);\r
 \r
       gBS->FreePool (CurrentNotify->NotifyHandleList);\r
@@ -4124,7 +4148,6 @@ ConSplitterTextInUnregisterKeyNotify (
   return EFI_INVALID_PARAMETER;\r
 }\r
 \r
-\r
 /**\r
   Reset the input device and optionally run diagnostics\r
 \r
@@ -4139,22 +4162,23 @@ ConSplitterTextInUnregisterKeyNotify (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerReset (\r
-  IN  EFI_SIMPLE_POINTER_PROTOCOL     *This,\r
-  IN  BOOLEAN                         ExtendedVerification\r
+  IN  EFI_SIMPLE_POINTER_PROTOCOL  *This,\r
+  IN  BOOLEAN                      ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_STATUS                    ReturnStatus;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  EFI_STATUS                     ReturnStatus;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
-  Private                         = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_SIMPLE_POINTER_THIS (This);\r
+  Private = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_SIMPLE_POINTER_THIS (This);\r
 \r
-  Private->InputEventSignalState  = FALSE;\r
+  Private->InputEventSignalState = FALSE;\r
 \r
   if (Private->CurrentNumberOfPointers == 0) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // return the worst status met\r
   //\r
@@ -4171,7 +4195,6 @@ ConSplitterSimplePointerReset (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
   be used to test for existence of a keystroke via WaitForEvent () call.\r
@@ -4188,8 +4211,8 @@ ConSplitterSimplePointerReset (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerPrivateGetState (\r
-  IN  TEXT_IN_SPLITTER_PRIVATE_DATA   *Private,\r
-  IN OUT EFI_SIMPLE_POINTER_STATE     *State\r
+  IN  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private,\r
+  IN OUT EFI_SIMPLE_POINTER_STATE    *State\r
   )\r
 {\r
   EFI_STATUS                Status;\r
@@ -4197,11 +4220,11 @@ ConSplitterSimplePointerPrivateGetState (
   UINTN                     Index;\r
   EFI_SIMPLE_POINTER_STATE  CurrentState;\r
 \r
-  State->RelativeMovementX  = 0;\r
-  State->RelativeMovementY  = 0;\r
-  State->RelativeMovementZ  = 0;\r
-  State->LeftButton         = FALSE;\r
-  State->RightButton        = FALSE;\r
+  State->RelativeMovementX = 0;\r
+  State->RelativeMovementY = 0;\r
+  State->RelativeMovementZ = 0;\r
+  State->LeftButton        = FALSE;\r
+  State->RightButton       = FALSE;\r
 \r
   //\r
   // if no physical console input device exists, return EFI_NOT_READY;\r
@@ -4210,7 +4233,6 @@ ConSplitterSimplePointerPrivateGetState (
   //\r
   ReturnStatus = EFI_NOT_READY;\r
   for (Index = 0; Index < Private->CurrentNumberOfPointers; Index++) {\r
-\r
     Status = Private->PointerList[Index]->GetState (\r
                                             Private->PointerList[Index],\r
                                             &CurrentState\r
@@ -4228,16 +4250,16 @@ ConSplitterSimplePointerPrivateGetState (
         State->RightButton = TRUE;\r
       }\r
 \r
-      if (CurrentState.RelativeMovementX != 0 && Private->PointerList[Index]->Mode->ResolutionX != 0) {\r
-        State->RelativeMovementX += (CurrentState.RelativeMovementX * (INT32) Private->SimplePointerMode.ResolutionX) / (INT32) Private->PointerList[Index]->Mode->ResolutionX;\r
+      if ((CurrentState.RelativeMovementX != 0) && (Private->PointerList[Index]->Mode->ResolutionX != 0)) {\r
+        State->RelativeMovementX += (CurrentState.RelativeMovementX * (INT32)Private->SimplePointerMode.ResolutionX) / (INT32)Private->PointerList[Index]->Mode->ResolutionX;\r
       }\r
 \r
-      if (CurrentState.RelativeMovementY != 0 && Private->PointerList[Index]->Mode->ResolutionY != 0) {\r
-        State->RelativeMovementY += (CurrentState.RelativeMovementY * (INT32) Private->SimplePointerMode.ResolutionY) / (INT32) Private->PointerList[Index]->Mode->ResolutionY;\r
+      if ((CurrentState.RelativeMovementY != 0) && (Private->PointerList[Index]->Mode->ResolutionY != 0)) {\r
+        State->RelativeMovementY += (CurrentState.RelativeMovementY * (INT32)Private->SimplePointerMode.ResolutionY) / (INT32)Private->PointerList[Index]->Mode->ResolutionY;\r
       }\r
 \r
-      if (CurrentState.RelativeMovementZ != 0 && Private->PointerList[Index]->Mode->ResolutionZ != 0) {\r
-        State->RelativeMovementZ += (CurrentState.RelativeMovementZ * (INT32) Private->SimplePointerMode.ResolutionZ) / (INT32) Private->PointerList[Index]->Mode->ResolutionZ;\r
+      if ((CurrentState.RelativeMovementZ != 0) && (Private->PointerList[Index]->Mode->ResolutionZ != 0)) {\r
+        State->RelativeMovementZ += (CurrentState.RelativeMovementZ * (INT32)Private->SimplePointerMode.ResolutionZ) / (INT32)Private->PointerList[Index]->Mode->ResolutionZ;\r
       }\r
     } else if (Status == EFI_DEVICE_ERROR) {\r
       ReturnStatus = EFI_DEVICE_ERROR;\r
@@ -4247,7 +4269,6 @@ ConSplitterSimplePointerPrivateGetState (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Reads the next keystroke from the input device. The WaitForKey Event can\r
   be used to test for existance of a keystroke via WaitForEvent () call.\r
@@ -4264,11 +4285,11 @@ ConSplitterSimplePointerPrivateGetState (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerGetState (\r
-  IN  EFI_SIMPLE_POINTER_PROTOCOL     *This,\r
-  IN OUT EFI_SIMPLE_POINTER_STATE     *State\r
+  IN  EFI_SIMPLE_POINTER_PROTOCOL  *This,\r
+  IN OUT EFI_SIMPLE_POINTER_STATE  *State\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
 \r
   Private = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_SIMPLE_POINTER_THIS (This);\r
 \r
@@ -4277,7 +4298,6 @@ ConSplitterSimplePointerGetState (
   return ConSplitterSimplePointerPrivateGetState (Private, State);\r
 }\r
 \r
-\r
 /**\r
   This event aggregates all the events of the ConIn devices in the spliter.\r
   If any events of physical ConIn devices are signaled, signal the ConIn\r
@@ -4291,23 +4311,24 @@ ConSplitterSimplePointerGetState (
 VOID\r
 EFIAPI\r
 ConSplitterSimplePointerWaitForInput (\r
-  IN  EFI_EVENT                       Event,\r
-  IN  VOID                            *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
-  Private = (TEXT_IN_SPLITTER_PRIVATE_DATA *) Context;\r
+  Private = (TEXT_IN_SPLITTER_PRIVATE_DATA *)Context;\r
 \r
   //\r
   // if InputEventSignalState is flagged before, and not cleared by Reset() or ReadKeyStroke()\r
   //\r
   if (Private->InputEventSignalState) {\r
     gBS->SignalEvent (Event);\r
-    return ;\r
+    return;\r
   }\r
+\r
   //\r
   // if any physical console input device has key input, signal the event.\r
   //\r
@@ -4334,14 +4355,14 @@ ConSplitterSimplePointerWaitForInput (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterAbsolutePointerReset (\r
-  IN EFI_ABSOLUTE_POINTER_PROTOCOL   *This,\r
-  IN BOOLEAN                         ExtendedVerification\r
+  IN EFI_ABSOLUTE_POINTER_PROTOCOL  *This,\r
+  IN BOOLEAN                        ExtendedVerification\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_STATUS                    ReturnStatus;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  EFI_STATUS                     ReturnStatus;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
   Private = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_ABSOLUTE_POINTER_THIS (This);\r
 \r
@@ -4350,6 +4371,7 @@ ConSplitterAbsolutePointerReset (
   if (Private->CurrentNumberOfAbsolutePointers == 0) {\r
     return EFI_SUCCESS;\r
   }\r
+\r
   //\r
   // return the worst status met\r
   //\r
@@ -4366,7 +4388,6 @@ ConSplitterAbsolutePointerReset (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Retrieves the current state of a pointer device.\r
 \r
@@ -4389,32 +4410,32 @@ ConSplitterAbsolutePointerGetState (
   IN OUT EFI_ABSOLUTE_POINTER_STATE  *State\r
   )\r
 {\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  EFI_STATUS                    Status;\r
-  EFI_STATUS                    ReturnStatus;\r
-  UINTN                         Index;\r
-  EFI_ABSOLUTE_POINTER_STATE    CurrentState;\r
-  UINT64                        MinX;\r
-  UINT64                        MinY;\r
-  UINT64                        MinZ;\r
-  UINT64                        MaxX;\r
-  UINT64                        MaxY;\r
-  UINT64                        MaxZ;\r
-  UINT64                        VirtualMinX;\r
-  UINT64                        VirtualMinY;\r
-  UINT64                        VirtualMinZ;\r
-  UINT64                        VirtualMaxX;\r
-  UINT64                        VirtualMaxY;\r
-  UINT64                        VirtualMaxZ;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  EFI_STATUS                     Status;\r
+  EFI_STATUS                     ReturnStatus;\r
+  UINTN                          Index;\r
+  EFI_ABSOLUTE_POINTER_STATE     CurrentState;\r
+  UINT64                         MinX;\r
+  UINT64                         MinY;\r
+  UINT64                         MinZ;\r
+  UINT64                         MaxX;\r
+  UINT64                         MaxY;\r
+  UINT64                         MaxZ;\r
+  UINT64                         VirtualMinX;\r
+  UINT64                         VirtualMinY;\r
+  UINT64                         VirtualMinZ;\r
+  UINT64                         VirtualMaxX;\r
+  UINT64                         VirtualMaxY;\r
+  UINT64                         VirtualMaxZ;\r
 \r
   Private = TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_ABSOLUTE_POINTER_THIS (This);\r
 \r
   Private->AbsoluteInputEventSignalState = FALSE;\r
 \r
-  State->CurrentX                        = 0;\r
-  State->CurrentY                        = 0;\r
-  State->CurrentZ                        = 0;\r
-  State->ActiveButtons                   = 0;\r
+  State->CurrentX      = 0;\r
+  State->CurrentY      = 0;\r
+  State->CurrentZ      = 0;\r
+  State->ActiveButtons = 0;\r
 \r
   VirtualMinX = Private->AbsolutePointerMode.AbsoluteMinX;\r
   VirtualMinY = Private->AbsolutePointerMode.AbsoluteMinY;\r
@@ -4430,7 +4451,6 @@ ConSplitterAbsolutePointerGetState (
   //\r
   ReturnStatus = EFI_NOT_READY;\r
   for (Index = 0; Index < Private->CurrentNumberOfAbsolutePointers; Index++) {\r
-\r
     Status = Private->AbsolutePointerList[Index]->GetState (\r
                                                     Private->AbsolutePointerList[Index],\r
                                                     &CurrentState\r
@@ -4452,7 +4472,7 @@ ConSplitterAbsolutePointerGetState (
       //\r
       // Rescale to Con Splitter virtual Absolute Pointer's resolution.\r
       //\r
-      if (!(MinX == 0 && MaxX == 0)) {\r
+      if (!((MinX == 0) && (MaxX == 0))) {\r
         State->CurrentX = VirtualMinX + DivU64x64Remainder (\r
                                           MultU64x64 (\r
                                             CurrentState.CurrentX,\r
@@ -4462,7 +4482,8 @@ ConSplitterAbsolutePointerGetState (
                                           NULL\r
                                           );\r
       }\r
-      if (!(MinY == 0 && MaxY == 0)) {\r
+\r
+      if (!((MinY == 0) && (MaxY == 0))) {\r
         State->CurrentY = VirtualMinY + DivU64x64Remainder (\r
                                           MultU64x64 (\r
                                             CurrentState.CurrentY,\r
@@ -4472,7 +4493,8 @@ ConSplitterAbsolutePointerGetState (
                                           NULL\r
                                           );\r
       }\r
-      if (!(MinZ == 0 && MaxZ == 0)) {\r
+\r
+      if (!((MinZ == 0) && (MaxZ == 0))) {\r
         State->CurrentZ = VirtualMinZ + DivU64x64Remainder (\r
                                           MultU64x64 (\r
                                             CurrentState.CurrentZ,\r
@@ -4482,7 +4504,6 @@ ConSplitterAbsolutePointerGetState (
                                           NULL\r
                                           );\r
       }\r
-\r
     } else if (Status == EFI_DEVICE_ERROR) {\r
       ReturnStatus = EFI_DEVICE_ERROR;\r
     }\r
@@ -4491,7 +4512,6 @@ ConSplitterAbsolutePointerGetState (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   This event aggregates all the events of the pointer devices in the splitter.\r
   If any events of physical pointer devices are signaled, signal the pointer\r
@@ -4505,15 +4525,15 @@ ConSplitterAbsolutePointerGetState (
 VOID\r
 EFIAPI\r
 ConSplitterAbsolutePointerWaitForInput (\r
-  IN  EFI_EVENT                       Event,\r
-  IN  VOID                            *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  TEXT_IN_SPLITTER_PRIVATE_DATA *Private;\r
-  UINTN                         Index;\r
+  EFI_STATUS                     Status;\r
+  TEXT_IN_SPLITTER_PRIVATE_DATA  *Private;\r
+  UINTN                          Index;\r
 \r
-  Private = (TEXT_IN_SPLITTER_PRIVATE_DATA *) Context;\r
+  Private = (TEXT_IN_SPLITTER_PRIVATE_DATA *)Context;\r
 \r
   //\r
   // if AbsoluteInputEventSignalState is flagged before,\r
@@ -4521,8 +4541,9 @@ ConSplitterAbsolutePointerWaitForInput (
   //\r
   if (Private->AbsoluteInputEventSignalState) {\r
     gBS->SignalEvent (Event);\r
-    return ;\r
+    return;\r
   }\r
+\r
   //\r
   // if any physical console input device has key input, signal the event.\r
   //\r
@@ -4535,7 +4556,6 @@ ConSplitterAbsolutePointerWaitForInput (
   }\r
 }\r
 \r
-\r
 /**\r
   Reset the text output device hardware and optionally run diagnostics\r
 \r
@@ -4551,8 +4571,8 @@ ConSplitterAbsolutePointerWaitForInput (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutReset (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  BOOLEAN                            ExtendedVerification\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  BOOLEAN                          ExtendedVerification\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -4585,7 +4605,6 @@ ConSplitterTextOutReset (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Write a Unicode string to the output device.\r
 \r
@@ -4608,8 +4627,8 @@ ConSplitterTextOutReset (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutOutputString (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  CHAR16                             *WString\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  CHAR16                           *WString\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -4621,7 +4640,7 @@ ConSplitterTextOutOutputString (
 \r
   This->SetAttribute (This, This->Mode->Attribute);\r
 \r
-  Private         = TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
+  Private = TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   //\r
   // return the worst status met\r
@@ -4650,37 +4669,40 @@ ConSplitterTextOutOutputString (
                        &MaxColumn,\r
                        &MaxRow\r
                        );\r
-    for (; *WString != CHAR_NULL; WString++) {\r
+    for ( ; *WString != CHAR_NULL; WString++) {\r
       switch (*WString) {\r
-      case CHAR_BACKSPACE:\r
-        if (Private->TextOutMode.CursorColumn == 0 && Private->TextOutMode.CursorRow > 0) {\r
-          Private->TextOutMode.CursorRow--;\r
-          Private->TextOutMode.CursorColumn = (INT32) (MaxColumn - 1);\r
-        } else if (Private->TextOutMode.CursorColumn > 0) {\r
-          Private->TextOutMode.CursorColumn--;\r
-        }\r
-        break;\r
+        case CHAR_BACKSPACE:\r
+          if ((Private->TextOutMode.CursorColumn == 0) && (Private->TextOutMode.CursorRow > 0)) {\r
+            Private->TextOutMode.CursorRow--;\r
+            Private->TextOutMode.CursorColumn = (INT32)(MaxColumn - 1);\r
+          } else if (Private->TextOutMode.CursorColumn > 0) {\r
+            Private->TextOutMode.CursorColumn--;\r
+          }\r
 \r
-      case CHAR_LINEFEED:\r
-        if (Private->TextOutMode.CursorRow < (INT32) (MaxRow - 1)) {\r
-          Private->TextOutMode.CursorRow++;\r
-        }\r
-        break;\r
+          break;\r
 \r
-      case CHAR_CARRIAGE_RETURN:\r
-        Private->TextOutMode.CursorColumn = 0;\r
-        break;\r
+        case CHAR_LINEFEED:\r
+          if (Private->TextOutMode.CursorRow < (INT32)(MaxRow - 1)) {\r
+            Private->TextOutMode.CursorRow++;\r
+          }\r
 \r
-      default:\r
-        if (Private->TextOutMode.CursorColumn < (INT32) (MaxColumn - 1)) {\r
-          Private->TextOutMode.CursorColumn++;\r
-        } else {\r
+          break;\r
+\r
+        case CHAR_CARRIAGE_RETURN:\r
           Private->TextOutMode.CursorColumn = 0;\r
-          if (Private->TextOutMode.CursorRow < (INT32) (MaxRow - 1)) {\r
-            Private->TextOutMode.CursorRow++;\r
+          break;\r
+\r
+        default:\r
+          if (Private->TextOutMode.CursorColumn < (INT32)(MaxColumn - 1)) {\r
+            Private->TextOutMode.CursorColumn++;\r
+          } else {\r
+            Private->TextOutMode.CursorColumn = 0;\r
+            if (Private->TextOutMode.CursorRow < (INT32)(MaxRow - 1)) {\r
+              Private->TextOutMode.CursorRow++;\r
+            }\r
           }\r
-        }\r
-        break;\r
+\r
+          break;\r
       }\r
     }\r
   }\r
@@ -4688,7 +4710,6 @@ ConSplitterTextOutOutputString (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Verifies that all characters in a Unicode string can be output to the\r
   target device.\r
@@ -4707,8 +4728,8 @@ ConSplitterTextOutOutputString (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutTestString (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  CHAR16                             *WString\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  CHAR16                           *WString\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -4730,6 +4751,7 @@ ConSplitterTextOutTestString (
       ReturnStatus = Status;\r
     }\r
   }\r
+\r
   //\r
   // There is no DevNullTextOutTestString () since a Unicode buffer would\r
   // always return EFI_SUCCESS.\r
@@ -4738,7 +4760,6 @@ ConSplitterTextOutTestString (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Returns information for an available text mode that the output device(s)\r
   supports.\r
@@ -4759,10 +4780,10 @@ ConSplitterTextOutTestString (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutQueryMode (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  UINTN                              ModeNumber,\r
-  OUT UINTN                              *Columns,\r
-  OUT UINTN                              *Rows\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  UINTN                            ModeNumber,\r
+  OUT UINTN                            *Columns,\r
+  OUT UINTN                            *Rows\r
   )\r
 {\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private;\r
@@ -4775,11 +4796,11 @@ ConSplitterTextOutQueryMode (
   // Check whether param ModeNumber is valid.\r
   // ModeNumber should be within range 0 ~ MaxMode - 1.\r
   //\r
-  if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {\r
+  if ((ModeNumber > (UINTN)(((UINT32)-1)>>1))) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  if ((INT32) ModeNumber >= This->Mode->MaxMode) {\r
+  if ((INT32)ModeNumber >= This->Mode->MaxMode) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -4792,19 +4813,17 @@ ConSplitterTextOutQueryMode (
     *Columns       = Private->TextOutQueryData[CurrentMode].Columns;\r
     *Rows          = Private->TextOutQueryData[CurrentMode].Rows;\r
   } else {\r
-    *Columns  = Private->TextOutQueryData[ModeNumber].Columns;\r
-    *Rows     = Private->TextOutQueryData[ModeNumber].Rows;\r
+    *Columns = Private->TextOutQueryData[ModeNumber].Columns;\r
+    *Rows    = Private->TextOutQueryData[ModeNumber].Rows;\r
   }\r
 \r
-  if (*Columns <= 0 && *Rows <= 0) {\r
+  if ((*Columns <= 0) && (*Rows <= 0)) {\r
     return EFI_UNSUPPORTED;\r
-\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Sets the output device(s) to a specified mode.\r
 \r
@@ -4820,8 +4839,8 @@ ConSplitterTextOutQueryMode (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutSetMode (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  UINTN                              ModeNumber\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  UINTN                            ModeNumber\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -4836,19 +4855,21 @@ ConSplitterTextOutSetMode (
   // Check whether param ModeNumber is valid.\r
   // ModeNumber should be within range 0 ~ MaxMode - 1.\r
   //\r
-  if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {\r
+  if ((ModeNumber > (UINTN)(((UINT32)-1)>>1))) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  if ((INT32) ModeNumber >= This->Mode->MaxMode) {\r
+  if ((INT32)ModeNumber >= This->Mode->MaxMode) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   //\r
   // If the mode is being set to the curent mode, then just clear the screen and return.\r
   //\r
-  if (Private->TextOutMode.Mode == (INT32) ModeNumber) {\r
+  if (Private->TextOutMode.Mode == (INT32)ModeNumber) {\r
     return ConSplitterTextOutClearScreen (This);\r
   }\r
+\r
   //\r
   // return the worst status met\r
   //\r
@@ -4858,7 +4879,8 @@ ConSplitterTextOutSetMode (
     // While adding a console out device do not set same mode again for the same device.\r
     //\r
     if ((!Private->AddingConOutDevice) ||\r
-        (TextOutModeMap[Index] != Private->TextOutList[Index].TextOut->Mode->Mode)) {\r
+        (TextOutModeMap[Index] != Private->TextOutList[Index].TextOut->Mode->Mode))\r
+    {\r
       Status = Private->TextOutList[Index].TextOut->SetMode (\r
                                                       Private->TextOutList[Index].TextOut,\r
                                                       TextOutModeMap[Index]\r
@@ -4877,7 +4899,6 @@ ConSplitterTextOutSetMode (
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Sets the background and foreground colors for the OutputString () and\r
   ClearScreen () functions.\r
@@ -4898,8 +4919,8 @@ ConSplitterTextOutSetMode (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutSetAttribute (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  UINTN                              Attribute\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  UINTN                            Attribute\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -4929,12 +4950,11 @@ ConSplitterTextOutSetAttribute (
     }\r
   }\r
 \r
-  Private->TextOutMode.Attribute = (INT32) Attribute;\r
+  Private->TextOutMode.Attribute = (INT32)Attribute;\r
 \r
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Clears the output device(s) display to the currently selected background\r
   color.\r
@@ -4950,7 +4970,7 @@ ConSplitterTextOutSetAttribute (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutClearScreen (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -4975,14 +4995,13 @@ ConSplitterTextOutClearScreen (
   // been checked in ConSplitterTextOutSetCursorPosition. And (0, 0) should\r
   // always be supported.\r
   //\r
-  Private->TextOutMode.CursorColumn = 0;\r
-  Private->TextOutMode.CursorRow    = 0;\r
+  Private->TextOutMode.CursorColumn  = 0;\r
+  Private->TextOutMode.CursorRow     = 0;\r
   Private->TextOutMode.CursorVisible = TRUE;\r
 \r
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Sets the current coordinates of the cursor position\r
 \r
@@ -5005,9 +5024,9 @@ ConSplitterTextOutClearScreen (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutSetCursorPosition (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  UINTN                              Column,\r
-  IN  UINTN                              Row\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  UINTN                            Column,\r
+  IN  UINTN                            Row\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -5020,9 +5039,9 @@ ConSplitterTextOutSetCursorPosition (
   INT32                           ModeNumber;\r
   INT32                           CurrentMode;\r
 \r
-  Private   = TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
-  TextOutModeMap  = NULL;\r
-  ModeNumber      = Private->TextOutMode.Mode;\r
+  Private        = TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
+  TextOutModeMap = NULL;\r
+  ModeNumber     = Private->TextOutMode.Mode;\r
 \r
   //\r
   // Get current MaxColumn and MaxRow from intersection map\r
@@ -5037,9 +5056,10 @@ ConSplitterTextOutSetCursorPosition (
   MaxColumn = Private->TextOutQueryData[CurrentMode].Columns;\r
   MaxRow    = Private->TextOutQueryData[CurrentMode].Rows;\r
 \r
-  if (Column >= MaxColumn || Row >= MaxRow) {\r
+  if ((Column >= MaxColumn) || (Row >= MaxRow)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   //\r
   // return the worst status met\r
   //\r
@@ -5059,13 +5079,12 @@ ConSplitterTextOutSetCursorPosition (
   // been checked in ConSplitterTextOutSetCursorPosition. And (0, 0) should\r
   // always be supported.\r
   //\r
-  Private->TextOutMode.CursorColumn = (INT32) Column;\r
-  Private->TextOutMode.CursorRow    = (INT32) Row;\r
+  Private->TextOutMode.CursorColumn = (INT32)Column;\r
+  Private->TextOutMode.CursorRow    = (INT32)Row;\r
 \r
   return ReturnStatus;\r
 }\r
 \r
-\r
 /**\r
   Makes the cursor visible or invisible\r
 \r
@@ -5083,8 +5102,8 @@ ConSplitterTextOutSetCursorPosition (
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterTextOutEnableCursor (\r
-  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *This,\r
-  IN  BOOLEAN                            Visible\r
+  IN  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *This,\r
+  IN  BOOLEAN                          Visible\r
   )\r
 {\r
   EFI_STATUS                      Status;\r