summaryrefslogtreecommitdiff
path: root/ide.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 17:04:06 +0000
committerrsc <rsc>2006-09-06 17:04:06 +0000
commita650c606fecc7e3938345e2bc52050a9ea725e7a (patch)
tree3bd2cfcd215f7ad4abdb087cdfe91f608c7f0801 /ide.c
parent45854caa93eecc3f80d34940b7cf6a400b640d69 (diff)
downloadxv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.gz
xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.bz2
xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.zip
spacing fixes: no tabs, 2-space indents (for rtm)
Diffstat (limited to 'ide.c')
-rw-r--r--ide.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ide.c b/ide.c
index dfbc605..c16e27f 100644
--- a/ide.c
+++ b/ide.c
@@ -11,8 +11,8 @@
#include "traps.h"
#include "spinlock.h"
-#define IDE_BSY 0x80
-#define IDE_DRDY 0x40
+#define IDE_BSY 0x80
+#define IDE_DRDY 0x40
#define IDE_DF 0x20
#define IDE_ERR 0x01
@@ -23,6 +23,7 @@ struct ide_request {
uint nsecs;
uint read;
};
+
struct ide_request request[NREQUEST];
int head, tail;
struct spinlock ide_lock;
@@ -154,7 +155,7 @@ int
ide_write(int diskno, uint secno, const void *src, uint nsecs)
{
int r;
-
+
if(nsecs > 256)
panic("ide_write");
@@ -165,7 +166,7 @@ ide_write(int diskno, uint secno, const void *src, uint nsecs)
outb(0x1F4, (secno >> 8) & 0xFF);
outb(0x1F5, (secno >> 16) & 0xFF);
outb(0x1F6, 0xE0 | ((diskno&1)<<4) | ((secno>>24)&0x0F));
- outb(0x1F7, 0x30); // CMD 0x30 means write sector
+ outb(0x1F7, 0x30); // CMD 0x30 means write sector
for (; nsecs > 0; nsecs--, src += 512) {
if ((r = ide_wait_ready(1)) < 0)