1. Fixed bugs in DxeNetLib to meet consistence with network module DriverBinding...

[mirror_edk2.git] / MdeModulePkg / Universal / Console / TerminalDxe / TerminalConOut.c

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index 1931c2288638b1847ab8c1275ca3ffcd721618ef..74def9eb43e4dbb0fc368fad34c6ea4ea47e0455 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -226,11 +226,11 @@ TerminalConOutOutputString (
   TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);\r
 \r
   //\r
-  //  get current display mode\r
-  //  Terminal driver only support mode 0\r
+  //  Get current display mode\r
   //\r
   Mode = This->Mode;\r
-  if (Mode->Mode != 0) {\r
+  \r
+  if (Mode->Mode > 1) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -464,15 +464,17 @@ TerminalConOutQueryMode (
                 \r
 --*/\r
 {\r
-  if (This->Mode->MaxMode > 1) {\r
+  if (This->Mode->MaxMode > 2) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
   if (ModeNumber == 0) {\r
-\r
     *Columns  = MODE0_COLUMN_COUNT;\r
     *Rows     = MODE0_ROW_COUNT;\r
-\r
+    return EFI_SUCCESS;\r
+  } else if (ModeNumber == 1) {  \r
+    *Columns  = MODE1_COLUMN_COUNT;\r
+    *Rows     = MODE1_ROW_COUNT;\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -521,11 +523,14 @@ TerminalConOutSetMode (
   //\r
   TerminalDevice = TERMINAL_CON_OUT_DEV_FROM_THIS (This);\r
 \r
-  if (ModeNumber != 0) {\r
+  if (ModeNumber > 1) {\r
     return EFI_UNSUPPORTED;\r
   }\r
-\r
-  This->Mode->Mode = 0;\r
+  \r
+  //\r
+  // Set the current mode\r
+  //\r
+  This->Mode->Mode = (INT32) ModeNumber;\r
 \r
   This->ClearScreen (This);\r
 \r
@@ -537,7 +542,7 @@ TerminalConOutSetMode (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  This->Mode->Mode  = 0;\r
+  This->Mode->Mode  = (INT32) ModeNumber;\r
 \r
   Status            = This->ClearScreen (This);\r
   if (EFI_ERROR (Status)) {\r