X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevices%2Fdisk.c;fp=src%2Fdevices%2Fdisk.c;h=dc0c1819cb0df583dcb40c7621697addd2d6ffd1;hb=bd1397c2e890c82bd58bb2e6eefa223172b3d632;hp=7d445692688f31a8413d13198efb1da87b8962bd;hpb=476eef1e2009a13352732b0d41b37c426050eaac;p=pintos-anon diff --git a/src/devices/disk.c b/src/devices/disk.c index 7d44569..dc0c181 100644 --- a/src/devices/disk.c +++ b/src/devices/disk.c @@ -133,7 +133,7 @@ disk_init (void) } /* Register interrupt handler. */ - intr_register (c->irq, 0, IF_OFF, interrupt_handler, c->name); + intr_register (c->irq, 0, INTR_OFF, interrupt_handler, c->name); /* Reset hardware. */ reset_channel (c); @@ -406,7 +406,7 @@ issue_pio_command (struct channel *c, uint8_t command) { /* Interrupts must be enabled or our semaphore will never be up'd by the completion handler. */ - ASSERT (intr_get_level () == IF_ON); + ASSERT (intr_get_level () == INTR_ON); c->expecting_interrupt = true; outb (reg_command (c), command);