bios/main: handle all types of carriage return (\r, \n, \r\n or \n\r)

enjoy-digital · Oct 9, 2018 · 10624c2 · 10624c2
1 parent 9f083e9
commit 10624c2
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/litex/soc/software/bios/main.c b/litex/soc/software/bios/main.c
@@ -442,13 +442,17 @@ static void crcbios(void)
 
 static void readstr(char *s, int size)
 {
+	static char skip = 0;
 	char c[2];
 	int ptr;
 
 	c[1] = 0;
 	ptr = 0;
 	while(1) {
 		c[0] = readchar();
+		if (c[0] == skip)
+			continue;
+		skip = 0;
 		switch(c[0]) {
 			case 0x7f:
 			case 0x08:
@@ -460,7 +464,12 @@ static void readstr(char *s, int size)
 			case 0x07:
 				break;
 			case '\r':
+				skip = '\n';
+				s[ptr] = 0x00;
+				putsnonl("\n");
+				return;
 			case '\n':
+				skip = '\r';
 				s[ptr] = 0x00;
 				putsnonl("\n");
 				return;