-/*++\r
+/** @file\r
+ Support for ConsoleControl protocol. Support for Graphics output spliter.\r
+ Support for DevNull Console Out. This console uses memory buffers\r
+ to represnt the console. It allows a console to start very early and\r
+ when a new console is added it is synced up with the current console.\r
\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
+Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
All rights reserved. This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
\r
-Module Name:\r
-\r
- ConSplitterGraphics.c\r
-\r
-Abstract:\r
+**/\r
\r
- Support for ConsoleControl protocol. Support for UGA Draw spliter.\r
- Support for DevNull Console Out. This console uses memory buffers\r
- to represnt the console. It allows a console to start very early and\r
- when a new console is added it is synced up with the current console\r
-\r
---*/\r
\r
#include "ConSplitter.h"\r
\r
\r
Routine Description:\r
Return the current video mode information. Also returns info about existence\r
- of UGA Draw devices in system, and if the Std In device is locked. All the\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
\r
Arguments:\r
This - Protocol instance pointer.\r
Mode - Are we in text of grahics mode.\r
- UgaExists - TRUE if UGA Spliter has found a UGA device\r
+ GopExists - TRUE if GOP Spliter has found a GOP/UGA device\r
StdInLocked - TRUE if StdIn device is keyboard locked\r
\r
Returns:\r
}\r
}\r
if (Mode == EfiConsoleControlScreenText) {\r
- DevNullSyncGopStdOut (Private);\r
+ DevNullSyncStdOut (Private);\r
}\r
return EFI_SUCCESS;\r
}\r
--*/\r
{\r
TEXT_OUT_SPLITTER_PRIVATE_DATA *Private;\r
- TEXT_OUT_GOP_MODE *Mode;\r
\r
if (This == NULL || Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {\r
return EFI_INVALID_PARAMETER;\r
\r
*SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
\r
- CopyMem (*Info, Private->GraphicsOutput.Mode->Info, *SizeOfInfo);\r
- Mode = &Private->GraphicsOutputModeBuffer[ModeNumber];\r
- (*Info)->HorizontalResolution = Mode->HorizontalResolution;\r
- (*Info)->VerticalResolution = Mode->VerticalResolution;\r
- (*Info)->PixelsPerScanLine = Mode->HorizontalResolution;\r
+ CopyMem (*Info, &Private->GraphicsOutputModeBuffer[ModeNumber], *SizeOfInfo);\r
\r
return EFI_SUCCESS;\r
}\r
TEXT_OUT_SPLITTER_PRIVATE_DATA *Private;\r
UINTN Index;\r
EFI_STATUS ReturnStatus;\r
- TEXT_OUT_GOP_MODE *Mode;\r
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Mode;\r
UINTN Size;\r
EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;\r
UINTN NumberIndex;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- if (!Private->HardwareNeedsStarting) {\r
- if (Private->ConsoleOutputMode != EfiConsoleControlScreenGraphics) {\r
- return EFI_UNSUPPORTED;\r
- }\r
- }\r
//\r
// return the worst status met\r
//\r
}\r
}\r
\r
- if (EFI_ERROR (ReturnStatus)) {\r
+ if (EFI_ERROR (ReturnStatus) && FeaturePcdGet (PcdUgaConsumeSupport)) {\r
UgaDraw = Private->TextOutList[Index].UgaDraw;\r
if (UgaDraw != NULL) {\r
Status = UgaDraw->SetMode (\r
\r
This->Mode->Mode = ModeNumber;\r
\r
- Info = This->Mode->Info;\r
- Info->HorizontalResolution = Mode->HorizontalResolution;\r
- Info->VerticalResolution = Mode->VerticalResolution;\r
- Info->PixelsPerScanLine = Mode->HorizontalResolution;\r
+ CopyMem (This->Mode->Info, &Private->GraphicsOutputModeBuffer[ModeNumber], This->Mode->SizeOfInfo);\r
\r
//\r
// Information is not enough here, so the following items remain unchanged:\r
}\r
\r
UgaDraw = Private->TextOutList[Index].UgaDraw;\r
- if (UgaDraw != NULL) {\r
+ if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {\r
Status = UgaDraw->Blt (\r
UgaDraw,\r
(EFI_UGA_PIXEL *) BltBuffer,\r
Private->GraphicsOutput.Mode->Info->VerticalResolution,\r
0\r
);\r
- } else {\r
+ } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
return UgaDraw->Blt (\r
UgaDraw,\r
(EFI_UGA_PIXEL *) Private->GraphicsOutputBlt,\r
Private->GraphicsOutput.Mode->Info->VerticalResolution,\r
0\r
);\r
+ } else {\r
+ return EFI_UNSUPPORTED;\r
}\r
}\r
\r
// return the worst status met\r
//\r
for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) {\r
- UgaDraw = Private->TextOutList[Index].UgaDraw;\r
- if (UgaDraw != NULL) {\r
- Status = UgaDraw->SetMode (\r
- UgaDraw,\r
- HorizontalResolution,\r
- VerticalResolution,\r
- ColorDepth,\r
- RefreshRate\r
- );\r
- if (EFI_ERROR (Status)) {\r
- ReturnStatus = Status;\r
+\r
+ ReturnStatus = EFI_UNSUPPORTED;\r
+\r
+ if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
+ UgaDraw = Private->TextOutList[Index].UgaDraw;\r
+ if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {\r
+ Status = UgaDraw->SetMode (\r
+ UgaDraw,\r
+ HorizontalResolution,\r
+ VerticalResolution,\r
+ ColorDepth,\r
+ RefreshRate\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ ReturnStatus = Status;\r
+ }\r
}\r
}\r
\r
}\r
}\r
\r
- if (Private->TextOutList[Index].UgaDraw != NULL) {\r
+ if (Private->TextOutList[Index].UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {\r
Status = Private->TextOutList[Index].UgaDraw->Blt (\r
Private->TextOutList[Index].UgaDraw,\r
BltBuffer,\r
IN EFI_UGA_DRAW_PROTOCOL *UgaDraw\r
)\r
{\r
- if (UgaDraw != NULL) {\r
+ if (UgaDraw != NULL && FeaturePcdGet (PcdUgaConsumeSupport)) {\r
return UgaDraw->Blt (\r
UgaDraw,\r
Private->UgaBlt,\r
Private->UgaVerticalResolution,\r
Private->UgaHorizontalResolution * sizeof (EFI_UGA_PIXEL)\r
);\r
- } else {\r
+ } else if (GraphicsOutput != NULL) {\r
return GraphicsOutput->Blt (\r
GraphicsOutput,\r
(EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) Private->UgaBlt,\r
Private->UgaVerticalResolution,\r
0\r
);\r
+ } else {\r
+ return EFI_UNSUPPORTED;\r
}\r
}\r
\r
--*/\r
{\r
UINTN Size;\r
+ INT32 CurrentMode;\r
UINTN Row;\r
UINTN Column;\r
TEXT_OUT_SPLITTER_QUERY_DATA *Mode;\r
//\r
// No extra check for ModeNumber here, as it has been checked in\r
// ConSplitterTextOutSetMode. And mode 0 should always be supported.\r
+ // Row and Column should be fetched from intersection map.\r
//\r
- Mode = &(Private->TextOutQueryData[ModeNumber]);\r
+ if (Private->TextOutModeMap != NULL) {\r
+ CurrentMode = *(Private->TextOutModeMap + Private->TextOutListCount * ModeNumber);\r
+ } else {\r
+ CurrentMode = (INT32)(ModeNumber);\r
+ }\r
+ Mode = &(Private->TextOutQueryData[CurrentMode]);\r
Row = Mode->Rows;\r
Column = Mode->Columns;\r
\r
return EFI_UNSUPPORTED;\r
}\r
\r
- if (Private->DevNullColumns != Column || Private->DevNullRows != Row) {\r
+ if (Private->TextOutMode.Mode != (INT32) ModeNumber) {\r
\r
Private->TextOutMode.Mode = (INT32) ModeNumber;\r
Private->DevNullColumns = Column;\r
}\r
\r
EFI_STATUS\r
-DevNullSyncGopStdOut (\r
+DevNullSyncStdOut (\r
IN TEXT_OUT_SPLITTER_PRIVATE_DATA *Private\r
)\r
/*++\r
projects / mirror_edk2.git / blobdiff