ncurses 5.3

[ncurses.git] / ncurses / tinfo / lib_baudrate.c

diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c
index 0d7fa27bcc3da457cec3b7097d8ddb65275ca9c0..5238924143672edd2407c3ef48f4003673324044 100644 (file)
--- a/ncurses/tinfo/lib_baudrate.c
+++ b/ncurses/tinfo/lib_baudrate.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000,2002 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -40,7 +40,43 @@
 #include <term.h>              /* cur_term, pad_char */
 #include <termcap.h>           /* ospeed */
 
-MODULE_ID("$Id: lib_baudrate.c,v 1.17 2000/10/08 00:59:08 tom Exp $")
+/*
+ * These systems use similar header files, which define B1200 as 1200, etc.,
+ * but can be overridden by defining USE_OLD_TTY so B1200 is 9, which makes all
+ * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
+ * ospeed's type for compatibility.
+ */
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#undef B0
+#undef B50
+#undef B75
+#undef B110
+#undef B134
+#undef B150
+#undef B200
+#undef B300
+#undef B600
+#undef B1200
+#undef B1800
+#undef B2400
+#undef B4800
+#undef B9600
+#undef B19200
+#undef EXTA
+#undef B38400
+#undef EXTB
+#undef B57600
+#undef B115200
+#undef B230400
+#undef B460800
+#undef B921600
+#define USE_OLD_TTY
+#include <sys/ttydev.h>
+#else
+#undef USE_OLD_TTY
+#endif /* USE_OLD_TTY */
+
+MODULE_ID("$Id: lib_baudrate.c,v 1.22 2002/01/19 23:07:53 Andrey.A.Chernov Exp $")
 
 /*
  *     int
@@ -51,8 +87,8 @@ MODULE_ID("$Id: lib_baudrate.c,v 1.17 2000/10/08 00:59:08 tom Exp $")
  */
 
 struct speed {
-    int s;     /* value for 'ospeed' is an index */
-    int sp;    /* the actual speed */
+    int s;                     /* value for 'ospeed' is an index */
+    int sp;                    /* the actual speed */
 };
 
 static struct speed const speeds[] =
@@ -97,9 +133,12 @@ static struct speed const speeds[] =
 #ifdef B460800
     {B460800, 460800},
 #endif
+#ifdef B921600
+    {B921600, 921600},
+#endif
 };
 
-int
+NCURSES_EXPORT(int)
 _nc_baudrate(int OSpeed)
 {
     static int last_OSpeed;
@@ -125,7 +164,7 @@ _nc_baudrate(int OSpeed)
     return (result);
 }
 
-int
+NCURSES_EXPORT(int)
 _nc_ospeed(int BaudRate)
 {
     int result = 1;
@@ -142,7 +181,7 @@ _nc_ospeed(int BaudRate)
     return (result);
 }
 
-int
+NCURSES_EXPORT(int)
 baudrate(void)
 {
     int result;
@@ -162,15 +201,20 @@ baudrate(void)
            ret = 9600;
        ospeed = _nc_ospeed(ret);
        returnCode(ret);
-    } else
+    }
 #endif
 
+#ifdef USE_OLD_TTY
+    result = cfgetospeed(&cur_term->Nttyb);
+    ospeed = _nc_ospeed(result);
+#else /* !USE_OLD_TTY */
 #ifdef TERMIOS
-       ospeed = cfgetospeed(&cur_term->Nttyb);
+    ospeed = cfgetospeed(&cur_term->Nttyb);
 #else
-       ospeed = cur_term->Nttyb.sg_ospeed;
+    ospeed = cur_term->Nttyb.sg_ospeed;
 #endif
     result = _nc_baudrate(ospeed);
+#endif
     if (cur_term != 0)
        cur_term->_baudrate = result;