Redo makefiles.

[pintos-anon] / src / devices / disk.c

diff --git a/src/devices/disk.c b/src/devices/disk.c
index 7d445692688f31a8413d13198efb1da87b8962bd..9e4b9f506358296c0eb2f9b49760059e12a95282 100644 (file)
--- a/src/devices/disk.c
+++ b/src/devices/disk.c
@@ -1,11 +1,11 @@
 #include "disk.h"
 #include <stdbool.h>
-#include "debug.h"
-#include "io.h"
-#include "interrupt.h"
-#include "lib.h"
-#include "synch.h"
 #include "timer.h"
+#include "lib/debug.h"
+#include "lib/lib.h"
+#include "threads/io.h"
+#include "threads/interrupt.h"
+#include "threads/synch.h"
 
 /* ATA command block port addresses. */
 #define reg_data(CHANNEL) ((CHANNEL)->reg_base + 0)     /* Data. */
@@ -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);