Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

bsps/powerpc: Fix shared console driver

Browse Source 
The Termios modes are now an emum.  Do not use them in #if expressions.

Update #2762.
This commit is contained in:
Sebastian Huber
2016-07-19 09:42:26 +02:00
parent dc0f537b27
commit 7b24946c2b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <inttypes.h>
#include <bsp.h> #include <bsp.h>
#include <bsp/irq.h> #include <bsp/irq.h>
@@ -49,16 +49,12 @@ int BSPBaseBaud = BSP_UART_BAUD_BASE;
* we could even make it a link-time option (but that would require * we could even make it a link-time option (but that would require
* small changes)... * small changes)...
*/ */
#ifndef TERMIOS_OUTPUT_MODE #if defined(USE_POLLED_IO)
#if 1 #define TERMIOS_OUTPUT_MODE TERMIOS_POLLED
#define TERMIOS_OUTPUT_MODE TERMIOS_IRQ_DRIVEN #elif defined(USE_TASK_DRIVEN_IO)
#else
#define TERMIOS_OUTPUT_MODE TERMIOS_TASK_DRIVEN #define TERMIOS_OUTPUT_MODE TERMIOS_TASK_DRIVEN
#endif #else
#endif #define TERMIOS_OUTPUT_MODE TERMIOS_IRQ_DRIVEN
#if ! defined(USE_POLLED_IO) && (TERMIOS_OUTPUT_MODE == TERMIOS_POLLED)
#define USE_POLLED_IO
#endif #endif
/*-------------------------------------------------------------------------+ /*-------------------------------------------------------------------------+
@@ -132,7 +128,7 @@ rtems_device_driver console_initialize(
*/ */
status = rtems_io_register_name ((nm=ttyS[minor].name), major, minor); status = rtems_io_register_name ((nm=ttyS[minor].name), major, minor);
if ( RTEMS_SUCCESSFUL==status && BSPConsolePort == minor) { if ( RTEMS_SUCCESSFUL==status && BSPConsolePort == minor) {
printk("Registering /dev/console as minor %d (==%s)\n", printk("Registering /dev/console as minor %" PRIu32 " (==%s)\n",
minor, minor,
ttyS[minor].name); ttyS[minor].name);
/* also register an alias */ /* also register an alias */
@@ -211,7 +207,7 @@ rtems_device_driver console_open(
{ {
console_first_open, /* firstOpen */ console_first_open, /* firstOpen */
console_last_close, /* lastClose */ console_last_close, /* lastClose */
#if ( TERMIOS_OUTPUT_MODE == TERMIOS_TASK_DRIVEN ) #ifdef USE_TASK_DRIVEN_IO
BSP_uart_termios_read_com, /* pollRead */ BSP_uart_termios_read_com, /* pollRead */
#else #else
NULL, /* pollRead */ NULL, /* pollRead */