diff options
| author | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
| commit | dccb915282854476ce47752df6631dcce3b8f661 (patch) | |
| tree | a84aa8ed35618f99c3d7e8cdd466d22ae7bad597 /ide.c | |
| parent | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (diff) | |
| parent | 13a96baefc0ff5d8262c4bc8c797bee4b157443c (diff) | |
| download | xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.gz xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.bz2 xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.zip | |
Merge commit 'origin/master' into page
Diffstat (limited to 'ide.c')
| -rw-r--r-- | ide.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -96,7 +96,7 @@ ideintr(void) acquire(&idelock); if((b = idequeue) == 0){ release(&idelock); - cprintf("Spurious IDE interrupt.\n"); + // cprintf("spurious IDE interrupt\n"); return; } idequeue = b->qnext; @@ -131,7 +131,7 @@ iderw(struct buf *b) if((b->flags & (B_VALID|B_DIRTY)) == B_VALID) panic("iderw: nothing to do"); if(b->dev != 0 && !havedisk1) - panic("idrw: ide disk 1 not present"); + panic("iderw: ide disk 1 not present"); acquire(&idelock); @@ -147,7 +147,7 @@ iderw(struct buf *b) // Wait for request to finish. // Assuming will not sleep too long: ignore proc->killed. - while((b->flags & (B_VALID|B_DIRTY)) != B_VALID) { + while((b->flags & (B_VALID|B_DIRTY)) != B_VALID){ sleep(b, &idelock); } |