Skip to content
Snippets Groups Projects
Commit 0b6ab841 authored by kaashoek's avatar kaashoek
Browse files

don't send keyboard interrupts to the second cpu, if we have only one cpu.

xv6 seems to work fine on uniprocessor now.
parent 7abf49d2
No related branches found
No related tags found
No related merge requests found
......@@ -117,7 +117,6 @@ echo foo > bar should truncate bar
so O_CREATE should not truncate
but O_TRUNC should
make it work on one cpu
make it work on a real machine
release before acquire at end of sleep?
check 2nd disk (i.e. if not in .bochsrc)
......@@ -365,8 +365,9 @@ console_read(int minor, char *dst, int n)
acquire(&kbd_lock);
while(kbd_w == kbd_r)
while(kbd_w == kbd_r) {
sleep(&kbd_r, &kbd_lock);
}
while(n > 0 && kbd_w != kbd_r){
*dst = (kbd_buf[kbd_r]) & 0xff;
......@@ -392,7 +393,7 @@ console_init()
devsw[CONSOLE].d_write = console_write;
devsw[CONSOLE].d_read = console_read;
ioapic_enable (IRQ_KBD, 1);
ioapic_enable (IRQ_KBD, 0);
use_console_lock = 1;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment