From 65b85824edbf642c387df1725ceb8bbc773c4776 Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Mon, 30 Apr 2007 19:06:17 +0200
Subject: [PATCH] fix readline handline

---
 serial.c          |   2 +-
 statemachine.c    | 122 ++++++++++++++++++++++++++--------------------
 zyxel-revert.conf |   4 +-
 3 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/serial.c b/serial.c
index 67cf15b..82412d2 100644
--- a/serial.c
+++ b/serial.c
@@ -36,7 +36,7 @@ static int open_serial(struct context *ctx, const char *devname)
 	}
 
 	bzero(&sdev->newtio, sizeof(struct termios));
-	sdev->newtio.c_cflag = B9600 | CRTSCTS | CS8 | CLOCAL | CREAD;
+	sdev->newtio.c_cflag = B9600 | CS8 | CLOCAL | CREAD;
 
 	tcflush(ctx->fd, TCIOFLUSH);
 
diff --git a/statemachine.c b/statemachine.c
index 2a18586..b1791bc 100644
--- a/statemachine.c
+++ b/statemachine.c
@@ -41,16 +41,18 @@ enum {
 
 static int my_readline(int fd, struct context *ctx, char **retval)
 {
-	/* TODO: not tested */
 	char *newline = memchr(ctx->linebuf, '\r', ctx->linepos);
 	if (newline != NULL) {
+		int len = newline - ctx->linebuf;
 		*newline = '\0';
-		*retval = strdup(ctx->linebuf);
+		if (len > 0)
+			*retval = strdup(ctx->linebuf);
 
-		ctx->linepos -= (newline - ctx->linebuf);
+		ctx->linepos -= len +1;
 		memmove(ctx->linebuf, newline +1, ctx->linepos);
 
-		return 0;
+		newline = memchr(ctx->linebuf, '\r', ctx->linepos);
+		return ((*retval != NULL) ? 1 : 0) + ((newline != NULL) ? 1 : 0);
 	}
 
 	char buf[32];
@@ -58,27 +60,34 @@ static int my_readline(int fd, struct context *ctx, char **retval)
 	if (len <= 0)
 		return -1;
 
-	int i;
+	int i, numlines = 0;
 	for (i = 0; i < len; i++) {
 		/* "understand" backspace */
 		if (buf[i] == 0x08 && ctx->linepos > 0) {
 			ctx->linepos--;
 
 		/* export buffer */
-		} else if (buf[i] == '\r' && *retval == NULL) {
-			ctx->linebuf[ctx->linepos] = '\0';
+		} else if (buf[i] == '\r') {
+			if (*retval == NULL) {
+				ctx->linebuf[ctx->linepos] = '\0';
 
-			if (ctx->linepos > 0)
-				*retval = strdup(ctx->linebuf);
+				if (ctx->linepos > 0)
+					*retval = strdup(ctx->linebuf);
 
-			ctx->linepos = 0;
+				ctx->linepos = 0;
+				numlines = 1;
+
+			} else {
+				ctx->linebuf[ctx->linepos++] = buf[i];
+				numlines++;
+			}
 
 		/* copy */
 		} else if (buf[i] >= ' ') {
 			ctx->linebuf[ctx->linepos++] = buf[i];
 		}
 	}
-	return 0;
+	return numlines;
 }
 
 int statemachine_read(int fd, void *privdata)
@@ -92,57 +101,64 @@ int statemachine_read(int fd, void *privdata)
 		return 0;
 	}
 
-	char *line = NULL;
-	if (my_readline(fd, ctx, &line) < 0)
-		return -1;
+	int numlines;
+	do {
+		char *line = NULL;
+		numlines = my_readline(fd, ctx, &line);
+		if (numlines < 0)
+			return -1;
 
-	if (line == NULL)
-		return 0;
+		if (line == NULL)
+			return 0;
 
-	log_print(LOG_DEBUG, "%s: '%s'", ctx->devname, line);
+		log_print(LOG_DEBUG, "%s: '%s'", ctx->devname, line);
 
-	int msg = 0;
-	while (rx_msg[msg] != NULL) {
-		if (strcmp(line, rx_msg[msg]) == 0)
-			break;
+		int msg = 0;
+		while (rx_msg[msg] != NULL) {
+			if (strcmp(line, rx_msg[msg]) == 0)
+				break;
 
-		msg++;
-	}
-
-	/* wait for "Press any key" */
-	if (msg == MSG_DEBUG_ASK) {
-		ctx->state = STATE_DEBUG_ASK;
-		write(fd, "\r\n", 2);
-
-	/* debug mode entered */
-	} else if (msg == MSG_DEBUG) {
-		/* if device supports it, switch to high baudrate */
-		if (ctx->dev_setbaudrate != NULL) {
-			ctx->state = STATE_SWITCH_BAUDRATE;
-			write(fd, "ATBA5\r\n", 7);
-
-		} else {
-			ctx->state = STATE_XMODEM;
-			write(fd, "ATLC\r\n", 6);
+			msg++;
 		}
 
-	/* follow device to high baudrate */
-	} else if (msg == MSG_BAUD_HIGH) {
-		ctx->dev_setbaudrate(ctx, B115200);
+		/* wait for "Press any key" */
+		if (msg == MSG_DEBUG_ASK) {
+			ctx->state = STATE_DEBUG_ASK;
+			write(fd, "\r\n", 2);
 
-		ctx->state = STATE_XMODEM;
-		write(fd, "ATLC\r\n", 6);
+		/* debug mode entered */
+		} else if (msg == MSG_DEBUG) {
+			/* if device supports it, switch to high baudrate */
+			if (ctx->dev_setbaudrate != NULL) {
+				ctx->state = STATE_SWITCH_BAUDRATE;
+				write(fd, "ATBA5\r\n", 7);
 
-	/* transfer was success */
-	} else if (msg == MSG_XMODEM_OK && ctx->state == STATE_XMODEM_COMPLETE) {
-		ctx->state = STATE_BOOT;
-		write(fd, "ATGR\r\n", 6);
+			} else {
+				ctx->state = STATE_XMODEM;
+				write(fd, "ATLC\r\n", 6);
+			}
 
-	/* follow device to low baudrate */
-	} else if (msg == MSG_BAUD_LOW) {
-		ctx->dev_setbaudrate(ctx, B9600);
-	}
+		/* follow device to high baudrate */
+		} else if (msg == MSG_BAUD_HIGH) {
+			ctx->dev_setbaudrate(ctx, B115200);
+			numlines = 0;
+
+			ctx->state = STATE_XMODEM;
+			write(fd, "ATLC\r\n", 6);
+
+		/* transfer was success */
+		} else if (msg == MSG_XMODEM_OK && ctx->state == STATE_XMODEM_COMPLETE) {
+			ctx->state = STATE_BOOT;
+			write(fd, "ATGR\r\n", 6);
+
+		/* follow device to low baudrate */
+		} else if (msg == MSG_BAUD_LOW) {
+			ctx->dev_setbaudrate(ctx, B9600);
+			numlines = 0;
+		}
+
+		free(line);
+	} while (numlines > 1);
 
-	free(line);
 	return 0;
 }
diff --git a/zyxel-revert.conf b/zyxel-revert.conf
index d1cadd4..f608bd0 100644
--- a/zyxel-revert.conf
+++ b/zyxel-revert.conf
@@ -1,5 +1,5 @@
 [global]
-configdata 350LI2C1.rom.own
+configdata 350LI2C1.rom
 
 [ports]
-serial /dev/ttyUSB0
+serial /dev/ttyS0