summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoroz.Oleg <oleg.moroz@mcc.vniiem.ru>2014-10-01 17:16:23 +0400
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-10-02 07:31:58 +0200
commit9a8b29848d82a16b1a4c979e1b72e6a986deecb6 (patch)
treeaed2e52ba6cbb6c31a44e0b02327a3ab5b8c112f
parentbsp/leon3: Replace the define LEON3_MP_IRQ with a weakly linked variable (diff)
downloadrtems-9a8b29848d82a16b1a4c979e1b72e6a986deecb6.tar.bz2
Fix assertion "BUF != NULL" for i386
BSP_uart_termios_write_com1 and BSP_uart_termios_write_com2
-rw-r--r--c/src/lib/libbsp/i386/shared/comm/uart.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c
index 3c4d42a604..72c7f36383 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.c
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.c
@@ -568,13 +568,13 @@ BSP_uart_termios_read_com2(int uart)
ssize_t
BSP_uart_termios_write_com1(int minor, const char *buf, size_t len)
{
- assert(buf != NULL);
-
if(len <= 0)
{
return 0;
}
+ assert(buf != NULL);
+
/* If there TX buffer is busy - something is royally screwed up */
assert((uread(BSP_UART_COM1, LSR) & THRE) != 0);
@@ -602,13 +602,13 @@ BSP_uart_termios_write_com1(int minor, const char *buf, size_t len)
ssize_t
BSP_uart_termios_write_com2(int minor, const char *buf, size_t len)
{
- assert(buf != NULL);
-
if(len <= 0)
{
return 0;
}
+ assert(buf != NULL);
+
/* If there TX buffer is busy - something is royally screwed up */
assert((uread(BSP_UART_COM2, LSR) & THRE) != 0);