1. updated return value to EFI_SUCCESS by default.

2. add console number check.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8012 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 7838c54a70636a63b0bc9f1e1e0c24a47a39dbe8..9b0fe2fed4ce2c42e177b32911f60f926a6d58a4 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -4146,6 +4146,10 @@ ConSplitterTextOutOutputString (
 \r
   BackSpaceCount  = 0;\r
   for (TargetString = WString; *TargetString != L'\0'; TargetString++) {\r
+    if (*TargetString == L'a' && *(TargetString + 1) == L'b' && *(TargetString + 2) == L'c') {\r
+;//       CpuBreakpoint ();\r
+    }\r
+\r
     if (*TargetString == CHAR_BACKSPACE) {\r
       BackSpaceCount++;\r
     }\r
@@ -4173,8 +4177,10 @@ ConSplitterTextOutOutputString (
     }\r
   }\r
 \r
-  Private->TextOutMode.CursorColumn = Private->TextOutList[0].TextOut->Mode->CursorColumn;\r
-  Private->TextOutMode.CursorRow    = Private->TextOutList[0].TextOut->Mode->CursorRow;\r
+  if (Private->CurrentNumberOfConsoles > 0) {\r
+    Private->TextOutMode.CursorColumn = Private->TextOutList[0].TextOut->Mode->CursorColumn;\r
+    Private->TextOutMode.CursorRow    = Private->TextOutList[0].TextOut->Mode->CursorRow;\r
+  }\r
 \r
   if (BackSpaceCount > 0) {\r
     FreePool (TargetString);\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 31b8468e059bd454485a5bc9a587a56bd864f2f8..452f7a9c5982d3590331c6ff08c45876eff8e2ad 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -237,7 +237,7 @@ ConSpliterGraphicsOutputBlt (
   )\r
 {\r
   EFI_STATUS                      Status;\r
-  EFI_STATUS                      ReturnStatus = EFI_DEVICE_ERROR;\r
+  EFI_STATUS                      ReturnStatus;\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private;\r
   UINTN                           Index;\r
   EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput;\r
@@ -245,6 +245,8 @@ ConSpliterGraphicsOutputBlt (
 \r
   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
+  ReturnStatus = EFI_SUCCESS;\r
+\r
   //\r
   // return the worst status met\r
   //\r