From 1c6926c11f2e5efcb166c668b097d64a0321d66e Mon Sep 17 00:00:00 2001 From: Kevin Kirspel Date: Tue, 21 Mar 2017 15:39:48 -0400 Subject: termios: Synchronize with latest FreeBSD headers Adding modified FreeBSD headers to synchronize RTEMS termios with FreeBSD. Modify termios to support dedicated input and output baud for termios structure. Updated BSPs to use dedicated input and output baud in termios structure. Updated tools to use dedicated input and output baud in termios structure. Updated termios testsuites to use dedicated input and output baud in termios structure. Close #2897. --- c/src/lib/libbsp/powerpc/acinclude.m4 | 4 ++-- c/src/lib/libbsp/powerpc/gen5200/console/console.c | 2 +- c/src/lib/libbsp/powerpc/shared/console/console.c | 2 +- c/src/lib/libbsp/powerpc/tqm8xx/console/console.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/powerpc') diff --git a/c/src/lib/libbsp/powerpc/acinclude.m4 b/c/src/lib/libbsp/powerpc/acinclude.m4 index 4c83475dd8..edc67b5414 100644 --- a/c/src/lib/libbsp/powerpc/acinclude.m4 +++ b/c/src/lib/libbsp/powerpc/acinclude.m4 @@ -32,12 +32,12 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR], AC_CONFIG_SUBDIRS([t32mppc]);; tqm8xx ) AC_CONFIG_SUBDIRS([tqm8xx]);; - virtex ) - AC_CONFIG_SUBDIRS([virtex]);; virtex4 ) AC_CONFIG_SUBDIRS([virtex4]);; virtex5 ) AC_CONFIG_SUBDIRS([virtex5]);; + virtex ) + AC_CONFIG_SUBDIRS([virtex]);; *) AC_MSG_ERROR([Invalid BSP]);; esac diff --git a/c/src/lib/libbsp/powerpc/gen5200/console/console.c b/c/src/lib/libbsp/powerpc/gen5200/console/console.c index 26f5558a91..754a52789a 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c +++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c @@ -192,7 +192,7 @@ static int mpc5200_psc_setAttributes( (struct mpc5200_psc *)(&mpc5200.psc[psc_minor_to_regset[minor]]); /* Baud rate */ - baud = rtems_termios_baud_to_number(t->c_cflag & CBAUD); + baud = rtems_termios_baud_to_number(t->c_ospeed); if (baud > 0) { /* * Calculate baud rate diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c index 082cbd9e17..f275683cc2 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/console.c +++ b/c/src/lib/libbsp/powerpc/shared/console/console.c @@ -304,7 +304,7 @@ static int conSetAttr( { rtems_termios_baud_t baud; - baud = rtems_termios_baud_to_number(t->c_cflag & CBAUD); + baud = rtems_termios_baud_to_number(t->c_ospeed); if ( baud > 115200 ) rtems_fatal_error_occurred (RTEMS_INTERNAL_ERROR); diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c index e0b4c70677..e109303f18 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c +++ b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c @@ -392,7 +392,7 @@ sccSetAttributes (int minor, const struct termios *t) { int baud; - switch (t->c_cflag & CBAUD) { + switch (t->c_ospeed) { default: baud = -1; break; case B50: baud = 50; break; case B75: baud = 75; break; -- cgit v1.2.3