From 1245fbd2a8d60bab7b16b8a1d3c0122fee72f53f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 00:57:38 +0200 Subject: Nuke trailing whitespace. Signed-off-by: Ralf Baechle --- netrom/nrsdrv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'netrom/nrsdrv.c') diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 92b3d6a..4383f84 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -145,7 +145,7 @@ static void nrs_esc(unsigned char *s, int len) *ptr++ = c; break; } - + csum += c; } @@ -192,7 +192,7 @@ static void kiss_esc(unsigned char *s, int len) static void nrs_unesc(unsigned char *buffer, int len) { int i; - + for (i = 0; i < len; i++) { switch (nrs_state) { case NRS_WAIT: @@ -204,7 +204,7 @@ static void nrs_unesc(unsigned char *buffer, int len) break; case NRS_DATA: - switch (buffer[i]) { + switch (buffer[i]) { case STX: /* !! */ nrs_rxcount = 0; nrs_cksum = 0; @@ -225,7 +225,7 @@ static void nrs_unesc(unsigned char *buffer, int len) break; case NRS_ESCAPE: - nrs_state = NRS_DATA; + nrs_state = NRS_DATA; if (nrs_rxcount < 512) { nrs_cksum += buffer[i]; nrs_rxbuffer[nrs_rxcount++] = buffer[i]; @@ -246,7 +246,7 @@ static void nrs_unesc(unsigned char *buffer, int len) static void kiss_unesc(unsigned char *buffer, int len) { int i; - + for (i = 0; i < len; i++) { switch (kiss_state) { case KISS_WAIT: @@ -267,7 +267,7 @@ static void kiss_unesc(unsigned char *buffer, int len) break; case KISS_DATA: - switch (buffer[i]) { + switch (buffer[i]) { case FEND: if (kiss_rxcount > 2) nrs_esc(kiss_rxbuffer, kiss_rxcount); @@ -336,7 +336,7 @@ int main(int argc, char *argv[]) } if (debugging) { - fprintf(stderr,"Flow control %s\n", + fprintf(stderr,"Flow control %s\n", flowcontrol ? "enabled" : "disabled"); } @@ -399,7 +399,7 @@ int main(int argc, char *argv[]) openlog("nrsdrv", LOG_PID, LOG_DAEMON); syslog(LOG_INFO, "KISS device %s connected to NRS device %s\n", argv[optind + 0], argv[optind + 1]); } - + signal(SIGHUP, SIG_IGN); signal(SIGTERM, terminate); @@ -421,7 +421,7 @@ int main(int argc, char *argv[]) for (;;) { FD_ZERO(&read_fd); - + FD_SET(kissfd, &read_fd); FD_SET(nrsfd, &read_fd); @@ -437,7 +437,7 @@ int main(int argc, char *argv[]) } kiss_unesc(buffer, n); } - + if (FD_ISSET(nrsfd, &read_fd)) { if ((n = read(nrsfd, buffer, 512)) <= 0) { if (logging) { -- cgit v1.2.3 From 5feb3d651dbd1b096a26963bd1dffcfe0a5f9eea Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:42:05 +0200 Subject: Remove useless initializations to 0 or NULL. They only inflate the .data section of the binary. Initializations to FALSE are still left to do. Signed-off-by: Ralf Baechle --- netrom/nrsdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'netrom/nrsdrv.c') diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 4383f84..c58c13f 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -39,10 +39,10 @@ static char *kissdev, *nrsdev; #define NRS_CKSUM 3 static int nrs_state = NRS_WAIT; -static unsigned char nrs_cksum = 0; +static unsigned char nrs_cksum; static unsigned char nrs_rxbuffer[512]; -static int nrs_rxcount = 0; +static int nrs_rxcount; #define FEND 0300 #define FESC 0333 @@ -56,7 +56,7 @@ static int nrs_rxcount = 0; static int kiss_state = KISS_WAIT; static unsigned char kiss_rxbuffer[512]; -static int kiss_rxcount = 0; +static int kiss_rxcount; static void terminate(int sig) { -- cgit v1.2.3 From 90f6ab2eceada8987fc6e5017ae415eade165c00 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:47:40 +0200 Subject: Use tabs for indentation, not spaces. Signed-off-by: Ralf Baechle --- netrom/nrsdrv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'netrom/nrsdrv.c') diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index c58c13f..52ad0a4 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -81,16 +81,16 @@ static void key_rts(int fd) /* Wait for CTS to be low */ while (1) { /* Get CTS status */ - if (ioctl(fd, TIOCMGET, &status) < 0) { + if (ioctl(fd, TIOCMGET, &status) < 0) { syslog(LOG_INFO|LOG_ERR, "TIOCMGET failed: flowcontrol disabled (%m)\n"); flowcontrol = 0; - return; - } + return; + } if (status & TIOCM_CTS) { if (debugging) { fprintf(stderr,"CTS high: waiting\n"); } - ioctl(fd, TIOCMIWAIT, &status); + ioctl(fd, TIOCMIWAIT, &status); } else { break; } @@ -100,10 +100,10 @@ static void key_rts(int fd) fprintf(stderr,"CTS low: keying RTS\n"); } status |= TIOCM_RTS | TIOCM_DTR; - if (ioctl(fd, TIOCMSET, &status) < 0) { + if (ioctl(fd, TIOCMSET, &status) < 0) { syslog(LOG_INFO|LOG_ERR, "TIOCMGET failed: flowcontrol disabled (%m)\n"); flowcontrol = 0; - } + } } static void unkey_rts(int fd) @@ -116,13 +116,13 @@ static void unkey_rts(int fd) if (debugging) { fprintf(stderr,"Transmission finished: unkeying RTS\n"); } - ioctl(fd, TIOCMGET, &status); + ioctl(fd, TIOCMGET, &status); status &= ~TIOCM_RTS; - status |= TIOCM_DTR; - if (ioctl(fd, TIOCMSET, &status) < 0) { + status |= TIOCM_DTR; + if (ioctl(fd, TIOCMSET, &status) < 0) { syslog(LOG_INFO|LOG_ERR, "TIOCMGET failed: flowcontrol disabled (%m)\n"); flowcontrol = 0; - } + } } static void nrs_esc(unsigned char *s, int len) -- cgit v1.2.3 From f76e0b330f0be28f9f3af3073904ede3a34d48f5 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 15:34:56 +0200 Subject: Reformat consistently. Strictly whitespace changes only. Indentation by tabs only. Move case labels in switches are on the same level as the switch keyword. Signed-off-by: Ralf Baechle --- netrom/nrsdrv.c | 238 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 119 insertions(+), 119 deletions(-) (limited to 'netrom/nrsdrv.c') diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 52ad0a4..d5979d2 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -136,14 +136,14 @@ static void nrs_esc(unsigned char *s, int len) while (len-- > 0) { switch (c = *s++) { - case STX: - case ETX: - case DLE: - *ptr++ = DLE; - /* Fall through */ - default: - *ptr++ = c; - break; + case STX: + case ETX: + case DLE: + *ptr++ = DLE; + /* Fall through */ + default: + *ptr++ = c; + break; } csum += c; @@ -170,17 +170,17 @@ static void kiss_esc(unsigned char *s, int len) while (len-- > 0) { switch (c = *s++) { - case FESC: - *ptr++ = FESC; - *ptr++ = FESCESC; - break; - case FEND: - *ptr++ = FESC; - *ptr++ = FESCEND; - break; - default: - *ptr++ = c; - break; + case FESC: + *ptr++ = FESC; + *ptr++ = FESCESC; + break; + case FEND: + *ptr++ = FESC; + *ptr++ = FESCEND; + break; + default: + *ptr++ = c; + break; } } @@ -195,50 +195,50 @@ static void nrs_unesc(unsigned char *buffer, int len) for (i = 0; i < len; i++) { switch (nrs_state) { - case NRS_WAIT: - if (buffer[i] == STX) { - nrs_state = NRS_DATA; - nrs_rxcount = 0; - nrs_cksum = 0; - } - break; + case NRS_WAIT: + if (buffer[i] == STX) { + nrs_state = NRS_DATA; + nrs_rxcount = 0; + nrs_cksum = 0; + } + break; - case NRS_DATA: - switch (buffer[i]) { - case STX: /* !! */ - nrs_rxcount = 0; - nrs_cksum = 0; - break; - case DLE: - nrs_state = NRS_ESCAPE; - break; - case ETX: - nrs_state = NRS_CKSUM; - break; - default: - if (nrs_rxcount < 512) { - nrs_cksum += buffer[i]; - nrs_rxbuffer[nrs_rxcount++] = buffer[i]; - } - break; - } + case NRS_DATA: + switch (buffer[i]) { + case STX: /* !! */ + nrs_rxcount = 0; + nrs_cksum = 0; break; - - case NRS_ESCAPE: - nrs_state = NRS_DATA; + case DLE: + nrs_state = NRS_ESCAPE; + break; + case ETX: + nrs_state = NRS_CKSUM; + break; + default: if (nrs_rxcount < 512) { nrs_cksum += buffer[i]; nrs_rxbuffer[nrs_rxcount++] = buffer[i]; } break; + } + break; - case NRS_CKSUM: - if (buffer[i] == nrs_cksum) - kiss_esc(nrs_rxbuffer, nrs_rxcount); - nrs_state = NRS_WAIT; - nrs_cksum = 0; - nrs_rxcount = 0; - break; + case NRS_ESCAPE: + nrs_state = NRS_DATA; + if (nrs_rxcount < 512) { + nrs_cksum += buffer[i]; + nrs_rxbuffer[nrs_rxcount++] = buffer[i]; + } + break; + + case NRS_CKSUM: + if (buffer[i] == nrs_cksum) + kiss_esc(nrs_rxbuffer, nrs_rxcount); + nrs_state = NRS_WAIT; + nrs_cksum = 0; + nrs_rxcount = 0; + break; } } } @@ -249,54 +249,54 @@ static void kiss_unesc(unsigned char *buffer, int len) for (i = 0; i < len; i++) { switch (kiss_state) { - case KISS_WAIT: - if (buffer[i] == FEND) { - kiss_state = KISS_CTRL; - kiss_rxcount = 0; - } - break; + case KISS_WAIT: + if (buffer[i] == FEND) { + kiss_state = KISS_CTRL; + kiss_rxcount = 0; + } + break; - case KISS_CTRL: - if ((buffer[i] & 0x0F) == 0x00) { - kiss_state = KISS_DATA; - kiss_rxcount = 0; - } else { - kiss_state = KISS_WAIT; - kiss_rxcount = 0; - } - break; + case KISS_CTRL: + if ((buffer[i] & 0x0F) == 0x00) { + kiss_state = KISS_DATA; + kiss_rxcount = 0; + } else { + kiss_state = KISS_WAIT; + kiss_rxcount = 0; + } + break; - case KISS_DATA: - switch (buffer[i]) { - case FEND: - if (kiss_rxcount > 2) - nrs_esc(kiss_rxbuffer, kiss_rxcount); - kiss_state = KISS_WAIT; - kiss_rxcount = 0; - break; - case FESC: - kiss_state = KISS_ESCAPE; - break; - default: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = buffer[i]; - break; - } + case KISS_DATA: + switch (buffer[i]) { + case FEND: + if (kiss_rxcount > 2) + nrs_esc(kiss_rxbuffer, kiss_rxcount); + kiss_state = KISS_WAIT; + kiss_rxcount = 0; + break; + case FESC: + kiss_state = KISS_ESCAPE; + break; + default: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = buffer[i]; break; + } + break; - case KISS_ESCAPE: - kiss_state = KISS_DATA; - switch (buffer[i]) { - case FESCESC: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = FESC; - break; - case FESCEND: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = FEND; - break; - } + case KISS_ESCAPE: + kiss_state = KISS_DATA; + switch (buffer[i]) { + case FESCESC: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = FESC; + break; + case FESCEND: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = FEND; break; + } + break; } } } @@ -310,28 +310,28 @@ int main(int argc, char *argv[]) while ((c = getopt(argc, argv, "dfls:v")) != -1) { switch (c) { - case 'd': - debugging = TRUE; - break; - case 'f': - flowcontrol = TRUE; - break; - case 'l': - logging = TRUE; - break; - case 's': - if ((speed = atoi(optarg)) <= 0) { - fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); - return 1; - } - break; - case 'v': - printf("kissattach: %s\n", VERSION); - return 0; - case ':': - case '?': - fprintf(stderr, "usage: nrsdrv [-f] [-l] [-s speed] [-v] kisstty nrstty\n"); + case 'd': + debugging = TRUE; + break; + case 'f': + flowcontrol = TRUE; + break; + case 'l': + logging = TRUE; + break; + case 's': + if ((speed = atoi(optarg)) <= 0) { + fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); return 1; + } + break; + case 'v': + printf("kissattach: %s\n", VERSION); + return 0; + case ':': + case '?': + fprintf(stderr, "usage: nrsdrv [-f] [-l] [-s speed] [-v] kisstty nrstty\n"); + return 1; } } -- cgit v1.2.3