summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDandan Bi <dandan.bi@intel.com>2018-09-09 22:34:57 +0800
committerEric Dong <eric.dong@intel.com>2018-09-14 10:18:31 +0800
commitf316a26013f2a8cfb1041d9f74a5c6d5bb9df9c9 (patch)
treef3604b9af303a84b20378d2ef491adfd510ca0a3
parentf92b8ee3b7a621d0db8708ec05ee13639436b4a9 (diff)
downloadedk2-f316a26013f2a8cfb1041d9f74a5c6d5bb9df9c9.zip
edk2-f316a26013f2a8cfb1041d9f74a5c6d5bb9df9c9.tar.gz
edk2-f316a26013f2a8cfb1041d9f74a5c6d5bb9df9c9.tar.bz2
MdeModulePkg: Avoid key notification called more than once
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=996 Issue: In current code logic, when a key is pressed, it will search the whole NotifyList to find whether a notification has been registered with the keystroke. if yes, it will en-queue the key for notification execution later. And now if different notification functions have been registered with the same key, then the key will be en-queued more than once. Then it will cause the notification executed more than once. This patch is to enhance the code logic to fix this issue. Cc: Ruiyu Ni <ruiyu.ni@intel.com> Cc: Star Zeng <star.zeng@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi <dandan.bi@intel.com> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Star Zeng <star.zeng@intel.com>
-rw-r--r--MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c1
-rw-r--r--MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c1
-rw-r--r--MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 2ee293d..53cb6f0 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -1451,6 +1451,7 @@ KeyGetchar (
//
PushEfikeyBufTail (&ConsoleIn->EfiKeyQueueForNotify, &KeyData);
gBS->SignalEvent (ConsoleIn->KeyNotifyProcessEvent);
+ break;
}
}
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index b3b5fb9..9cb4b5d 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -1695,6 +1695,7 @@ UsbKeyCodeToEfiInputKey (
//
Enqueue (&UsbKeyboardDevice->EfiKeyQueueForNotify, KeyData, sizeof (*KeyData));
gBS->SignalEvent (UsbKeyboardDevice->KeyNotifyProcessEvent);
+ break;
}
}
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 33f9b6e..d681a30 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -987,6 +987,7 @@ EfiKeyFiFoInsertOneKey (
//
EfiKeyFiFoForNotifyInsertOneKey (TerminalDevice->EfiKeyFiFoForNotify, Key);
gBS->SignalEvent (TerminalDevice->KeyNotifyProcessEvent);
+ break;
}
}
if (IsEfiKeyFiFoFull (TerminalDevice)) {