X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FConsole%2FConSplitterDxe%2FConSplitterGraphics.c;h=1a0715e1417e480cbdfe457c27c7f453d3411ba9;hb=257efb0ba32204ba983fd5eb4686280f8d975471;hp=f663ec1c2495df7cde17b30b571bed8856ef0dc3;hpb=33019a717c8c94a7a4b7a78cd3eed177af88c990;p=mirror_edk2.git diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c index f663ec1c24..1a0715e141 100644 --- 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" -STATIC CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL }; +CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL }; /** Return the current video mode information. Also returns info about existence - of Graphics Output devices or UGA Draw devices in system, and if the Std In device is locked. All the - arguments are optional and only returned if a non NULL pointer is passed in. + of Graphics Output devices or UGA Draw devices in system, and whether the Std + In device is locked. GopUgaExists and StdInLocked parameters are optional, and + only returned if a non NULL pointer is passed in. @param This Protocol instance pointer. - @param Mode Are we in text of grahics mode. - @param GopExists TRUE if GOP Spliter has found a GOP/UGA device + @param Mode Current video mode. + @param GopUgaExists TRUE if GOP Spliter has found a GOP/UGA device @param StdInLocked TRUE if StdIn device is keyboard locked - @retval EFI_SUCCESS Mode information returned. - @retval EFI_INVALID_PARAMETER Invalid parameters. + @retval EFI_SUCCESS Video mode information is returned. + @retval EFI_INVALID_PARAMETER Invalid parameters if Mode == NULL. **/ EFI_STATUS @@ -42,7 +43,7 @@ EFIAPI ConSpliterConsoleControlGetMode ( IN EFI_CONSOLE_CONTROL_PROTOCOL *This, OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode, - OUT BOOLEAN *GopExists, + OUT BOOLEAN *GopUgaExists, OUT BOOLEAN *StdInLocked ) { @@ -57,11 +58,11 @@ ConSpliterConsoleControlGetMode ( *Mode = Private->ConsoleOutputMode; - if (GopExists != NULL) { - *GopExists = FALSE; + if (GopUgaExists != NULL) { + *GopUgaExists = FALSE; for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) { if ((Private->TextOutList[Index].GraphicsOutput != NULL) || (Private->TextOutList[Index].UgaDraw != NULL)) { - *GopExists = TRUE; + *GopUgaExists = TRUE; break; } } @@ -207,7 +208,7 @@ ConSpliterGraphicsOutputQueryMode ( /** - Graphics output protocol interface to set video mode + Graphics output protocol interface to set video mode. @param This Protocol instance pointer. @param ModeNumber The mode number to be set. @@ -247,9 +248,6 @@ ConSpliterGraphicsOutputSetMode ( Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This); - // - // GopDevNullSetMode () - // ReturnStatus = EFI_SUCCESS; // @@ -1349,7 +1347,7 @@ DevNullTextOutOutputString ( Attribute = NullAttributes + SizeAttribute; for (Index = 0; Index < MaxColumn; Index++, Screen++, Attribute++) { - *Screen = ' '; + *Screen = L' '; *Attribute = Mode->Attribute; } } else { @@ -1468,7 +1466,7 @@ DevNullTextOutSetMode ( if (Private->TextOutModeMap != NULL) { CurrentMode = *(Private->TextOutModeMap + Private->TextOutListCount * ModeNumber); } else { - CurrentMode = (INT32)(ModeNumber); + CurrentMode = (INT32) (ModeNumber); } Mode = &(Private->TextOutQueryData[CurrentMode]); Row = Mode->Rows; @@ -1545,7 +1543,7 @@ DevNullTextOutClearScreen ( for (Row = 0; Row < Private->DevNullRows; Row++) { for (Column = 0; Column < Private->DevNullColumns; Column++, Screen++, Attributes++) { - *Screen = ' '; + *Screen = L' '; *Attributes = CurrentAttribute; } //