X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fspeed_table.c;h=6137b7731edbefeb6c00205b0cd9c963e2b33a14;hb=1cca9484db69971f652dfef48778da0dc56dad12;hp=b4d576b4cfbc171b69c0749fc58b49dc1246d506;hpb=b000586d0214491c2b81683c144bdc2bf923612b;p=oweals%2Fbusybox.git

diff --git a/libbb/speed_table.c b/libbb/speed_table.c
index b4d576b4c..6137b7731 100644
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -4,20 +4,7 @@
  *
  * 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>
@@ -43,12 +30,12 @@ static const struct speed_map speeds[] = {
 	{B2400, 2400},
 	{B4800, 4800},
 	{B9600, 9600},
-#ifdef B19200
+#ifdef	B19200
 	{B19200, 19200},
 #elif defined(EXTA)
 	{EXTA, 19200},
 #endif
-#ifdef B38400
+#ifdef	B38400
 	{B38400, 38400/256 + 0x8000U},
 #elif defined(EXTB)
 	{EXTB, 38400/256 + 0x8000U},
@@ -65,44 +52,11 @@ static const struct speed_map speeds[] = {
 #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
 };
 
 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;
 
@@ -118,12 +72,12 @@ unsigned long bb_baud_to_value(speed_t speed)
 	return 0;
 }
 
-speed_t bb_value_to_baud(unsigned long value)
+speed_t tty_value_to_baud(unsigned int value)
 {
 	int i = 0;
 
 	do {
-		if (value == bb_baud_to_value(speeds[i].speed)) {
+		if (value == tty_baud_to_value(speeds[i].speed)) {
 			return speeds[i].speed;
 		}
 	} while (++i < NUM_SPEEDS);
@@ -141,7 +95,7 @@ int main(void)
 	speed_t s;
 
 	for (v = 0 ; v < 500000 ; v++) {
-		s = bb_value_to_baud(v);
+		s = tty_value_to_baud(v);
 		if (s == (speed_t) -1) {
 			continue;
 		}
@@ -151,7 +105,7 @@ int main(void)
 	printf("-------------------------------\n");
 
 	for (s = 0 ; s < 010017+1 ; s++) {
-		v = bb_baud_to_value(s);
+		v = tty_baud_to_value(s);
 		if (!v) {
 			continue;
 		}