From f176759649622f5adb069feaab03466d53da45f0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 5 Jun 2008 22:09:39 +0000 Subject: [PATCH] 2008-06-05 Joel Sherrill * console/console.c, include/m340uart.h: Use new shared termios_baud_to_number() routine. --- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/gen68340/console/console.c | 4 ++-- c/src/lib/libbsp/m68k/gen68340/include/m340uart.h | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 625083e4ec..890e69898c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,8 @@ +2008-06-05 Joel Sherrill + + * console/console.c, include/m340uart.h: Use new shared + termios_baud_to_number() routine. + 2008-05-23 Joel Sherrill * console/m340uart.c: Eliminate copies of switches to convert termios diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c index 7ff594826d..48a21be0b7 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c @@ -486,8 +486,8 @@ SetAttributes (int minor, const struct termios *t) isp = (t->c_cflag / (CIBAUD / CBAUD)) & CBAUD; /* convert it */ - ispeed = termios_baud_rates_equivalence(isp); - ospeed = termios_baud_rates_equivalence(osp); + ispeed = termios_baud_to_number(isp); + ospeed = termios_baud_to_number(osp); if (ispeed || ospeed) { /* update config table */ diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h index 6bf4a32d14..beade96da7 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h @@ -12,7 +12,7 @@ * e-mail: g_montel@yahoo.com * * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -80,7 +80,6 @@ Find_Right_m340_UART_Config(float ChannelA_ReceiverBaudRate, float ChannelA_Tran extern rtems_isr InterruptHandler (rtems_vector_number v); -extern float termios_baud_rates_equivalence ( int speed ) ; extern int dbugRead (int minor); extern int dbugWrite (int minor, const char *buf, int len);