X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevices%2Fserial.c;h=1cb49a39ee25da6e35d4cd12356fb2a019cdd4b3;hb=94e3568f3303b757f9e4133524b647163792662d;hp=099b22841efeafd4289f718210ffb592f8148f57;hpb=912a232e283c1bd59e5ca8f0922f348af62ed3c5;p=pintos-anon

diff --git a/src/devices/serial.c b/src/devices/serial.c
index 099b228..1cb49a3 100644
--- a/src/devices/serial.c
+++ b/src/devices/serial.c
@@ -63,9 +63,9 @@ serial_init_poll (void)
   ASSERT (mode == UNINIT);
   outb (IER_REG, 0);                    /* Turn off all interrupts. */
   outb (FCR_REG, 0);                    /* Disable FIFO. */
-  set_serial (9600);                    /* 9600 bps, N-8-1. */
-  outb (MCR_REG, MCR_OUT2);             /* Turn on OUT2 output line. */
-  intq_init (&txq, "serial xmit");
+  set_serial (115200);                  /* 115.2 kbps, N-8-1. */
+  outb (MCR_REG, MCR_OUT2);             /* Required to enable interrupts. */
+  intq_init (&txq);
   mode = POLL;
 } 
 
@@ -76,7 +76,7 @@ void
 serial_init_queue (void) 
 {
   ASSERT (mode == POLL);
-  intr_register (0x20 + 4, 0, INTR_OFF, serial_interrupt, "serial");
+  intr_register_ext (0x20 + 4, serial_interrupt, "serial");
   mode = QUEUE;
 }