greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

comment nits

Browse source
This commit is contained in:
rtm 2007-08-24 19:52:49 +00:00
parent 4d39b63388
commit 8e88f9e2c6
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs.h
View file

@ -1,5 +1,5 @@
// On-disk file system format. // 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 0 is unused.
// Block 1 is super block. // Block 1 is super block.

2
fsvar.h
View file

@ -4,7 +4,7 @@ struct inode {
uint dev; // Device number uint dev; // Device number
uint inum; // Inode number uint inum; // Inode number
int ref; // Reference count int ref; // Reference count
int flags; // I_BUSY, I_VALID int flags; // I_BUSY, I_VALID
short type; // copy of disk inode short type; // copy of disk inode
short major; short major;

7
ide.c
View file

@ -18,10 +18,9 @@
#define IDE_CMD_READ 0x20 #define IDE_CMD_READ 0x20
#define IDE_CMD_WRITE 0x30 #define IDE_CMD_WRITE 0x30
// IDE request queue.
// ide_queue points to the buf now being read/written to the disk. // ide_queue points to the buf now being read/written to the disk.
// ide_queue->qnext points to the next buf to be processed. // 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 spinlock ide_lock;
static struct buf *ide_queue; static struct buf *ide_queue;
@ -84,7 +83,6 @@ ide_intr(void)
{ {
acquire(&ide_lock); acquire(&ide_lock);
if(ide_queue){ if(ide_queue){
//cprintf("intr %x\n", ide_queue);
if((ide_queue->flags & B_WRITE) == 0) if((ide_queue->flags & B_WRITE) == 0)
if(ide_wait_ready(1) >= 0) if(ide_wait_ready(1) >= 0)
insl(0x1F0, ide_queue->data, 512/4); insl(0x1F0, ide_queue->data, 512/4);
@ -105,7 +103,6 @@ ide_start_request (void)
{ {
if(ide_queue){ if(ide_queue){
ide_wait_ready(0); ide_wait_ready(0);
//cprintf("start %x\n", ide_queue);
outb(0x3f6, 0); // generate interrupt outb(0x3f6, 0); // generate interrupt
outb(0x1F2, 1); // number of sectors outb(0x1F2, 1); // number of sectors
outb(0x1F3, ide_queue->sector & 0xFF); outb(0x1F3, ide_queue->sector & 0xFF);
@ -139,8 +136,6 @@ ide_rw(struct buf *b)
b->done = 0; b->done = 0;
b->qnext = 0; b->qnext = 0;
// cprintf("enqueue %x %x\n", b, ide_queue);
// append b to ide_queue // append b to ide_queue
pp = &ide_queue; pp = &ide_queue;
while(*pp) while(*pp)