From fa3f99e5ef5ba31bdbfa0c980dfcaeb4eee4c75f Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Tue, 10 Jan 2017 13:05:46 +0800
Subject: 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>
---
 .../Universal/Console/TerminalDxe/Terminal.c       | 147 ++++++++-------------
 1 file changed, 56 insertions(+), 91 deletions(-)

(limited to 'MdeModulePkg/Universal')

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index fe09f01d59..1ffb6ff395 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -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_SIGNATURE,
   NULL,
@@ -535,6 +543,51 @@ InitializeTerminalConsoleTextMode (
   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,
   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
     //
-    TerminalDevice->ControllerNameTable = NULL;
-    switch (TerminalDevice->TerminalType) {
-    case TerminalTypePcAnsi:
-      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;
+    Status = InitializeControllerNameTable (TerminalDevice->TerminalType, &TerminalDevice->ControllerNameTable);
+    if (EFI_ERROR (Status)) {
+      goto Error;
     }
 
     //
-- 
cgit v1.2.3