Refine code to remove structure assignment

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7070 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index ac1e38838dcb868971309a3f6477c8f362470271..6fd19de6645e2b63954270dbe95d0ace703ceb29 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -251,7 +251,7 @@ TerminalDriverBindingStart (
   UINTN                               EntryCount;\r
   UINTN                               Index;\r
   EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r
   UINTN                               EntryCount;\r
   UINTN                               Index;\r
   EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r

-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL     SimpleTextOutput;\r
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL     *SimpleTextOutput;\r

 \r
   TerminalDevice = NULL;\r
   DefaultNode    = NULL;\r
 \r
   TerminalDevice = NULL;\r
   DefaultNode    = NULL;\r


@@ -488,54 +488,39 @@ TerminalDriverBindingStart (
     goto ReportError;\r
   }\r
   //\r
     goto ReportError;\r
   }\r
   //\r

-  // Simple Text Output Protocol\r
-  //\r
-  SimpleTextOutput = TerminalDevice->SimpleTextOutput;\r
-  \r
-  SimpleTextOutput.Reset              = TerminalConOutReset;\r
-  SimpleTextOutput.OutputString       = TerminalConOutOutputString;\r
-  SimpleTextOutput.TestString         = TerminalConOutTestString;\r
-  SimpleTextOutput.QueryMode          = TerminalConOutQueryMode;\r
-  SimpleTextOutput.SetMode            = TerminalConOutSetMode;\r
-  SimpleTextOutput.SetAttribute       = TerminalConOutSetAttribute;\r
-  SimpleTextOutput.ClearScreen        = TerminalConOutClearScreen;\r
-  SimpleTextOutput.SetCursorPosition  = TerminalConOutSetCursorPosition;\r
-  SimpleTextOutput.EnableCursor       = TerminalConOutEnableCursor;\r
-  SimpleTextOutput.Mode               = &TerminalDevice->SimpleTextOutputMode;\r
+  // Set Simple Text Output Protocol from template.\r
+  //\r
+  SimpleTextOutput = CopyMem (\r
+                       &TerminalDevice->SimpleTextOutput,\r
+                       &mTerminalDevTemplate.SimpleTextOutput,\r
+                       sizeof (mTerminalDevTemplate.SimpleTextOutput)\r
+                       );\r
+  SimpleTextOutput->Mode = &TerminalDevice->SimpleTextOutputMode;\r

 \r
   TerminalDevice->SimpleTextOutputMode.MaxMode        = 3;\r
   //\r
   // For terminal devices, cursor is always visible\r
   //\r
   TerminalDevice->SimpleTextOutputMode.CursorVisible  = TRUE;\r
 \r
   TerminalDevice->SimpleTextOutputMode.MaxMode        = 3;\r
   //\r
   // For terminal devices, cursor is always visible\r
   //\r
   TerminalDevice->SimpleTextOutputMode.CursorVisible  = TRUE;\r

-  Status = SimpleTextOutput.SetAttribute (\r
-                                       &TerminalDevice->SimpleTextOutput,\r
-                                       EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK)\r
-                                       );\r
+  Status = TerminalConOutSetAttribute (\r
+             SimpleTextOutput,\r
+             EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK)\r
+             );\r

   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
 \r

-  Status = SimpleTextOutput.Reset (\r
-                               &TerminalDevice->SimpleTextOutput,\r
-                               FALSE\r
-                               );\r
+  Status = TerminalConOutReset (SimpleTextOutput, FALSE);\r

   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
 \r

-  Status = SimpleTextOutput.SetMode (\r
-                                &TerminalDevice->SimpleTextOutput,\r
-                                0\r
-                                );\r
+  Status = TerminalConOutSetMode (SimpleTextOutput, 0);\r

   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
 \r

-  Status = SimpleTextOutput.EnableCursor (\r
-                                     &TerminalDevice->SimpleTextOutput,\r
-                                     TRUE\r
-                                     );\r
+  Status = TerminalConOutEnableCursor (SimpleTextOutput, TRUE);\r

   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r
   if (EFI_ERROR (Status)) {\r
     goto ReportError;\r
   }\r