RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

powerpc/shared/console: Fix warnings

Browse Source
This commit is contained in:
Joel Sherrill
2014-10-12 10:07:07 -05:00
parent 59888da70a
commit 9ca6799b0e
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/powerpc/shared/console/console.c
View File

@@ -148,6 +148,7 @@ rtems_device_driver console_initialize(
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} /* console_initialize */ } /* console_initialize */
#if !defined(USE_POLLED_IO)
static int console_first_open(int major, int minor, void *arg) static int console_first_open(int major, int minor, void *arg)
{ {
rtems_status_code status; rtems_status_code status;
@@ -174,12 +175,15 @@ static int console_first_open(int major, int minor, void *arg)
return 0; return 0;
} }
#endif
#if !defined(USE_POLLED_IO)
static int console_last_close(int major, int minor, void *arg) static int console_last_close(int major, int minor, void *arg)
{ {
BSP_uart_remove_isr(minor, ttyS[minor].isr); BSP_uart_remove_isr(minor, ttyS[minor].isr);
return 0; return 0;
} }
#endif
/*-------------------------------------------------------------------------+ /*-------------------------------------------------------------------------+
| Console device driver OPEN entry point | Console device driver OPEN entry point

35
c/src/lib/libbsp/powerpc/shared/console/uart.c
View File

@@ -82,8 +82,7 @@ uwrite(int uart, int reg, unsigned int val)
} }
#ifdef UARTDEBUG static void
static void
uartError(int uart, void *termiosPrivate) uartError(int uart, void *termiosPrivate)
{ {
unsigned char uartStatus, dummy; unsigned char uartStatus, dummy;
@@ -92,6 +91,7 @@ uartError(int uart, void *termiosPrivate)
uartStatus = uread(uart, LSR); uartStatus = uread(uart, LSR);
dummy = uread(uart, RBR); dummy = uread(uart, RBR);
#ifdef UARTDEBUG
if (uartStatus & OE) if (uartStatus & OE)
printk("********* Over run Error **********\n"); printk("********* Over run Error **********\n");
if (uartStatus & PE) if (uartStatus & PE)
@@ -100,32 +100,18 @@ uartError(int uart, void *termiosPrivate)
printk("********* Framing Error **********\n"); printk("********* Framing Error **********\n");
if (uartStatus & BI) { if (uartStatus & BI) {
printk("********* BREAK INTERRUPT *********\n"); printk("********* BREAK INTERRUPT *********\n");
if ((h=uart_data[uart].breakCallback.handler)) #endif
h(uart, if ((h=uart_data[uart].breakCallback.handler)) {
(dummy<<8)|uartStatus, h(uart,
termiosPrivate, (dummy<<8)|uartStatus,
uart_data[uart].breakCallback.private); termiosPrivate,
uart_data[uart].breakCallback.private);
} }
#ifdef UARTDEBUG
if (uartStatus & ERFIFO) if (uartStatus & ERFIFO)
printk("********* Error receive Fifo **********\n"); printk("********* Error receive Fifo **********\n");
}
#else
inline void uartError(int uart, void *termiosPrivate)
{
unsigned char uartStatus,dummy;
BSP_UartBreakCbProc h;
uartStatus = uread(uart, LSR);
dummy = uread(uart, RBR);
if ((uartStatus & BI) && (h=uart_data[uart].breakCallback.handler))
h(uart,
(dummy<<8)|uartStatus,
termiosPrivate,
uart_data[uart].breakCallback.private);
}
#endif #endif
}
/* /*
* Uart initialization, it is hardcoded to 8 bit, no parity, * Uart initialization, it is hardcoded to 8 bit, no parity,
@@ -197,6 +183,7 @@ BSP_uart_init(int uart, int baud, int hwFlow)
tmp = uread(uart, LSR); tmp = uread(uart, LSR);
tmp = uread(uart, RBR); tmp = uread(uart, RBR);
tmp = uread(uart, MSR); tmp = uread(uart, MSR);
(void) tmp; /* avoid set but not used warning */
/* Remember state */ /* Remember state */
uart_data[uart].hwFlow = hwFlow; uart_data[uart].hwFlow = hwFlow;