summaryrefslogtreecommitdiff
path: root/ide.c
diff options
context:
space:
mode:
authorrsc <rsc>2009-05-31 05:12:21 +0000
committerrsc <rsc>2009-05-31 05:12:21 +0000
commit34295f461a416e40bb76e67c568a761222dc6913 (patch)
tree656ee29b7df282b32953ec927291a68cc0ff2124 /ide.c
parent949e55902bb0c976f74b5217b82deac65ff8d781 (diff)
downloadxv6-labs-34295f461a416e40bb76e67c568a761222dc6913.tar.gz
xv6-labs-34295f461a416e40bb76e67c568a761222dc6913.tar.bz2
xv6-labs-34295f461a416e40bb76e67c568a761222dc6913.zip
group locks into structs they protect.
few naming nits.
Diffstat (limited to 'ide.c')
-rw-r--r--ide.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ide.c b/ide.c
index cfe5728..1f19833 100644
--- a/ide.c
+++ b/ide.c
@@ -30,13 +30,13 @@ static void idestart(struct buf*);
// Wait for IDE disk to become ready.
static int
-idewait(int check_error)
+idewait(int checkerr)
{
int r;
while(((r = inb(0x1f7)) & (IDE_BSY|IDE_DRDY)) != IDE_DRDY)
;
- if(check_error && (r & (IDE_DF|IDE_ERR)) != 0)
+ if(checkerr && (r & (IDE_DF|IDE_ERR)) != 0)
return -1;
return 0;
}