>From 61b3f2d3eb0872105a356558bf2d630fb488a60a Mon Sep 17 00:00:00 2001
From: "Moroz.Oleg" <oleg.mo...@mcc.vniiem.ru>
Date: Wed, 1 Oct 2014 17:16:23 +0400
Subject: [PATCH] Fix assertion "BUF != NULL" for i386
BSP_uart_termios_write_com1 and BSP_uart_termios_write_com2
---
c/src/lib/libbsp/i386/shared/comm/uart.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c
index 3c4d42a..3552fe6 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.c
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.c
@@ -568,12 +568,13 @@ BSP_uart_termios_read_com2(int uart)
ssize_t
BSP_uart_termios_write_com1(int minor, const char *buf, size_t len)
{
+ if(len <= 0)
+ {
+ return 0;
+ }
assert(buf != NULL);
- if(len <= 0)
- {
- return 0;
- }
+
/* If there TX buffer is busy - something is royally screwed up */
assert((uread(BSP_UART_COM1, LSR) & THRE) != 0);
@@ -602,13 +603,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);
--
2.1.0
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
