summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs.h2
-rw-r--r--fsvar.h2
-rw-r--r--ide.c7
3 files changed, 3 insertions, 8 deletions
diff --git a/fs.h b/fs.h
index 9517326..e1cc7a2 100644
--- a/fs.h
+++ b/fs.h
@@ -1,5 +1,5 @@
// On-disk file system format.
-// This header is shared between kernel and user space.
+// Both the kernel and user programs use this header file.
// Block 0 is unused.
// Block 1 is super block.
diff --git a/fsvar.h b/fsvar.h
index f823c66..07dbf53 100644
--- a/fsvar.h
+++ b/fsvar.h
@@ -4,7 +4,7 @@ struct inode {
uint dev; // Device number
uint inum; // Inode number
int ref; // Reference count
- int flags; // I_BUSY, I_VALID
+ int flags; // I_BUSY, I_VALID
short type; // copy of disk inode
short major;
diff --git a/ide.c b/ide.c
index d5fa6dd..3b3b808 100644
--- a/ide.c
+++ b/ide.c
@@ -18,10 +18,9 @@
#define IDE_CMD_READ 0x20
#define IDE_CMD_WRITE 0x30
-// IDE request queue.
// ide_queue points to the buf now being read/written to the disk.
// ide_queue->qnext points to the next buf to be processed.
-// Must hold ide_lock while manipulating queue.
+// You must hold ide_lock while manipulating queue.
static struct spinlock ide_lock;
static struct buf *ide_queue;
@@ -84,7 +83,6 @@ ide_intr(void)
{
acquire(&ide_lock);
if(ide_queue){
- //cprintf("intr %x\n", ide_queue);
if((ide_queue->flags & B_WRITE) == 0)
if(ide_wait_ready(1) >= 0)
insl(0x1F0, ide_queue->data, 512/4);
@@ -105,7 +103,6 @@ ide_start_request (void)
{
if(ide_queue){
ide_wait_ready(0);
- //cprintf("start %x\n", ide_queue);
outb(0x3f6, 0); // generate interrupt
outb(0x1F2, 1); // number of sectors
outb(0x1F3, ide_queue->sector & 0xFF);
@@ -139,8 +136,6 @@ ide_rw(struct buf *b)
b->done = 0;
b->qnext = 0;
- // cprintf("enqueue %x %x\n", b, ide_queue);
-
// append b to ide_queue
pp = &ide_queue;
while(*pp)