summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-14 19:41:01 +0000
committerrsc <rsc>2007-08-14 19:41:01 +0000
commitfe5f50a03dd4a6a96385b0bc825fdb7865cb22d2 (patch)
tree5fbc5544e6affb832b0773c95196254b5f58883a
parent5e8c5d8bb8a54bca73ddc3e2ac0750b56bf96dcc (diff)
downloadxv6-labs-fe5f50a03dd4a6a96385b0bc825fdb7865cb22d2.tar.gz
xv6-labs-fe5f50a03dd4a6a96385b0bc825fdb7865cb22d2.tar.bz2
xv6-labs-fe5f50a03dd4a6a96385b0bc825fdb7865cb22d2.zip
fixes
-rw-r--r--console.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/console.c b/console.c
index 4e2b7a8..cc1a0b7 100644
--- a/console.c
+++ b/console.c
@@ -207,7 +207,7 @@ kbd_intr(void)
};
uint st, data, c;
- acquire(&kbd_lock);
+ acquire(&kbd.lock);
st = inb(KBSTATP);
if((st & KBS_DIB) == 0)
@@ -253,17 +253,17 @@ kbd_intr(void)
break;
default:
- if(((kbd_w + 1) % KBD_BUF) != kbd_r){
- kbd_buf[kbd_w++] = c;
- if(kbd_w >= KBD_BUF)
- kbd_w = 0;
- wakeup(&kbd_r);
+ if(((kbd.w + 1) % KBD_BUF) != kbd.r){
+ kbd.buf[kbd.w++] = c;
+ if(kbd.w >= KBD_BUF)
+ kbd.w = 0;
+ wakeup(&kbd.r);
}
break;
}
out:
- release(&kbd_lock);
+ release(&kbd.lock);
}
//PAGEBREAK: 25