From 6b88ceec9b23366f3a2b5541637a99f03ed7de04 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Thu, 16 Aug 2007 22:15:08 +0000 Subject: Updated to use new PCD settings git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3664 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/Console/TerminalDxe/Terminal.c | 148 ++++++++++++--------- .../Universal/Console/TerminalDxe/Terminal.h | 5 +- .../Universal/Console/TerminalDxe/TerminalDxe.inf | 4 +- 3 files changed, 93 insertions(+), 64 deletions(-) (limited to 'MdeModulePkg/Universal/Console/TerminalDxe') diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c index 4860a4b210..5b8cb8da0b 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c @@ -20,7 +20,6 @@ Revision History: --*/ - #include "Terminal.h" // @@ -36,6 +35,70 @@ EFI_DRIVER_BINDING_PROTOCOL gTerminalDriverBinding = { }; +EFI_GUID *gTerminalType[] = { + &gEfiPcAnsiGuid, + &gEfiVT100Guid, + &gEfiVT100PlusGuid, + &gEfiVTUTF8Guid +}; + + +TERMINAL_DEV gTerminalDevTemplate = { + TERMINAL_DEV_SIGNATURE, + NULL, + 0, + NULL, + NULL, + { // SimpleTextInput + TerminalConInReset, + TerminalConInReadKeyStroke, + NULL + }, + { // SimpleTextOutput + TerminalConOutReset, + TerminalConOutOutputString, + TerminalConOutTestString, + TerminalConOutQueryMode, + TerminalConOutSetMode, + TerminalConOutSetAttribute, + TerminalConOutClearScreen, + TerminalConOutSetCursorPosition, + TerminalConOutEnableCursor, + NULL + }, + { // SimpleTextOutputMode + 1, // MaxMode + 0, // Mode? + EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK), // Attribute + 0, // CursorColumn + 0, // CursorRow + TRUE // CursorVisible + }, + 0, + { + 0, + 0, + { 0 } + }, + { + 0, + 0, + { 0 } + }, + { + 0, + 0, + { 0 } + }, + NULL, // ControllerNameTable + NULL, + INPUT_STATE_DEFAULT, + RESET_STATE_DEFAULT, + FALSE +}; + + + EFI_STATUS EFIAPI TerminalDriverBindingSupported ( @@ -276,62 +339,48 @@ TerminalDriverBindingStart ( // If RemainingDevicePath is NULL, then create default device path node // if (RemainingDevicePath == NULL) { - DefaultNode = AllocatePool (sizeof (VENDOR_DEVICE_PATH)); + DefaultNode = AllocateZeroPool (sizeof (VENDOR_DEVICE_PATH)); if (DefaultNode == NULL) { Status = EFI_OUT_OF_RESOURCES; goto Error; } - CopyMem (&DefaultNode->Guid, &gEfiPcAnsiGuid, sizeof (EFI_GUID)); - RemainingDevicePath = (EFI_DEVICE_PATH_PROTOCOL*) DefaultNode; - } - // - // Use the RemainingDevicePath to determine the terminal type - // - Node = (VENDOR_DEVICE_PATH *) RemainingDevicePath; - - if (CompareGuid (&Node->Guid, &gEfiPcAnsiGuid)) { - - TerminalType = PcAnsiType; - - } else if (CompareGuid (&Node->Guid, &gEfiVT100Guid)) { - - TerminalType = VT100Type; - - } else if (CompareGuid (&Node->Guid, &gEfiVT100PlusGuid)) { - - TerminalType = VT100PlusType; - - } else if (CompareGuid (&Node->Guid, &gEfiVTUTF8Guid)) { - - TerminalType = VTUTF8Type; + TerminalType = FixedPcdGet8 (PcdDefaultTerminalType); + // must be between PcAnsiType (0) and VTUTF8Type (3) + ASSERT (TerminalType <= VTUTF8Type); + CopyMem (&DefaultNode->Guid, gTerminalType[TerminalType], sizeof (EFI_GUID)); + RemainingDevicePath = (EFI_DEVICE_PATH_PROTOCOL*)DefaultNode; } else { - goto Error; + // + // Use the RemainingDevicePath to determine the terminal type + // + Node = (VENDOR_DEVICE_PATH *)RemainingDevicePath; + if (CompareGuid (&Node->Guid, &gEfiPcAnsiGuid)) { + TerminalType = PcAnsiType; + } else if (CompareGuid (&Node->Guid, &gEfiVT100Guid)) { + TerminalType = VT100Type; + } else if (CompareGuid (&Node->Guid, &gEfiVT100PlusGuid)) { + TerminalType = VT100PlusType; + } else if (CompareGuid (&Node->Guid, &gEfiVTUTF8Guid)) { + TerminalType = VTUTF8Type; + } else { + goto Error; + } } + // // Initialize the Terminal Dev // - TerminalDevice = AllocatePool (sizeof (TERMINAL_DEV)); + TerminalDevice = AllocateCopyPool (sizeof (TERMINAL_DEV), &gTerminalDevTemplate); if (TerminalDevice == NULL) { Status = EFI_OUT_OF_RESOURCES; goto Error; } - ZeroMem (TerminalDevice, sizeof (TERMINAL_DEV)); - - TerminalDevice->Signature = TERMINAL_DEV_SIGNATURE; - TerminalDevice->TerminalType = TerminalType; - TerminalDevice->SerialIo = SerialIo; - // - // Simple Input Protocol - // - TerminalDevice->SimpleInput.Reset = TerminalConInReset; - TerminalDevice->SimpleInput.ReadKeyStroke = TerminalConInReadKeyStroke; - Status = gBS->CreateEvent ( EVT_NOTIFY_WAIT, TPL_NOTIFY, @@ -342,6 +391,7 @@ TerminalDriverBindingStart ( if (EFI_ERROR (Status)) { goto Error; } + // // initialize the FIFO buffer used for accommodating // the pre-read pending characters @@ -355,7 +405,6 @@ TerminalDriverBindingStart ( // keystroke response performance issue // Mode = TerminalDevice->SerialIo->Mode; - SerialInTimeOut = 0; if (Mode->BaudRate != 0) { SerialInTimeOut = (1 + Mode->DataBits + Mode->StopBits) * 2 * 1000000 / (UINTN) Mode->BaudRate; @@ -409,24 +458,8 @@ TerminalDriverBindingStart ( // // Simple Text Output Protocol // - TerminalDevice->SimpleTextOutput.Reset = TerminalConOutReset; - TerminalDevice->SimpleTextOutput.OutputString = TerminalConOutOutputString; - TerminalDevice->SimpleTextOutput.TestString = TerminalConOutTestString; - TerminalDevice->SimpleTextOutput.QueryMode = TerminalConOutQueryMode; - TerminalDevice->SimpleTextOutput.SetMode = TerminalConOutSetMode; - TerminalDevice->SimpleTextOutput.SetAttribute = TerminalConOutSetAttribute; - TerminalDevice->SimpleTextOutput.ClearScreen = TerminalConOutClearScreen; - TerminalDevice->SimpleTextOutput.SetCursorPosition = TerminalConOutSetCursorPosition; - TerminalDevice->SimpleTextOutput.EnableCursor = TerminalConOutEnableCursor; TerminalDevice->SimpleTextOutput.Mode = &TerminalDevice->SimpleTextOutputMode; - TerminalDevice->SimpleTextOutputMode.MaxMode = 1; - // - // For terminal devices, cursor is always visible - // - TerminalDevice->SimpleTextOutputMode.CursorVisible = TRUE; - TerminalDevice->SimpleTextOutputMode.Attribute = EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK); - Status = TerminalDevice->SimpleTextOutput.Reset ( &TerminalDevice->SimpleTextOutput, FALSE @@ -450,11 +483,6 @@ TerminalDriverBindingStart ( if (EFI_ERROR (Status)) { goto ReportError; } - // - // - // - TerminalDevice->InputState = INPUT_STATE_DEFAULT; - TerminalDevice->ResetState = RESET_STATE_DEFAULT; Status = gBS->CreateEvent ( EVT_TIMER, diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h index 5a7dc0e3e7..c4f5ac19f3 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h @@ -74,7 +74,6 @@ typedef struct { UINT8 TerminalType; EFI_SERIAL_IO_PROTOCOL *SerialIo; EFI_DEVICE_PATH_PROTOCOL *DevicePath; - VENDOR_DEVICE_PATH Node; EFI_SIMPLE_TEXT_INPUT_PROTOCOL SimpleInput; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL SimpleTextOutput; EFI_SIMPLE_TEXT_OUTPUT_MODE SimpleTextOutputMode; @@ -85,7 +84,7 @@ typedef struct { EFI_UNICODE_STRING_TABLE *ControllerNameTable; EFI_EVENT TwoSecondTimeOut; UINT32 InputState; - UINT32 ResetState; + UINT32 ResetState; // // Esc could not be output to the screen by user, @@ -94,7 +93,7 @@ typedef struct { // This boolean is used by the terminal driver only // to indicate whether the Esc could be sent or not. // - BOOLEAN OutputEscChar; + BOOLEAN OutputEscChar; } TERMINAL_DEV; #define INPUT_STATE_DEFAULT 0x00 diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf index 9368bf4377..ad0177ebbb 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf @@ -73,8 +73,10 @@ gEfiSimpleTextInProtocolGuid # PROTOCOL BY_START gEfiSimpleTextOutProtocolGuid # PROTOCOL BY_START -[PcdsFixedAtBuild] +[PcdsDynamic] PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid + PcdDefaultTerminalType|gEfiMdePkgTokenSpaceGuid + -- cgit v1.2.3