diff options
| -rw-r--r-- | coreutils/stty.c | 4 | ||||
| -rw-r--r-- | include/libbb.h | 4 | ||||
| -rw-r--r-- | libbb/speed_table.c | 158 | ||||
| -rw-r--r-- | loginutils/getty.c | 2 |
4 files changed, 22 insertions, 146 deletions
diff --git a/coreutils/stty.c b/coreutils/stty.c index cfb7f7f..b78368e 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c @@ -1190,7 +1190,7 @@ static void display_speed(struct termios *mode, int fancy) if (fancy) { fmt_str += 9; } - wrapf(fmt_str, bb_baud_to_value(ispeed), bb_baud_to_value(ospeed)); + wrapf(fmt_str, tty_baud_to_value(ispeed), tty_baud_to_value(ospeed)); if (!fancy) current_col = 0; } @@ -1239,7 +1239,7 @@ static int recover_mode(char *arg, struct termios *mode) static speed_t string_to_baud(const char *arg) { - return bb_value_to_baud(bb_xparse_number(arg, 0)); + return tty_value_to_baud(bb_xparse_number(arg, 0)); } static void sane_mode(struct termios *mode) diff --git a/include/libbb.h b/include/libbb.h index e9d7e75..bc886da 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -140,8 +140,8 @@ extern int recursive_action(const char *fileName, int recurse, extern int bb_parse_mode( const char* s, mode_t* theMode); extern long bb_xgetlarg(const char *arg, int base, long lower, long upper); -extern unsigned long bb_baud_to_value(speed_t speed); -extern speed_t bb_value_to_baud(unsigned long value); +extern unsigned int tty_baud_to_value(speed_t speed); +extern speed_t tty_value_to_baud(unsigned int value); extern int get_linux_version_code(void); diff --git a/libbb/speed_table.c b/libbb/speed_table.c index b4d576b..d6073f1 100644 --- a/libbb/speed_table.c +++ b/libbb/speed_table.c @@ -4,160 +4,36 @@ * * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <termios.h> #include "libbb.h" -struct speed_map { - unsigned short speed; - unsigned short value; -}; - -static const struct speed_map speeds[] = { - {B0, 0}, - {B50, 50}, - {B75, 75}, - {B110, 110}, - {B134, 134}, - {B150, 150}, - {B200, 200}, - {B300, 300}, - {B600, 600}, - {B1200, 1200}, - {B1800, 1800}, - {B2400, 2400}, - {B4800, 4800}, - {B9600, 9600}, -#ifdef B19200 - {B19200, 19200}, -#elif defined(EXTA) - {EXTA, 19200}, -#endif -#ifdef B38400 - {B38400, 38400/256 + 0x8000U}, -#elif defined(EXTB) - {EXTB, 38400/256 + 0x8000U}, -#endif -#ifdef B57600 - {B57600, 57600/256 + 0x8000U}, -#endif -#ifdef B115200 - {B115200, 115200/256 + 0x8000U}, -#endif -#ifdef B230400 - {B230400, 230400/256 + 0x8000U}, -#endif -#ifdef B460800 - {B460800, 460800/256 + 0x8000U}, -#endif -#ifdef B500000 - {B500000, 500000/256 + 0x8000U}, -#endif -#ifdef B576000 - {B576000, 576000/256 + 0x8000U}, -#endif -#ifdef B921600 - {B921600, 921600/256 + 0x8000U}, -#endif -#ifdef B1000000 - {B1000000, 1000000/256 + 0x8000U}, -#endif -#ifdef B1152000 - {B1152000, 1152000/256 + 0x8000U}, -#endif -#ifdef B1500000 - {B1500000, 1500000/256 + 0x8000U}, -#endif -#ifdef B2000000 - {B2000000, 2000000/256 + 0x8000U}, -#endif -#ifdef B2500000 - {B2500000, 2500000/256 + 0x8000U}, -#endif -#ifdef B3000000 - {B3000000, 3000000/256 + 0x8000U}, -#endif -#ifdef B3500000 - {B3500000, 3500000/256 + 0x8000U}, -#endif -#ifdef B4000000 - {B4000000, 4000000/256 + 0x8000U}, -#endif +static const unsigned short speeds[] = { + 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, + 19200, 38400, 57600>>8, 115200>>8, 230400>>8, 460800>>8, 500000>>8, + 576000>>8, 921600>>8, 1000000>>8, 1152000>>8, 1500000>>8, 2000000>>8, + 3000000>>8, 3500000>>8, 4000000>>8 }; -enum { NUM_SPEEDS = (sizeof(speeds) / sizeof(struct speed_map)) }; - -unsigned long bb_baud_to_value(speed_t speed) +unsigned int tty_baud_to_value(speed_t speed) { - int i = 0; + int i; - do { - if (speed == speeds[i].speed) { - if (speeds[i].value & 0x8000U) { - return ((unsigned long) (speeds[i].value) & 0x7fffU) * 256; - } - return speeds[i].value; - } - } while (++i < NUM_SPEEDS); + for (i=0; i<sizeof(speeds) / sizeof(*speeds); i++) + if (speed == speeds[i] * (i>15 ? 256 : 1)) + return i>15 ? (i+4096-14) : i; return 0; } -speed_t bb_value_to_baud(unsigned long value) +speed_t tty_value_to_baud(unsigned int value) { - int i = 0; + int i; - do { - if (value == bb_baud_to_value(speeds[i].speed)) { - return speeds[i].speed; - } - } while (++i < NUM_SPEEDS); - - return (speed_t) - 1; -} + for (i=0; i<sizeof(speeds) / sizeof(*speeds); i++) + if (value == (i>15 ? (i+4096-14) : i)) + return speeds[i] * (i>15 ? 256 : 1); -#if 0 -/* testing code */ -#include <stdio.h> - -int main(void) -{ - unsigned long v; - speed_t s; - - for (v = 0 ; v < 500000 ; v++) { - s = bb_value_to_baud(v); - if (s == (speed_t) -1) { - continue; - } - printf("v = %lu -- s = %0lo\n", v, (unsigned long) s); - } - - printf("-------------------------------\n"); - - for (s = 0 ; s < 010017+1 ; s++) { - v = bb_baud_to_value(s); - if (!v) { - continue; - } - printf("v = %lu -- s = %0lo\n", v, (unsigned long) s); - } - - return 0; + return -1; } -#endif diff --git a/loginutils/getty.c b/loginutils/getty.c index 11eb5a0..e68f2cd 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -287,7 +287,7 @@ static int bcode(const char *s) if (safe_strtoul((char *)s, &value)) { return -1; } - if ((r = bb_value_to_baud(value)) > 0) { + if ((r = tty_value_to_baud(value)) > 0) { return r; } return 0; |