summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <[email protected]>2010-09-02 18:50:49 -0400
committerAustin Clements <[email protected]>2010-09-02 18:50:49 -0400
commit08eef9eae5989d3a709588352e228041e62e2c2c (patch)
treeefed9f55fa36508cf66a5b90c5c42177770387a0
parent5bf11c50b512f06fd96675ca1ddd9ab1a2cf6fa0 (diff)
downloadxv6-labs-08eef9eae5989d3a709588352e228041e62e2c2c.tar.gz
xv6-labs-08eef9eae5989d3a709588352e228041e62e2c2c.tar.bz2
xv6-labs-08eef9eae5989d3a709588352e228041e62e2c2c.zip
Get cgaputc and consputc back on the same page
-rw-r--r--console.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/console.c b/console.c
index a3cdf96..e7ed248 100644
--- a/console.c
+++ b/console.c
@@ -136,8 +136,7 @@ cgaputc(int c)
if(c == '\n')
pos += 80 - pos%80;
else if(c == BACKSPACE){
- if(pos > 0)
- crt[--pos] = ' ' | 0x0700;
+ if(pos > 0) --pos;
} else
crt[pos++] = (c&0xff) | 0x0700; // black on white
@@ -164,15 +163,12 @@ consputc(int c)
}
if(c == BACKSPACE){
- uartputc('\b');
- uartputc(' ');
- uartputc('\b');
+ uartputc('\b'); uartputc(' '); uartputc('\b');
} else
uartputc(c);
cgaputc(c);
}
-//PAGEBREAK: 50
#define INPUT_BUF 128
struct {
struct spinlock lock;