From 965ff443c8289ea7315725f02d276d5a65e62ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krystian=20Du=C5=BCy=C5=84ski?= Date: Wed, 12 Aug 2020 00:21:24 +0200 Subject: [PATCH 1/3] Remove unused resppause member --- src/cfg.c | 1 - src/cfg.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/cfg.c b/src/cfg.c index d28c99e..a7867c4 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -73,7 +73,6 @@ cfg_init(void) cfg.maxtry = DEFAULT_MAXTRY; cfg.rqstpause = DEFAULT_RQSTPAUSE; cfg.respwait = DEFAULT_RESPWAIT; - cfg.resppause = DV(3, DEFAULT_BITS_PER_CHAR, cfg.ttyspeed); cfg.conntimeout = DEFAULT_CONNTIMEOUT; } diff --git a/src/cfg.h b/src/cfg.h index 5f4be57..40d8af6 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -72,8 +72,6 @@ typedef struct unsigned long rqstpause; /* response waiting time (in msec) */ unsigned long respwait; - /* inter-byte response pause (in usec) */ - unsigned long resppause; } cfg_t; /* Prototypes */ From d24b257c133ccaaedbbf06196c64c36c9a01c65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krystian=20Du=C5=BCy=C5=84ski?= Date: Wed, 12 Aug 2020 00:24:11 +0200 Subject: [PATCH 2/3] Make use of baudrate 0 as indicator of default baudrate, show error when trying to use unsupported baudrate --- src/cfg.c | 2 +- src/tty.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cfg.c b/src/cfg.c index a7867c4..d5de585 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -61,7 +61,7 @@ cfg_init(void) strncpy(cfg.logname, LOGNAME, INTBUFSIZE); #endif strncpy(cfg.ttyport, DEFAULT_PORT, INTBUFSIZE); - cfg.ttyspeed = DEFAULT_SPEED; + cfg.ttyspeed = 0; strncpy(cfg.ttymode, DEFAULT_MODE, INTBUFSIZE); #ifdef TRXCTL cfg.trxcntl = TRX_ADDC; diff --git a/src/tty.c b/src/tty.c index cd2a869..09e3ffb 100644 --- a/src/tty.c +++ b/src/tty.c @@ -201,7 +201,7 @@ tty_transpeed(int speed) switch (speed) { case 0: - tspeed = B0; + tspeed = DEFAULT_BSPEED; break; #if defined(B50) case 50: @@ -312,8 +312,8 @@ tty_transpeed(int speed) break; #endif default: - tspeed = DEFAULT_BSPEED; - break; + logw(2, "unsupported baudrate (%d)", speed); + exit (-1); } return tspeed; } From 32344e5f9499cafe02d5785c74991403afd06499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krystian=20Du=C5=BCy=C5=84ski?= Date: Wed, 12 Aug 2020 00:35:02 +0200 Subject: [PATCH 3/3] Fix log message (baudrate to speed) --- src/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tty.c b/src/tty.c index 09e3ffb..3918534 100644 --- a/src/tty.c +++ b/src/tty.c @@ -312,7 +312,7 @@ tty_transpeed(int speed) break; #endif default: - logw(2, "unsupported baudrate (%d)", speed); + logw(2, "unsupported speed (%d)", speed); exit (-1); } return tspeed;