From 52c8df84cab07464271675fd822d37f2f3e860d2 Mon Sep 17 00:00:00 2001 From: Peter Dufault Date: Mon, 1 Oct 2012 15:43:22 +0200 Subject: bsp/mpc55xx: PR2077: Add BSP_DEFAULT_BAUD_RATE --- c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac | 4 ++++ c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c | 2 +- c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c | 5 ++++- c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac index a7b3f94e62..7cb99ff994 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac @@ -44,6 +44,10 @@ RTEMS_BSPOPTS_SET([MPC55XX_CONSOLE_MINOR],[*],[0]) RTEMS_BSPOPTS_HELP([MPC55XX_CONSOLE_MINOR], [determines which serial device will be registered as /dev/console]) +RTEMS_BSPOPTS_SET([BSP_DEFAULT_BAUD_RATE],[*],[115200]) +RTEMS_BSPOPTS_HELP([BSP_DEFAULT_BAUD_RATE], +[default console baud]) + RTEMS_BSPOPTS_SET([MPC55XX_ESCI_USE_INTERRUPTS],[*],[1]) RTEMS_BSPOPTS_HELP([MPC55XX_ESCI_USE_INTERRUPTS], [define to zero or one to disable or enable interrupts for the eSCI devices]) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c index 9aa19ac78a..83a4fa9f73 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c @@ -266,7 +266,7 @@ static int mpc55xx_esci_first_open(int major, int minor, void *arg) self->tty = tty; - rv = rtems_termios_set_initial_baud(tty, 115200); + rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE); if (rv != 0) { rtems_fatal_error_occurred(0xdeadbeef); } diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c index e6c2c587a2..ad3b5485e9 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c @@ -18,12 +18,15 @@ * http://www.rtems.com/license/LICENSE. */ +#include + +#include #include #include static const struct termios console_generic_termios = { - .c_cflag = CS8 | CREAD | CLOCAL | B115200 + .c_cflag = CS8 | CREAD | CLOCAL | __CONCAT(B, BSP_DEFAULT_BAUD_RATE) }; static void console_generic_char_out(char c) diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c index 54ac08ed56..e4039f384e 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c @@ -259,7 +259,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg) pcr.B.PA = self->tx_pa_value; self->tx_pcr_register->R = pcr.R; - rv = rtems_termios_set_initial_baud(tty, 115200); + rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE); if (rv != 0) { rtems_fatal_error_occurred(0xdeadbeef); } -- cgit v1.2.3