From f8359c993efa66813b42b29a572f2593d5513df9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 6 Sep 2007 15:41:37 +0000 Subject: [PATCH] 2007-09-06 Joel Sherrill * shared/uart/apbuart.c: Fix some warnings. --- c/src/lib/libbsp/sparc/ChangeLog | 4 ++++ c/src/lib/libbsp/sparc/shared/uart/apbuart.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog index 7ce4bf2f29..bf0e175e49 100644 --- a/c/src/lib/libbsp/sparc/ChangeLog +++ b/c/src/lib/libbsp/sparc/ChangeLog @@ -1,3 +1,7 @@ +2007-09-06 Joel Sherrill + + * shared/uart/apbuart.c: Fix some warnings. + 2007-09-06 Daniel Hellstrom New drivers: PCI, b1553BRM, SpaceWire(GRSPW), CAN (GRCAN,OC_CAN), diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c index f204d96162..8a04665a13 100644 --- a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c +++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c @@ -232,7 +232,7 @@ static void apbuart_interrupt_handler(rtems_vector_number v){ static void apbuart_interrupt(apbuart_priv *uart){ unsigned int status; int empty; - unsigned char c, *next_char; + unsigned char c, *next_char = NULL; int signal; /* Clear & record any error */ @@ -595,7 +595,7 @@ static rtems_device_driver apbuart_write(rtems_device_major_number major, rtems_ { rtems_libio_rw_args_t *rw_args; unsigned int count, oldLevel, ctrl; - unsigned char *buf; + char *buf; apbuart_priv *uart = &apbuarts[minor]; int direct=0; @@ -820,11 +820,11 @@ static rtems_device_driver apbuart_control(rtems_device_major_number major, rtem static apbuart_fifo *apbuart_fifo_create(int size){ apbuart_fifo *fifo; - fifo = (apbuart_fifo *) malloc( size + sizeof(apbuart_fifo)); - if ( fifo ){ + fifo = (apbuart_fifo *) malloc(size + sizeof(apbuart_fifo)); + if ( fifo ) { /* Init fifo */ fifo->size = size; - fifo->buf = (char *)(fifo+1); + fifo->buf = (unsigned char *)(fifo+1); fifo->tail = fifo->buf; fifo->head = fifo->buf; fifo->max = &fifo->buf[size-1];