tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-19 19:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

EmbeddedPkg/SerialDxe: Do not block UART when no data is available on the port

Browse Source 
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13255 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2012-05-02 20:04:42 +00:00
parent c54de82204
commit 40ab42ddca
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c
View File

@ -34,7 +34,6 @@ PL011UartInitializePort (
IN UINTN UartBase,
IN UINT64 BaudRate,
IN UINT32 ReceiveFifoDepth,
IN UINT32 Timeout,
IN EFI_PARITY_TYPE Parity,
IN UINT8 DataBits,
IN EFI_STOP_BITS_TYPE StopBits
@ -305,14 +304,14 @@ PL011UartWrite (
IN UINTN NumberOfBytes
)
{
UINTN Count;
UINTN Count;
for (Count = 0; Count < NumberOfBytes; Count++, Buffer++) {
while ((MmioRead32 (UartBase + UARTFR) & UART_TX_EMPTY_FLAG_MASK) == 0);
MmioWrite8 (UartBase + UARTDR, *Buffer);
}
for (Count = 0; Count < NumberOfBytes; Count++, Buffer++) {
while ((MmioRead32 (UartBase + UARTFR) & UART_TX_EMPTY_FLAG_MASK) == 0);
MmioWrite8 (UartBase + UARTDR, *Buffer);
}
return NumberOfBytes;
return NumberOfBytes;
}
/**
@ -335,12 +334,12 @@ PL011UartRead (
{
UINTN Count;
for (Count = 0; Count < NumberOfBytes; Count++, Buffer++) {
while ((MmioRead32 (UartBase + UARTFR) & UART_RX_EMPTY_FLAG_MASK) != 0);
*Buffer = MmioRead8 (UartBase + UARTDR);
}
for (Count = 0; Count < NumberOfBytes; Count++, Buffer++) {
while ((MmioRead32 (UartBase + UARTFR) & UART_RX_EMPTY_FLAG_MASK) != 0);
*Buffer = MmioRead8 (UartBase + UARTDR);
}
return NumberOfBytes;
return NumberOfBytes;
}
/**

1
ArmPlatformPkg/Include/Drivers/PL011Uart.h
View File

@ -94,7 +94,6 @@ PL011UartInitializePort (
IN UINTN UartBase,
IN UINT64 BaudRate,
IN UINT32 ReceiveFifoDepth,
IN UINT32 Timeout,
IN EFI_PARITY_TYPE Parity,
IN UINT8 DataBits,
IN EFI_STOP_BITS_TYPE StopBits

3
ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c
View File

@ -14,7 +14,7 @@
**/
#include <Include/Base.h>
#include <Base.h>
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
@ -40,7 +40,6 @@ SerialPortInitialize (
(UINTN)PcdGet64 (PcdSerialRegisterBase),
(UINTN)PcdGet64 (PcdUartDefaultBaudRate),
0, // Use the default value for Fifo depth
0, // Use the default value for Timeout,
(EFI_PARITY_TYPE)PcdGet8 (PcdUartDefaultParity),
PcdGet8 (PcdUartDefaultDataBits),
(EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits));

11
EmbeddedPkg/SerialDxe/SerialIo.c
View File

@ -167,7 +167,7 @@ SerialWrite (
}
/**
Writes data to a serial device.
Reads data from a serial device.
@param This Protocol instance pointer.
@param BufferSize On input, the size of the Buffer. On output, the amount of
@ -192,12 +192,13 @@ SerialRead (
if (SerialPortPoll()) {
Count = SerialPortRead (Buffer, *BufferSize);
*BufferSize = Count;
return (Count == 0) ? EFI_DEVICE_ERROR : EFI_SUCCESS;
}
// No data to return
*BufferSize = 0;
if (Count != *BufferSize) {
*BufferSize = Count;
return EFI_TIMEOUT;
}
return EFI_SUCCESS;
}