tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant IsUnicodeFiFoEmpty ()in UnicodeFiFoRemoveOneKey(). 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15216 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Elvin Li 2014-02-11 00:13:50 +00:00 committed by li-elvin
parent 52f8e370ac
commit b80eed7d6d
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Header file for Terminal driver. Header file for Terminal driver.
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1013,15 +1013,14 @@ UnicodeFiFoInsertOneKey (
/** /**
Remove one pre-fetched key out of the Unicode FIFO buffer. Remove one pre-fetched key out of the Unicode FIFO buffer.
The caller should guarantee that Unicode FIFO buffer is not empty
by IsUnicodeFiFoEmpty ().
@param TerminalDevice Terminal driver private structure. @param TerminalDevice Terminal driver private structure.
@param Output The key will be removed. @param Output The key will be removed.
@retval TRUE If insert successfully.
@retval FLASE If Unicode FIFO buffer is empty before remove operation.
**/ **/
BOOLEAN VOID
UnicodeFiFoRemoveOneKey ( UnicodeFiFoRemoveOneKey (
TERMINAL_DEV *TerminalDevice, TERMINAL_DEV *TerminalDevice,
UINT16 *Output UINT16 *Output

19
MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Implementation for EFI_SIMPLE_TEXT_INPUT_PROTOCOL protocol. Implementation for EFI_SIMPLE_TEXT_INPUT_PROTOCOL protocol.
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -942,15 +942,14 @@ UnicodeFiFoInsertOneKey (
/** /**
Remove one pre-fetched key out of the Unicode FIFO buffer. Remove one pre-fetched key out of the Unicode FIFO buffer.
The caller should guarantee that Unicode FIFO buffer is not empty
by IsUnicodeFiFoEmpty ().
@param TerminalDevice Terminal driver private structure. @param TerminalDevice Terminal driver private structure.
@param Output The key will be removed. @param Output The key will be removed.
@retval TRUE If insert successfully.
@retval FLASE If Unicode FIFO buffer is empty before remove operation.
**/ **/
BOOLEAN VOID
UnicodeFiFoRemoveOneKey ( UnicodeFiFoRemoveOneKey (
TERMINAL_DEV *TerminalDevice, TERMINAL_DEV *TerminalDevice,
UINT16 *Output UINT16 *Output
@ -961,19 +960,9 @@ UnicodeFiFoRemoveOneKey (
Head = TerminalDevice->UnicodeFiFo->Head; Head = TerminalDevice->UnicodeFiFo->Head;
ASSERT (Head < FIFO_MAX_NUMBER + 1); ASSERT (Head < FIFO_MAX_NUMBER + 1);
if (IsUnicodeFiFoEmpty (TerminalDevice)) {
//
// FIFO is empty
//
Output = NULL;
return FALSE;
}
*Output = TerminalDevice->UnicodeFiFo->Data[Head]; *Output = TerminalDevice->UnicodeFiFo->Data[Head];
TerminalDevice->UnicodeFiFo->Head = (UINT8) ((Head + 1) % (FIFO_MAX_NUMBER + 1)); TerminalDevice->UnicodeFiFo->Head = (UINT8) ((Head + 1) % (FIFO_MAX_NUMBER + 1));
return TRUE;
} }
/** /**