bread

iget
mkfs makes a file system image
put this in your .bochsrc:
ata0-slave: type=disk, mode=flat, path="fs.img", cylinders=1024, heads=1, spt=1

1 files changed, 9 insertions, 7 deletions

diff --git a/ide.c b/ide.c
index 5b75053..291ab83 100644
--- a/ide.c
+++ b/ide.c
@@ -84,7 +84,7 @@ ide_start_request (void)
 {
   struct ide_request *r;
 
-  if (head == tail) {
+  if (head != tail) {
     r = &request[tail];
     ide_wait_ready(0);
     outb(0x3f6, 0);
@@ -98,7 +98,7 @@ ide_start_request (void)
 }
 
 void *
-ide_start_read(uint secno, void *dst, uint nsecs)
+ide_start_read(int diskno, uint secno, void *dst, uint nsecs)
 {
   struct ide_request *r;
   if(!holding(&ide_lock))
@@ -114,12 +114,12 @@ ide_start_read(uint secno, void *dst, uint nsecs)
   r->secno = secno;
   r->dst = dst;
   r->nsecs = nsecs;
-  r->diskno = 0;
-
-  ide_start_request();
+  r->diskno = diskno;
 
   head = (head + 1) % NREQUEST;
 
+  ide_start_request();
+
   return r;
 }
 
@@ -129,6 +129,9 @@ ide_finish_read(void *c)
   int r = 0;
   struct ide_request *req = (struct ide_request *) c;
 
+  if(c != &request[tail])
+    panic("ide_finish_read");
+
   if(!holding(&ide_lock))
     panic("ide_start_read: not holding ide_lock");
   for (; req->nsecs > 0; req->nsecs--, req->dst += 512) {
@@ -148,10 +151,9 @@ ide_finish_read(void *c)
 }
 
 int
-ide_write(uint secno, const void *src, uint nsecs)
+ide_write(int diskno, uint secno, const void *src, uint nsecs)
 {
   int r;
-  int diskno = 0;
 	
   if(nsecs > 256)
     panic("ide_write");