xv6

commit 8440dbfee13a5c728c5060af515f9273889a4679
parent 08eef9eae5989d3a709588352e228041e62e2c2c
Author: Austin Clements <amdragon@mit.edu>
Date:   Thu,  2 Sep 2010 18:54:50 -0400

Get consoleintr back on one page

Diffstat:
M
console.c
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/console.c b/console.c
@@ -198,8 +198,7 @@ consoleintr(int (*getc)(void))
         consputc(BACKSPACE);
       }
       break;
-    case C('H'):  // Backspace
-    case '\x7f':
+    case C('H'): case '\x7f':  // Backspace
       if(input.e != input.w){
         input.e--;
         consputc(BACKSPACE);
@@ -207,9 +206,7 @@ consoleintr(int (*getc)(void))
       break;
     default:
       if(c != 0 && input.e-input.r < INPUT_BUF){
-        // The serial port produces 0x13, not 0x10
-        if(c == '\r')
-          c = '\n';
+        c = (c == '\r') ? '\n' : c;
         input.buf[input.e++ % INPUT_BUF] = c;
         consputc(c);
         if(c == '\n' || c == C('D') || input.e == input.r+INPUT_BUF){