fix ECC tool's warning

[mirror_edk2.git] / MdeModulePkg / Universal / Console / ConSplitterDxe / ConSplitterGraphics.c

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index f663ec1c2495df7cde17b30b571bed8856ef0dc3..1a0715e1417e480cbdfe457c27c7f453d3411ba9 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -20,21 +20,22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "ConSplitter.h"\r
 \r
 \r
-STATIC CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
+CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
 \r
 \r
 /**\r
   Return the current video mode information. Also returns info about existence\r
-  of Graphics Output devices or UGA Draw devices in system, and if the Std In device is locked. All the\r
-  arguments are optional and only returned if a non NULL pointer is passed in.\r
+  of Graphics Output devices or UGA Draw devices in system, and whether the Std\r
+  In device is locked. GopUgaExists and StdInLocked parameters are optional, and\r
+  only returned if a non NULL pointer is passed in.\r
 \r
   @param  This                    Protocol instance pointer.\r
-  @param  Mode                    Are we in text of grahics mode.\r
-  @param  GopExists               TRUE if GOP Spliter has found a GOP/UGA device\r
+  @param  Mode                    Current video mode.\r
+  @param  GopUgaExists            TRUE if GOP Spliter has found a GOP/UGA device\r
   @param  StdInLocked             TRUE if StdIn device is keyboard locked\r
 \r
-  @retval EFI_SUCCESS             Mode information returned.\r
-  @retval EFI_INVALID_PARAMETER   Invalid parameters.\r
+  @retval EFI_SUCCESS             Video mode information is returned.\r
+  @retval EFI_INVALID_PARAMETER   Invalid parameters if Mode == NULL.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -42,7 +43,7 @@ EFIAPI
 ConSpliterConsoleControlGetMode (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL    *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode,\r
-  OUT BOOLEAN                         *GopExists,\r
+  OUT BOOLEAN                         *GopUgaExists,\r
   OUT BOOLEAN                         *StdInLocked\r
   )\r
 {\r
@@ -57,11 +58,11 @@ ConSpliterConsoleControlGetMode (
 \r
   *Mode = Private->ConsoleOutputMode;\r
 \r
-  if (GopExists != NULL) {\r
-    *GopExists = FALSE;\r
+  if (GopUgaExists != NULL) {\r
+    *GopUgaExists = FALSE;\r
     for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) {\r
       if ((Private->TextOutList[Index].GraphicsOutput != NULL) || (Private->TextOutList[Index].UgaDraw != NULL)) {\r
-        *GopExists = TRUE;\r
+        *GopUgaExists = TRUE;\r
         break;\r
       }\r
     }\r
@@ -207,7 +208,7 @@ ConSpliterGraphicsOutputQueryMode (
 \r
 \r
 /**\r
-  Graphics output protocol interface to set video mode\r
+  Graphics output protocol interface to set video mode.\r
 \r
   @param  This                    Protocol instance pointer.\r
   @param  ModeNumber              The mode number to be set.\r
@@ -247,9 +248,6 @@ ConSpliterGraphicsOutputSetMode (
 \r
   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-  //\r
-  // GopDevNullSetMode ()\r
-  //\r
   ReturnStatus = EFI_SUCCESS;\r
 \r
   //\r
@@ -1349,7 +1347,7 @@ DevNullTextOutOutputString (
         Attribute = NullAttributes + SizeAttribute;\r
 \r
         for (Index = 0; Index < MaxColumn; Index++, Screen++, Attribute++) {\r
-          *Screen     = ' ';\r
+          *Screen     = L' ';\r
           *Attribute  = Mode->Attribute;\r
         }\r
       } else {\r
@@ -1468,7 +1466,7 @@ DevNullTextOutSetMode (
   if (Private->TextOutModeMap != NULL) {\r
     CurrentMode = *(Private->TextOutModeMap + Private->TextOutListCount * ModeNumber);\r
   } else {\r
-    CurrentMode = (INT32)(ModeNumber);\r
+    CurrentMode = (INT32) (ModeNumber);\r
   }\r
   Mode    = &(Private->TextOutQueryData[CurrentMode]);\r
   Row     = Mode->Rows;\r
@@ -1545,7 +1543,7 @@ DevNullTextOutClearScreen (
 \r
   for (Row = 0; Row < Private->DevNullRows; Row++) {\r
     for (Column = 0; Column < Private->DevNullColumns; Column++, Screen++, Attributes++) {\r
-      *Screen     = ' ';\r
+      *Screen     = L' ';\r
       *Attributes = CurrentAttribute;\r
     }\r
     //\r