code: 9ferno

Info  •  Files  •  Log

minor changes to get devcons working neatly

--- a/os/pc/devkbd.c

+++ b/os/pc/devkbd.c

@@ -229,6 +229,7 @@

 	b = c & 0xff;

 	qproduce(kbd.q, &b, 1);

+	/* print("i8042intr b %d %c 0x%x\n", b, b, b); */

 	kbdprocesschar(b); /* hack until kbdfs is built */

 }

--- a/os/port/devcons.c

+++ b/os/port/devcons.c

@@ -161,10 +161,11 @@

 	 *  put the message there.

 	 */

 	wq = usewrite && islo() ? qwrite : qiwrite;

-	if(kprintoq != nil && !qisclosed(kprintoq))

+	if(kprintoq != nil && !qisclosed(kprintoq)){

 		(*wq)(kprintoq, str, n);

-	else if(screenputs != nil)

+	}else if(screenputs != nil){

 		screenputs(str, n);

+	}

 	if(serialoq == nil){

 		uartputs(str, n);

@@ -1005,9 +1006,7 @@

         if(kbd.raw)

                 return;

-        if(r == '\n'){

-				putstrn("\r", 1);

-        } else if(r == 0x15){

+        if(r == 0x15){

                 buf = "^U\n";

                 n = 3;

         }