Produces Simple Text Input Protocol, Simple Text Input Extended Protocol and\r
Simple Text Output Protocol upon Serial IO Protocol.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
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
0, // CursorRow\r
TRUE // CursorVisible\r
},\r
+ NULL, // TerminalConsoleModeData\r
0, // SerialInTimeOut\r
\r
NULL, // RawFifo\r
NULL, // EfiKeyFiFo\r
\r
NULL, // ControllerNameTable\r
+ NULL, // TimerEvent\r
NULL, // TwoSecondTimeOut\r
INPUT_STATE_DEFAULT,\r
RESET_STATE_DEFAULT,\r
}\r
};\r
\r
+TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = {\r
+ {100, 31},\r
+ //\r
+ // New modes can be added here.\r
+ //\r
+};\r
+\r
/**\r
Test to see if this driver supports Controller.\r
\r
//\r
// Get global variable and its size according to the name given.\r
//\r
- Variable = GetEfiGlobalVariable (VariableName);\r
+ GetEfiGlobalVariable2 (VariableName, &Variable, NULL);\r
if (Variable == NULL) {\r
return FALSE;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
+/**\r
+ Initialize all the text modes which the terminal console supports.\r
+\r
+ It returns information for available text modes that the terminal can support.\r
+\r
+ @param[out] TextModeCount The total number of text modes that terminal console supports.\r
+ @param[out] TextModeData The buffer to the text modes column and row information.\r
+ Caller is responsible to free it when it's non-NULL.\r
+\r
+ @retval EFI_SUCCESS The supporting mode information is returned.\r
+ @retval EFI_INVALID_PARAMETER The parameters are invalid.\r
+\r
+**/\r
+EFI_STATUS\r
+InitializeTerminalConsoleTextMode (\r
+ OUT UINTN *TextModeCount,\r
+ OUT TERMINAL_CONSOLE_MODE_DATA **TextModeData\r
+ )\r
+{\r
+ UINTN Index;\r
+ UINTN Count;\r
+ TERMINAL_CONSOLE_MODE_DATA *ModeBuffer;\r
+ TERMINAL_CONSOLE_MODE_DATA *NewModeBuffer;\r
+ UINTN ValidCount;\r
+ UINTN ValidIndex;\r
+ \r
+ if ((TextModeCount == NULL) || (TextModeData == NULL)) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ \r
+ Count = sizeof (mTerminalConsoleModeData) / sizeof (TERMINAL_CONSOLE_MODE_DATA);\r
+ \r
+ //\r
+ // Get defined mode buffer pointer.\r
+ //\r
+ ModeBuffer = mTerminalConsoleModeData;\r
+ \r
+ //\r
+ // Here we make sure that the final mode exposed does not include the duplicated modes,\r
+ // and does not include the invalid modes which exceed the max column and row.\r
+ // Reserve 2 modes for 80x25, 80x50 of terminal console.\r
+ //\r
+ NewModeBuffer = AllocateZeroPool (sizeof (TERMINAL_CONSOLE_MODE_DATA) * (Count + 2));\r
+ ASSERT (NewModeBuffer != NULL);\r
+\r
+ //\r
+ // Mode 0 and mode 1 is for 80x25, 80x50 according to UEFI spec.\r
+ //\r
+ ValidCount = 0; \r
+\r
+ NewModeBuffer[ValidCount].Columns = 80;\r
+ NewModeBuffer[ValidCount].Rows = 25;\r
+ ValidCount++;\r
+\r
+ NewModeBuffer[ValidCount].Columns = 80;\r
+ NewModeBuffer[ValidCount].Rows = 50;\r
+ ValidCount++;\r
+ \r
+ //\r
+ // Start from mode 2 to put the valid mode other than 80x25 and 80x50 in the output mode buffer.\r
+ //\r
+ for (Index = 0; Index < Count; Index++) {\r
+ if ((ModeBuffer[Index].Columns == 0) || (ModeBuffer[Index].Rows == 0)) {\r
+ //\r
+ // Skip the pre-defined mode which is invalid.\r
+ //\r
+ continue;\r
+ }\r
+ for (ValidIndex = 0; ValidIndex < ValidCount; ValidIndex++) {\r
+ if ((ModeBuffer[Index].Columns == NewModeBuffer[ValidIndex].Columns) &&\r
+ (ModeBuffer[Index].Rows == NewModeBuffer[ValidIndex].Rows)) {\r
+ //\r
+ // Skip the duplicated mode.\r
+ //\r
+ break;\r
+ }\r
+ }\r
+ if (ValidIndex == ValidCount) {\r
+ NewModeBuffer[ValidCount].Columns = ModeBuffer[Index].Columns;\r
+ NewModeBuffer[ValidCount].Rows = ModeBuffer[Index].Rows;\r
+ ValidCount++;\r
+ }\r
+ }\r
+ \r
+ DEBUG_CODE (\r
+ for (Index = 0; Index < ValidCount; Index++) {\r
+ DEBUG ((EFI_D_INFO, "Terminal - Mode %d, Column = %d, Row = %d\n", \r
+ Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows)); \r
+ }\r
+ );\r
+ \r
+ //\r
+ // Return valid mode count and mode information buffer.\r
+ //\r
+ *TextModeCount = ValidCount;\r
+ *TextModeData = NewModeBuffer;\r
+ return EFI_SUCCESS;\r
+}\r
\r
/**\r
Start this driver on Controller by opening a Serial IO protocol,\r
BOOLEAN SimTxtInInstalled;\r
BOOLEAN SimTxtOutInstalled;\r
BOOLEAN FirstEnter;\r
+ UINTN ModeCount;\r
\r
TerminalDevice = NULL;\r
DefaultNode = NULL;\r
EVT_NOTIFY_WAIT,\r
TPL_NOTIFY,\r
TerminalConInWaitForKeyEx,\r
- &TerminalDevice->SimpleInputEx,\r
+ TerminalDevice,\r
&TerminalDevice->SimpleInputEx.WaitForKeyEx\r
);\r
if (EFI_ERROR (Status)) {\r
EVT_NOTIFY_WAIT,\r
TPL_NOTIFY,\r
TerminalConInWaitForKey,\r
- &TerminalDevice->SimpleInput,\r
+ TerminalDevice,\r
&TerminalDevice->SimpleInput.WaitForKey\r
);\r
if (EFI_ERROR (Status)) {\r
sizeof (mTerminalDevTemplate.SimpleTextOutput)\r
);\r
SimpleTextOutput->Mode = &TerminalDevice->SimpleTextOutputMode;\r
-\r
- TerminalDevice->SimpleTextOutputMode.MaxMode = 3;\r
+ \r
+ Status = InitializeTerminalConsoleTextMode (&ModeCount, &TerminalDevice->TerminalConsoleModeData);\r
+ if (EFI_ERROR (Status)) {\r
+ goto ReportError;\r
+ }\r
+ TerminalDevice->SimpleTextOutputMode.MaxMode = (INT32) ModeCount;\r
+ \r
//\r
// For terminal devices, cursor is always visible\r
//\r
goto ReportError;\r
}\r
\r
- Status = TerminalConOutReset (SimpleTextOutput, FALSE);\r
- if (EFI_ERROR (Status)) {\r
- goto ReportError;\r
- }\r
-\r
- Status = TerminalConOutSetMode (SimpleTextOutput, 0);\r
- if (EFI_ERROR (Status)) {\r
- goto ReportError;\r
- }\r
-\r
- Status = TerminalConOutEnableCursor (SimpleTextOutput, TRUE);\r
- if (EFI_ERROR (Status)) {\r
- goto ReportError;\r
- }\r
-\r
- Status = gBS->CreateEvent (\r
- EVT_TIMER,\r
- TPL_CALLBACK,\r
- NULL,\r
- NULL,\r
- &TerminalDevice->TwoSecondTimeOut\r
- );\r
-\r
//\r
// Build the component name for the child device\r
//\r
goto Error;\r
}\r
\r
+ Status = TerminalConOutReset (SimpleTextOutput, FALSE);\r
+ if (EFI_ERROR (Status)) {\r
+ goto ReportError;\r
+ }\r
+\r
+ Status = TerminalConOutSetMode (SimpleTextOutput, 0);\r
+ if (EFI_ERROR (Status)) {\r
+ goto ReportError;\r
+ }\r
+\r
+ Status = TerminalConOutEnableCursor (SimpleTextOutput, TRUE);\r
+ if (EFI_ERROR (Status)) {\r
+ goto ReportError;\r
+ }\r
+\r
+ Status = gBS->CreateEvent (\r
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
+ TPL_NOTIFY,\r
+ TerminalConInTimerHandler,\r
+ TerminalDevice,\r
+ &TerminalDevice->TimerEvent\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ Status = gBS->SetTimer (\r
+ TerminalDevice->TimerEvent,\r
+ TimerPeriodic,\r
+ KEYBOARD_TIMER_INTERVAL\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ Status = gBS->CreateEvent (\r
+ EVT_TIMER,\r
+ TPL_CALLBACK,\r
+ NULL,\r
+ NULL,\r
+ &TerminalDevice->TwoSecondTimeOut\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
Status = gBS->InstallProtocolInterface (\r
&TerminalDevice->Handle,\r
&gEfiDevicePathProtocolGuid,\r
gBS->CloseEvent (TerminalDevice->TwoSecondTimeOut);\r
}\r
\r
+ if (TerminalDevice->TimerEvent != NULL) {\r
+ gBS->CloseEvent (TerminalDevice->TimerEvent);\r
+ }\r
+\r
if (TerminalDevice->SimpleInput.WaitForKey != NULL) {\r
gBS->CloseEvent (TerminalDevice->SimpleInput.WaitForKey);\r
}\r
FreePool (TerminalDevice->DevicePath);\r
}\r
\r
+ if (TerminalDevice->TerminalConsoleModeData != NULL) {\r
+ FreePool (TerminalDevice->TerminalConsoleModeData);\r
+ }\r
+\r
FreePool (TerminalDevice);\r
}\r
}\r
FreeUnicodeStringTable (TerminalDevice->ControllerNameTable);\r
}\r
\r
+ gBS->CloseEvent (TerminalDevice->TimerEvent);\r
gBS->CloseEvent (TerminalDevice->TwoSecondTimeOut);\r
gBS->CloseEvent (TerminalDevice->SimpleInput.WaitForKey);\r
gBS->CloseEvent (TerminalDevice->SimpleInputEx.WaitForKeyEx);\r
TerminalFreeNotifyList (&TerminalDevice->NotifyList);\r
FreePool (TerminalDevice->DevicePath);\r
+ if (TerminalDevice->TerminalConsoleModeData != NULL) {\r
+ FreePool (TerminalDevice->TerminalConsoleModeData);\r
+ }\r
FreePool (TerminalDevice);\r
}\r
}\r
//\r
// Get global variable and its size according to the name given.\r
//\r
- Variable = GetEfiGlobalVariable (VariableName);\r
+ GetEfiGlobalVariable2 (VariableName, &Variable, NULL);\r
if (Variable == NULL) {\r
return;\r
}\r
//\r
// Get global variable and its size according to the name given.\r
//\r
- Variable = GetEfiGlobalVariable (VariableName);\r
+ GetEfiGlobalVariable2 (VariableName, &Variable, NULL);\r
if (Variable == NULL) {\r
return ;\r
}\r
projects / mirror_edk2.git / blobdiff