Change dev read/write functions

to take inode* instead of minor number.

Unlock console inode during console_read
and console_write.  Otherwise background
processes cannot write to console while the
shell is reading it waiting for input.

diff --git a/console.c b/console.c
index 919b3a26a262c22094501658985fa11c54db6104..b41262d0988513ba5f6abafa34cabec726cbee79 100644 (file)
--- a/console.c
+++ b/console.c
@@ -164,14 +164,16 @@ cprintf(char *fmt, ...)
 }
 
 int
-console_write(int minor, char *buf, int n)
+console_write(struct inode *ip, char *buf, int n)
 {
   int i;
 
+  iunlock(ip);
   acquire(&console_lock);
   for(i = 0; i < n; i++)
     cons_putc(buf[i] & 0xff);
   release(&console_lock);
+  ilock(ip);
 
   return n;
 }
@@ -230,17 +232,19 @@ console_intr(int (*getc)(void))
 }
 
 int
-console_read(int minor, char *dst, int n)
+console_read(struct inode *ip, char *dst, int n)
 {
   uint target;
   int c;
 
+  iunlock(ip);
   target = n;
   acquire(&input.lock);
   while(n > 0){
     while(input.r == input.w){
       if(cp->killed){
         release(&input.lock);
+        ilock(ip);
         return -1;
       }
       sleep(&input.r, &input.lock);
@@ -262,6 +266,7 @@ console_read(int minor, char *dst, int n)
       input.r = 0;
   }
   release(&input.lock);
+  ilock(ip);
 
   return target - n;
 }
@@ -274,7 +279,7 @@ console_init(void)
 
   devsw[CONSOLE].write = console_write;
   devsw[CONSOLE].read = console_read;
-  use_console_lock = 1;
+  //use_console_lock = 1;
 
   irq_enable(IRQ_KBD);
   ioapic_enable(IRQ_KBD, 0);

diff --git a/dev.h b/dev.h
index cff0036c083d18df5e6cc1692cd73431a44236a4..48d31d35cef2dd68a641b1dd6573b6fce8f0bf0a 100644 (file)
--- a/dev.h
+++ b/dev.h
@@ -1,6 +1,6 @@
 struct devsw {
-  int (*read)(int, char*, int);
-  int (*write)(int, char*, int);
+  int (*read)(struct inode*, char*, int);
+  int (*write)(struct inode*, char*, int);
 };
 
 extern struct devsw devsw[];

diff --git a/fs.c b/fs.c
index 45ccdb255ae45440afd74d451f0d191421bb1272..732b7218a15dc8fd33f67404b13e717edd72e64a 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -411,7 +411,7 @@ readi(struct inode *ip, char *dst, uint off, uint n)
   if(ip->type == T_DEV) {
     if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].read)
       return -1;
-    return devsw[ip->major].read(ip->minor, dst, n);
+    return devsw[ip->major].read(ip, dst, n);
   }
 
   if(off > ip->size || off + n < off)
@@ -439,7 +439,7 @@ writei(struct inode *ip, char *src, uint off, uint n)
   if(ip->type == T_DEV) {
     if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].write)
       return -1;
-    return devsw[ip->major].write(ip->minor, src, n);
+    return devsw[ip->major].write(ip, src, n);
   }
 
   if(off + n < off)