From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Tue, 10 Jan 2017 05:25:27 +0000 (+0800)
Subject: MdeModulePkg/TerminalDxe: Separate state machine start/stop logic
X-Git-Tag: edk2-stable201903~4784
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=b7cf1c07479bbe5a3d5fd3c944b2ab76f740c072

MdeModulePkg/TerminalDxe: Separate state machine start/stop 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>
---

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 129d7b3e60..b8dcf0c472 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -487,6 +487,63 @@ InitializeTerminalConsoleTextMode (
   return TextModeData;
 }
 
+/**
+  Stop the terminal state machine.
+
+  @param TerminalDevice    The terminal device.
+**/
+VOID
+StopTerminalStateMachine (
+  TERMINAL_DEV             *TerminalDevice
+  )
+{
+  EFI_TPL                  OriginalTpl;
+
+  OriginalTpl = gBS->RaiseTPL (TPL_NOTIFY);
+
+  gBS->CloseEvent (TerminalDevice->TimerEvent);
+  gBS->CloseEvent (TerminalDevice->TwoSecondTimeOut);
+
+  gBS->RestoreTPL (OriginalTpl);
+}
+
+/**
+  Start the terminal state machine.
+
+  @param TerminalDevice    The terminal device.
+**/
+VOID
+StartTerminalStateMachine (
+  TERMINAL_DEV             *TerminalDevice
+  )
+{
+  EFI_STATUS               Status;
+  Status = gBS->CreateEvent (
+                  EVT_TIMER | EVT_NOTIFY_SIGNAL,
+                  TPL_NOTIFY,
+                  TerminalConInTimerHandler,
+                  TerminalDevice,
+                  &TerminalDevice->TimerEvent
+                  );
+  ASSERT_EFI_ERROR (Status);
+
+  Status = gBS->SetTimer (
+                  TerminalDevice->TimerEvent,
+                  TimerPeriodic,
+                  KEYBOARD_TIMER_INTERVAL
+                  );
+  ASSERT_EFI_ERROR (Status);
+
+  Status = gBS->CreateEvent (
+                  EVT_TIMER,
+                  TPL_CALLBACK,
+                  NULL,
+                  NULL,
+                  &TerminalDevice->TwoSecondTimeOut
+                  );
+  ASSERT_EFI_ERROR (Status);
+}
+
 /**
   Initialize the controller name table.
 
@@ -893,30 +950,7 @@ TerminalDriverBindingStart (
       goto ReportError;
     }
 
-    Status = gBS->CreateEvent (
-                    EVT_TIMER | EVT_NOTIFY_SIGNAL,
-                    TPL_NOTIFY,
-                    TerminalConInTimerHandler,
-                    TerminalDevice,
-                    &TerminalDevice->TimerEvent
-                    );
-    ASSERT_EFI_ERROR (Status);
-
-    Status = gBS->SetTimer (
-                    TerminalDevice->TimerEvent,
-                    TimerPeriodic,
-                    KEYBOARD_TIMER_INTERVAL
-                    );
-    ASSERT_EFI_ERROR (Status);
-
-    Status = gBS->CreateEvent (
-                    EVT_TIMER,
-                    TPL_CALLBACK,
-                    NULL,
-                    NULL,
-                    &TerminalDevice->TwoSecondTimeOut
-                    );
-    ASSERT_EFI_ERROR (Status);
+    StartTerminalStateMachine (TerminalDevice);
 
     Status = gBS->CreateEvent (
                     EVT_NOTIFY_SIGNAL,
@@ -1326,8 +1360,7 @@ TerminalDriverBindingStop (
           FreeUnicodeStringTable (TerminalDevice->ControllerNameTable);
         }
 
-        gBS->CloseEvent (TerminalDevice->TimerEvent);
-        gBS->CloseEvent (TerminalDevice->TwoSecondTimeOut);
+        StopTerminalStateMachine (TerminalDevice);
         gBS->CloseEvent (TerminalDevice->SimpleInput.WaitForKey);
         gBS->CloseEvent (TerminalDevice->SimpleInputEx.WaitForKeyEx);
         gBS->CloseEvent (TerminalDevice->KeyNotifyProcessEvent);