Changeset c2a4b8bf in rtems

Timestamp:

Jul 19, 2016, 7:42:26 AM (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

a48c052

Parents:

8d785f7

Message:

bsps/powerpc: Fix shared console driver

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

Close #2762.

File:

• c/src/lib/libbsp/powerpc/shared/console/console.c (modified) (4 diffs)

c/src/lib/libbsp/powerpc/shared/console/console.c

@@ -23 +23 @@
 #include <stdlib.h>
 #include <assert.h>
-#include <stdlib.h>
+#include <inttypes.h>
 
 #include <bsp.h>
@@ -51 +51 @@
  * small changes)...
  */
-#ifndef TERMIOS_OUTPUT_MODE
-  #if 1
-    #define TERMIOS_OUTPUT_MODE TERMIOS_IRQ_DRIVEN
-  #else
-    #define TERMIOS_OUTPUT_MODE TERMIOS_TASK_DRIVEN
-  #endif
-#endif
-
-#if ! defined(USE_POLLED_IO) && (TERMIOS_OUTPUT_MODE == TERMIOS_POLLED)
-  #define USE_POLLED_IO
+#if defined(USE_POLLED_IO)
+  #define TERMIOS_OUTPUT_MODE TERMIOS_POLLED
+#elif defined(USE_TASK_DRIVEN_IO)
+  #define TERMIOS_OUTPUT_MODE TERMIOS_TASK_DRIVEN
+#else
+  #define TERMIOS_OUTPUT_MODE TERMIOS_IRQ_DRIVEN
 #endif
 
@@ -134 +130 @@
     status = rtems_io_register_name ((nm=ttyS[minor].name), major, 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,
               ttyS[minor].name);
@@ -213 +209 @@
      console_first_open,                /* firstOpen */
      console_last_close,                /* lastClose */
-#if ( TERMIOS_OUTPUT_MODE == TERMIOS_TASK_DRIVEN )
+#ifdef USE_TASK_DRIVEN_IO
      BSP_uart_termios_read_com,         /* pollRead */
 #else