diff options
| author | Daryl McDaniel <daryl.mcdaniel@intel.com> | 2014-10-28 19:20:48 +0000 |
|---|---|---|
| committer | darylm503 <darylm503@Edk2> | 2014-10-28 19:20:48 +0000 |
| commit | 24903bc48a324d42b284805ede9c5ee1db906e44 (patch) | |
| tree | 6b4c30e9269adb5b2250d6f0f51a047ec76d96b0 /StdLibPrivateInternalFiles/Include | |
| parent | 8dd618d2110bea0d3c3073b66eb51bc622e81c68 (diff) | |
| download | edk2-platforms-24903bc48a324d42b284805ede9c5ee1db906e44.tar.xz | |
StdLib: Some deployed versions of the Simple Text Input Protocol randomly return either NUL characters or Scan Codes when just typing normal text. These changes filter out NUL characters and make Scan Code and error handling more robust.
StdLibPrivateInternalFiles/Include/Device/Console.h: Change UnGetKey, in the ConInstance structure, from an EFI_INPUT_KEY structure to a CHAR16 variable.
Include/sys/termios.h: Add CHAR_SUB and CHAR_ESC for translation of '^Z' and the Escape Scan Code into the EOF and ESC characters, respectively.
LibC/Uefi/Devices/Console/daConsole.c: Add da_ConRawRead() function to simplify the read logic. Discard NUL characters from the input stream. In Blocking mode, retry until a non-NUL character is received. In NonBlocking mode, a NUL causes an EAGAIN error to be returned. Translate the Escape Scan Code into an ESC character. If Scan Codes are ignored, retry if in Blocking mode else return an EAGAIN error. UnGetKey becomes a single wide character instead of a structure.
Change da_Poll() to use da_ConRawRead().
LibC/Uefi/InteractiveIO/IIOutilities.c: BUG fix. Return the processed input character instead of the raw character. Allows EOF propagation.
LibC/Uefi/InteractiveIO/CanonRead.c: Enable EOF propagation.
LibC/Uefi/InteractiveIO/IIOechoCtrl.h: Use symbols defined in termios.h instead of hard-coded constant numbers.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daryl McDaniel <daryl.mcdaniel@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16254 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'StdLibPrivateInternalFiles/Include')
| -rw-r--r-- | StdLibPrivateInternalFiles/Include/Device/Console.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/StdLibPrivateInternalFiles/Include/Device/Console.h b/StdLibPrivateInternalFiles/Include/Device/Console.h index 9b4eb52d76..dce2630218 100644 --- a/StdLibPrivateInternalFiles/Include/Device/Console.h +++ b/StdLibPrivateInternalFiles/Include/Device/Console.h @@ -1,7 +1,7 @@ /** @file
Declarations and macros for the console abstraction.
- Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
@@ -32,8 +32,8 @@ typedef struct { UINTN Reserved_1; // Ensure that next member starts on an 8-byte boundary
UINT64 NumRead; ///< Number of characters Read.
UINT64 NumWritten; ///< Number of characters Written.
- EFI_INPUT_KEY UnGetKey; ///< One-key pushback, for poll().
__mbstate_t CharState; ///< Character state for the byte stream passing through this device
+ CHAR16 UnGetKey; ///< One-key pushback, for poll().
} ConInstance;
__BEGIN_DECLS
|