diff options
| author | rtm <rtm> | 2007-08-24 19:52:49 +0000 | 
|---|---|---|
| committer | rtm <rtm> | 2007-08-24 19:52:49 +0000 | 
| commit | 8e88f9e2c617cc1002039c6e37c3c831319b1f8f (patch) | |
| tree | 73d98e32df90a184bcb2a2aae39aee4202d93c05 | |
| parent | 4d39b63388237f5a30206b9df9999bc9f007b7bf (diff) | |
| download | xv6-labs-8e88f9e2c617cc1002039c6e37c3c831319b1f8f.tar.gz xv6-labs-8e88f9e2c617cc1002039c6e37c3c831319b1f8f.tar.bz2 xv6-labs-8e88f9e2c617cc1002039c6e37c3c831319b1f8f.zip  | |
comment nits
| -rw-r--r-- | fs.h | 2 | ||||
| -rw-r--r-- | fsvar.h | 2 | ||||
| -rw-r--r-- | ide.c | 7 | 
3 files changed, 3 insertions, 8 deletions
@@ -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. @@ -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; @@ -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)  | 
