Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg/TerminalDxe: Separate controller name init logic 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
This commit is contained in:
Ruiyu Ni 2017-01-10 13:05:46 +08:00
parent f916327545
commit fa3f99e5ef
1 changed files with 56 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
View File

@ -38,6 +38,14 @@ EFI_GUID *mTerminalType[] = {
}; };
CHAR16 *mSerialConsoleNames[] = {
L"PC-ANSI Serial Console",
L"VT-100 Serial Console",
L"VT-100+ Serial Console",
L"VT-UTF8 Serial Console",
L"Tty Terminal Serial Console"
};
TERMINAL_DEV mTerminalDevTemplate = { TERMINAL_DEV mTerminalDevTemplate = {
TERMINAL_DEV_SIGNATURE, TERMINAL_DEV_SIGNATURE,
NULL, NULL,
@ -535,6 +543,51 @@ InitializeTerminalConsoleTextMode (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
Initialize the controller name table.
@param TerminalType The terminal type.
@param ControllerNameTable The controller name table.
@retval EFI_SUCCESS The controller name table is initialized successfully.
@retval others Return status of AddUnicodeString2 ().
**/
EFI_STATUS
InitializeControllerNameTable (
TERMINAL_TYPE TerminalType,
EFI_UNICODE_STRING_TABLE **ControllerNameTable
)
{
EFI_STATUS Status;
EFI_UNICODE_STRING_TABLE *Table;
ASSERT (TerminalType < ARRAY_SIZE (mTerminalType));
Table = NULL;
Status = AddUnicodeString2 (
"eng",
gTerminalComponentName.SupportedLanguages,
&Table,
mSerialConsoleNames[TerminalType],
TRUE
);
if (!EFI_ERROR (Status)) {
Status = AddUnicodeString2 (
"en",
gTerminalComponentName2.SupportedLanguages,
&Table,
mSerialConsoleNames[TerminalType],
FALSE
);
if (EFI_ERROR (Status)) {
FreeUnicodeStringTable (Table);
}
}
if (!EFI_ERROR (Status)) {
*ControllerNameTable = Table;
}
return Status;
}
/** /**
Start this driver on Controller by opening a Serial IO protocol, Start this driver on Controller by opening a Serial IO protocol,
reading Device Path, and creating a child handle with a Simple Text In, reading Device Path, and creating a child handle with a Simple Text In,
@ -864,97 +917,9 @@ TerminalDriverBindingStart (
// //
// Build the component name for the child device // Build the component name for the child device
// //
TerminalDevice->ControllerNameTable = NULL; Status = InitializeControllerNameTable (TerminalDevice->TerminalType, &TerminalDevice->ControllerNameTable);
switch (TerminalDevice->TerminalType) { if (EFI_ERROR (Status)) {
case TerminalTypePcAnsi: goto Error;
AddUnicodeString2 (
"eng",
gTerminalComponentName.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"PC-ANSI Serial Console",
TRUE
);
AddUnicodeString2 (
"en",
gTerminalComponentName2.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"PC-ANSI Serial Console",
FALSE
);
break;
case TerminalTypeVt100:
AddUnicodeString2 (
"eng",
gTerminalComponentName.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"VT-100 Serial Console",
TRUE
);
AddUnicodeString2 (
"en",
gTerminalComponentName2.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"VT-100 Serial Console",
FALSE
);
break;
case TerminalTypeVt100Plus:
AddUnicodeString2 (
"eng",
gTerminalComponentName.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"VT-100+ Serial Console",
TRUE
);
AddUnicodeString2 (
"en",
gTerminalComponentName2.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"VT-100+ Serial Console",
FALSE
);
break;
case TerminalTypeVtUtf8:
AddUnicodeString2 (
"eng",
gTerminalComponentName.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"VT-UTF8 Serial Console",
TRUE
);
AddUnicodeString2 (
"en",
gTerminalComponentName2.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"VT-UTF8 Serial Console",
FALSE
);
break;
case TerminalTypeTtyTerm:
AddUnicodeString2 (
"eng",
gTerminalComponentName.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"Tty Terminal Serial Console",
TRUE
);
AddUnicodeString2 (
"en",
gTerminalComponentName2.SupportedLanguages,
&TerminalDevice->ControllerNameTable,
(CHAR16 *)L"Tty Terminal Serial Console",
FALSE
);
break;
} }
// //