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

xv6 seems to work fine on uniprocessor now.

diff --git a/Notes b/Notes
index 4e1703b0fdcb656a763c28ca01a4d7d21a0e70c8..8b476685a25d8012a9ebe30bf1509a429ef834f8 100644 (file)
--- a/Notes
+++ b/Notes
@@ -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)

diff --git a/console.c b/console.c
index 1a64122858c6959b0b4f51c6eecb6f1c12bc4f0e..438e332ea8ebbca5418402b06e5a667c58e3122e 100644 (file)
--- a/console.c
+++ b/console.c
@@ -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;
 }