2008-05-22 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libchip/Makefile.am: Move termios helper routines from libchip to
	libcsupport. Add routine which makes it easy for a termios device
	driver to inform termios of its default baud rate. This avoids
	inconsistencies in later termios settings changes.
	* libchip/serial/termios_baud2index.c,
	libchip/serial/termios_baud2num.c: Removed.

4 files changed, 11 insertions, 79 deletions

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index c64c7700ca..b4fc75c8bc 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-22	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libchip/Makefile.am: Move termios helper routines from libchip to
+	libcsupport. Add routine which makes it easy for a termios device
+	driver to inform termios of its default baud rate. This avoids
+	inconsistencies in later termios settings changes.
+	* libchip/serial/termios_baud2index.c,
+	libchip/serial/termios_baud2num.c: Removed.
+
 2008-05-15	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* aclocal/bsp-bootcards-handles-ram-allocation.m4: New file.
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index fc9da09a96..be75199876 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -96,9 +96,8 @@ libserialio_a_CPPFLAGS = $(AM_CPPFLAGS)
 libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
     serial/mc68681_reg.c serial/mc68681_reg2.c serial/mc68681_reg4.c \
     serial/mc68681_reg8.c serial/ns16550.c serial/z85c30.c \
-    serial/z85c30_reg.c serial/serprobe.c serial/termios_baud2index.c \
-    serial/termios_baud2num.c serial/mc68681_p.h serial/ns16550_p.h \
-    serial/z85c30_p.h
+    serial/z85c30_reg.c serial/serprobe.c serial/mc68681_p.h \
+    serial/ns16550_p.h serial/z85c30_p.h
 endif
 
 EXTRA_DIST += serial/README.mc68681 serial/README.ns16550 \
diff --git a/c/src/libchip/serial/termios_baud2index.c b/c/src/libchip/serial/termios_baud2index.c
deleted file mode 100644
index 4268af1781..0000000000
--- a/c/src/libchip/serial/termios_baud2index.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/termios.h>
-
-int termios_baud_to_index(
-  int termios_baud
-)
-{
-  int baud_index;
-
-  switch (termios_baud) {
-    case B0:        baud_index =  0;  break;
-    case B50:       baud_index =  1;  break;
-    case B75:       baud_index =  2;  break;
-    case B110:      baud_index =  3;  break;
-    case B134:      baud_index =  4;  break;
-    case B150:      baud_index =  5;  break;
-    case B200:      baud_index =  6;  break;
-    case B300:      baud_index =  7;  break;
-    case B600:      baud_index =  8;  break;
-    case B1200:     baud_index =  9;  break;
-    case B1800:     baud_index = 10;  break;
-    case B2400:     baud_index = 11;  break;
-    case B4800:     baud_index = 12;  break;
-    case B9600:     baud_index = 13;  break;
-    case B19200:    baud_index = 14;  break;
-    case B38400:    baud_index = 15;  break;
-    case B57600:    baud_index = 16;  break;
-    case B115200:   baud_index = 17;  break;
-    case B230400:   baud_index = 18;  break;
-    case B460800:   baud_index = 19;  break;
-    default:        baud_index = -1;  break;
-  }
-
-  return baud_index;
-}
diff --git a/c/src/libchip/serial/termios_baud2num.c b/c/src/libchip/serial/termios_baud2num.c
deleted file mode 100644
index 08632d1c97..0000000000
--- a/c/src/libchip/serial/termios_baud2num.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  $Id$
- */
-
-#include <sys/termios.h>
-
-int termios_baud_to_number(
-  int termios_baud
-)
-{
-  int baud;
-
-  switch (termios_baud) {
-    case B0:        baud =      0;  break;
-    case B50:       baud =     50;  break;
-    case B75:       baud =     75;  break;
-    case B110:      baud =    110;  break;
-    case B134:      baud =    135;  break;
-    case B150:      baud =    150;  break;
-    case B200:      baud =    200;  break;
-    case B300:      baud =    300;  break;
-    case B600:      baud =    600;  break;
-    case B1200:     baud =   1200;  break;
-    case B1800:     baud =   1800;  break;
-    case B2400:     baud =   2400;  break;
-    case B4800:     baud =   4800;  break;
-    case B9600:     baud =   9600;  break;
-    case B19200:    baud =  19200;  break;
-    case B38400:    baud =  38400;  break;
-    case B57600:    baud =  57600;  break;
-    case B115200:   baud = 115200;  break;
-    case B230400:   baud = 230400;  break;
-    case B460800:   baud = 460800;  break;
-    default:        baud =     -1;  break;
-  }
-
-  return baud;
-}