aboutsummaryrefslogtreecommitdiffstats
path: root/src/tty.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tty.c')
-rw-r--r--src/tty.c396
1 files changed, 213 insertions, 183 deletions
diff --git a/src/tty.c b/src/tty.c
index 505e70c..95e298a 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.28 2012/06/22 10:22:25 james
+ * *** empty log message ***
+ *
* Revision 1.27 2010/07/27 14:49:35 james
* add support for byte logging
*
@@ -93,84 +96,85 @@ static char rcsid[] = "$Id$";
static int
speed_t_to_baud (speed_t s)
{
- switch (s) {
+ switch (s)
+ {
#ifdef B0
- case B0:
- return 0;
+ case B0:
+ return 0;
#endif
#ifdef B50
- case B50:
- return 50;
+ case B50:
+ return 50;
#endif
#ifdef B75
- case B75:
- return 75;
+ case B75:
+ return 75;
#endif
#ifdef B110
- case B110:
- return 110;
+ case B110:
+ return 110;
#endif
#ifdef B134
- case B134:
- return 134;
+ case B134:
+ return 134;
#endif
#ifdef B150
- case B150:
- return 150;
+ case B150:
+ return 150;
#endif
#ifdef B200
- case B200:
- return 200;
+ case B200:
+ return 200;
#endif
#ifdef B300
- case B300:
- return 300;
+ case B300:
+ return 300;
#endif
#ifdef B600
- case B600:
- return 600;
+ case B600:
+ return 600;
#endif
#ifdef B1200
- case B1200:
- return 1200;
+ case B1200:
+ return 1200;
#endif
#ifdef B1800
- case B1800:
- return 1800;
+ case B1800:
+ return 1800;
#endif
#ifdef B2400
- case B2400:
- return 2400;
+ case B2400:
+ return 2400;
#endif
#ifdef B4800
- case B4800:
- return 4800;
+ case B4800:
+ return 4800;
#endif
#ifdef B9600
- case B9600:
- return 9600;
+ case B9600:
+ return 9600;
#endif
#ifdef B19200
- case B19200:
- return 19200;
+ case B19200:
+ return 19200;
#endif
#ifdef B38400
- case B38400:
- return 38400;
+ case B38400:
+ return 38400;
#endif
#ifdef B57600
- case B57600:
- return 57600;
+ case B57600:
+ return 57600;
#endif
#ifdef B115200
- case B115200:
- return 115200;
+ case B115200:
+ return 115200;
#endif
#ifdef B230400
- case B230400:
- return 230400;
+ case B230400:
+ return 230400;
#endif
- }
+ }
return -1;
}
@@ -178,84 +182,85 @@ speed_t_to_baud (speed_t s)
static speed_t
baud_to_speed_t (int baud)
{
- switch (baud) {
+ switch (baud)
+ {
#ifdef B0
- case 0:
- return B0;
+ case 0:
+ return B0;
#endif
#ifdef B50
- case 50:
- return B50;
+ case 50:
+ return B50;
#endif
#ifdef B75
- case 75:
- return B75;
+ case 75:
+ return B75;
#endif
#ifdef B110
- case 110:
- return B110;
+ case 110:
+ return B110;
#endif
#ifdef B134
- case 134:
- return B134;
+ case 134:
+ return B134;
#endif
#ifdef B150
- case 150:
- return B150;
+ case 150:
+ return B150;
#endif
#ifdef B200
- case 200:
- return B200;
+ case 200:
+ return B200;
#endif
#ifdef B300
- case 300:
- return B300;
+ case 300:
+ return B300;
#endif
#ifdef B600
- case 600:
- return B600;
+ case 600:
+ return B600;
#endif
#ifdef B1200
- case 1200:
- return B1200;
+ case 1200:
+ return B1200;
#endif
#ifdef B1800
- case 1800:
- return B1800;
+ case 1800:
+ return B1800;
#endif
#ifdef B2400
- case 2400:
- return B2400;
+ case 2400:
+ return B2400;
#endif
#ifdef B4800
- case 4800:
- return B4800;
+ case 4800:
+ return B4800;
#endif
#ifdef B9600
- case 9600:
- return B9600;
+ case 9600:
+ return B9600;
#endif
#ifdef B19200
- case 19200:
- return B19200;
+ case 19200:
+ return B19200;
#endif
#ifdef B38400
- case 38400:
- return B38400;
+ case 38400:
+ return B38400;
#endif
#ifdef B57600
- case 57600:
- return B57600;
+ case 57600:
+ return B57600;
#endif
#ifdef B115200
- case 115200:
- return B115200;
+ case 115200:
+ return B115200;
#endif
#ifdef B230400
- case 230400:
- return B230400;
+ case 230400:
+ return B230400;
#endif
- }
+ }
return -1;
}
@@ -265,16 +270,18 @@ tty_pre_select (TTY * t, fd_set * rfds, fd_set * wfds)
int line;
struct timeval now, dif;
- if (t->hanging_up) {
-
- gettimeofday (&now, NULL);
- timersub (&now, &t->hangup_clock, &dif);
- if (dif.tv_sec) {
- line = TIOCM_DTR;
- ioctl (t->rfd, TIOCMBIS, &line);
- t->hanging_up = 0;
+ if (t->hanging_up)
+ {
+
+ gettimeofday (&now, NULL);
+ timersub (&now, &t->hangup_clock, &dif);
+ if (dif.tv_sec)
+ {
+ line = TIOCM_DTR;
+ ioctl (t->rfd, TIOCMBIS, &line);
+ t->hanging_up = 0;
+ }
}
- }
FD_SET (t->rfd, rfds);
@@ -302,7 +309,7 @@ tty_get_baud (TTY * t)
struct termios tios = { 0 };
if (tcgetattr (t->rfd, &tios))
- return;
+ return 0;
return speed_t_to_baud (cfgetispeed (&tios));
}
@@ -383,7 +390,8 @@ tty_winch (TTY * t, CRT_Pos size)
#if 0
-typedef struct {
+typedef struct
+{
int in_dle;
int in_errmark;
@@ -394,14 +402,14 @@ typedef struct {
#define DLE 0377
#define bit(p,b,z,o) \
do { \
- if ((b && z)) { \
- p->bitfreq[z]++; \
+ if (((b) && z)) { \
+ (p)->bitfreq[(z)]++; \
z = 0; \
} \
\
- if ((!b && o)) \
+ if ((!(b) && o)) \
{ \
- p->bitfreq[z]++; \
+ (p)->bitfreq[z]++; \
o = 0; \
} \
\
@@ -421,28 +429,31 @@ tty_bit_analyse (Context * c, int err, int ch)
bit (p, 0, zc, oc);
- for (d = 1; d < 0x100; d <<= 1) {
- bit (p, ch & d, zc, oc);
- }
+ for (d = 1; d < 0x100; d <<= 1)
+ {
+ bit (p, ch & d, zc, oc);
+ }
bit (p, 1, zc, oc);
- if (err) {
- p->biterrs++;
- gettimeofday (&p->lasterr, NULL);
- }
+ if (err)
+ {
+ p->biterrs++;
+ gettimeofday (&p->lasterr, NULL);
+ }
- if (p->biterrs) {
- log_f (c->l,
- "<tty_bit_analyse: 0%d%d%d%d%d%d%d%d1 [%d,%d,%d,%d,%d,%d,%d,%d,%d,%d]>",
- ch & 0x01 ? 1 : 0, ch & 0x02 ? 1 : 0, ch & 0x04 ? 1 : 0,
- ch & 0x08 ? 1 : 0, ch & 0x10 ? 1 : 0, ch & 0x20 ? 1 : 0,
- ch & 0x40 ? 1 : 0, ch & 0x80 ? 1 : 0, p->bitfreq[0],
- p->bitfreq[1], p->bitfreq[2], p->bitfreq[3], p->bitfreq[4],
- p->bitfreq[5], p->bitfreq[6], p->bitfreq[7], p->bitfreq[8],
- p->bitfreq[9]);
- }
+ if (p->biterrs)
+ {
+ log_f (c->l,
+ "<tty_bit_analyse: 0%d%d%d%d%d%d%d%d1 [%d,%d,%d,%d,%d,%d,%d,%d,%d,%d]>",
+ ch & 0x01 ? 1 : 0, ch & 0x02 ? 1 : 0, ch & 0x04 ? 1 : 0,
+ ch & 0x08 ? 1 : 0, ch & 0x10 ? 1 : 0, ch & 0x20 ? 1 : 0,
+ ch & 0x40 ? 1 : 0, ch & 0x80 ? 1 : 0, p->bitfreq[0],
+ p->bitfreq[1], p->bitfreq[2], p->bitfreq[3], p->bitfreq[4],
+ p->bitfreq[5], p->bitfreq[6], p->bitfreq[7], p->bitfreq[8],
+ p->bitfreq[9]);
+ }
}
@@ -462,54 +473,64 @@ tty_analyse (Context * c)
struct timeval now, dif;
int i, j, max;
- if (!p->biterrs) {
- p->guessed_baud = 0;
- return;
- }
+ if (!p->biterrs)
+ {
+ p->guessed_baud = 0;
+ return;
+ }
gettimeofday (&now, NULL);
timersub (&now, &p->lasterr, &dif);
- if (dif.tv_sec > 10) {
- tty_parse_reset (c);
- return;
- }
+ if (dif.tv_sec > 10)
+ {
+ tty_parse_reset (c);
+ return;
+ }
max = -1;
j = 0;
- for (i = 0; i < TTY_BITFREQ_LEN; ++i) {
- if (p->bitfreq[i] > max) {
- max = p->bitfreq[i];
- j = i;
+ for (i = 0; i < TTY_BITFREQ_LEN; ++i)
+ {
+ if (p->bitfreq[i] > max)
+ {
+ max = p->bitfreq[i];
+ j = i;
+ }
}
- }
if (c->t)
i = tty_get_baud (c->t);
else
i = -1;
- if (j == 1) {
- /* Closest bit edge is one bit, so the baud rate is too low */
- p->guessed_baud = -1;
+ if (j == 1)
+ {
+ /* Closest bit edge is one bit, so the baud rate is too low */
+ p->guessed_baud = -1;
- } else {
- if (i > 0 && j > 0)
- p->guessed_baud = i / j;
- else
- p->guessed_baud = 0;
+ }
+ else
+ {
+ if (i > 0 && j > 0)
+ p->guessed_baud = i / j;
+ else
+ p->guessed_baud = 0;
- }
+ }
- if (p->guessed_baud == -1) {
- log_f (c->l, "<tty_analyse: %6d errors, current rate %db is too low>",
- p->biterrs, i);
- } else {
- log_f (c->l, "<tty_analyse: %6d errors, current rate %db, suggest %db>",
- p->biterrs, i, p->guessed_baud);
- }
+ if (p->guessed_baud == -1)
+ {
+ log_f (c->l, "<tty_analyse: %6d errors, current rate %db is too low>",
+ p->biterrs, i);
+ }
+ else
+ {
+ log_f (c->l, "<tty_analyse: %6d errors, current rate %db, suggest %db>",
+ p->biterrs, i, p->guessed_baud);
+ }
}
@@ -533,48 +554,57 @@ tty_parse (Context * c, uint8_t * buf, int len)
p = c->tp;
- while (len--) {
-
- if (p->in_dle) {
- p->in_dle = 0;
- switch (*buf) {
- case DLE:
- tty_bit_analyse (c, 0, *buf);
- err += utf8_parse (c, *buf);
- break;
- case 0:
- p->in_errmark = 1;
- break;
- default:
- log_f (c->l, "%s:%d DLE parsing error: \\377 \\%03o", __FILE__,
- __LINE__, *buf);
- }
- } else if (p->in_errmark) {
- p->in_errmark = 0;
-
- log_f (c->l, "<tty reports error: \\377 \\000 \\%03o>",
- __FILE__, __LINE__, *buf);
-
- tty_bit_analyse (c, 1, *buf);
-
- tty_analyse (c);
-
- err += utf8_parse (c, *buf);
-
- err += utf8_parse (c, SYM_CHAR_RESET);
-
- } else if (*buf == DLE) {
- p->in_dle = 1;
-
- } else {
- tty_bit_analyse (c, 0, *buf);
-
- tty_analyse (c);
-
- err += utf8_parse (c, *buf);
-
+ while (len--)
+ {
+
+ if (p->in_dle)
+ {
+ p->in_dle = 0;
+ switch (*buf)
+ {
+ case DLE:
+ tty_bit_analyse (c, 0, *buf);
+ err += utf8_parse (c, *buf);
+ break;
+ case 0:
+ p->in_errmark = 1;
+ break;
+ default:
+ log_f (c->l, "%s:%d DLE parsing error: \\377 \\%03o", __FILE__,
+ __LINE__, *buf);
+ }
+ }
+ else if (p->in_errmark)
+ {
+ p->in_errmark = 0;
+
+ log_f (c->l, "<tty reports error: \\377 \\000 \\%03o>",
+ __FILE__, __LINE__, *buf);
+
+ tty_bit_analyse (c, 1, *buf);
+
+ tty_analyse (c);
+
+ err += utf8_parse (c, *buf);
+
+ err += utf8_parse (c, SYM_CHAR_RESET);
+
+ }
+ else if (*buf == DLE)
+ {
+ p->in_dle = 1;
+
+ }
+ else
+ {
+ tty_bit_analyse (c, 0, *buf);
+
+ tty_analyse (c);
+
+ err += utf8_parse (c, *buf);
+
+ }
+ buf++;
}
- buf++;
- }
return err;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 23:04:34 +0000