summaryrefslogtreecommitdiff
path: root/ide.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-08 14:33:27 +0000
committerrsc <rsc>2006-09-08 14:33:27 +0000
commit50f88503664aae07e22e3ed2575853e396f909b5 (patch)
tree4afe6903dcc69b0c4cfe2d409b8fe0a6529f72c1 /ide.c
parent4194835901c7151630c22ae7cd8fbba7d3b736ab (diff)
downloadxv6-labs-50f88503664aae07e22e3ed2575853e396f909b5.tar.gz
xv6-labs-50f88503664aae07e22e3ed2575853e396f909b5.tar.bz2
xv6-labs-50f88503664aae07e22e3ed2575853e396f909b5.zip
move ide_intr lower
Diffstat (limited to 'ide.c')
-rw-r--r--ide.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ide.c b/ide.c
index 3f6f5c8..ebb561a 100644
--- a/ide.c
+++ b/ide.c
@@ -64,15 +64,6 @@ ide_init(void)
disk_1_present = ide_probe_disk1();
}
-// Interrupt handler - wake up the request that just finished.
-void
-ide_intr(void)
-{
- acquire(&ide_lock);
- wakeup(&request[tail]);
- release(&ide_lock);
-}
-
// Probe to see if disk 1 exists (we assume disk 0 exists).
static int
ide_probe_disk1(void)
@@ -95,6 +86,15 @@ ide_probe_disk1(void)
return x < 1000;
}
+// Interrupt handler - wake up the request that just finished.
+void
+ide_intr(void)
+{
+ acquire(&ide_lock);
+ wakeup(&request[tail]);
+ release(&ide_lock);
+}
+
// Start the next request in the queue.
static void
ide_start_request (void)