inferno->plan 9 support we want to remove.
authorRonald G. Minnich <rminnich@google.com>
Fri, 17 Jan 2014 20:46:23 +0000 (12:46 -0800)
committerRonald G. Minnich <rminnich@google.com>
Fri, 17 Jan 2014 20:46:23 +0000 (12:46 -0800)
Signed-off-by: Ronald G. Minnich <rminnich@google.com>
kern/src/net/Kbuild
kern/src/net/plan9.c

index d0c45cb..98d9d5f 100644 (file)
@@ -13,6 +13,7 @@ obj-y                                         += loopbackmedium.o
 obj-y                                          += netaux.o
 obj-y                                          += netdevmedium.o
 obj-y                                          += nullmedium.o
 obj-y                                          += netaux.o
 obj-y                                          += netdevmedium.o
 obj-y                                          += nullmedium.o
+obj-y                                          += plan9.o
 obj-y                                          += ptclbsum.o
 obj-y                                          += pktmedium.o
 
 obj-y                                          += ptclbsum.o
 obj-y                                          += pktmedium.o
 
index ce24a8d..fa9735c 100644 (file)
@@ -1,10 +1,17 @@
-#include       "u.h"
-#include       "../port/lib.h"
-#include       "mem.h"
-#include       "dat.h"
-#include       "fns.h"
-#include       "../port/error.h"
-#include       "ip.h"
+// INFERNO
+#include <vfs.h>
+#include <kfs.h>
+#include <slab.h>
+#include <kmalloc.h>
+#include <kref.h>
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <error.h>
+#include <cpio.h>
+#include <pmap.h>
+#include <smp.h>
+#include <ip.h>
 
 /*
  *  some hacks for commonality twixt inferno and plan9
 
 /*
  *  some hacks for commonality twixt inferno and plan9
 char*
 commonuser(void)
 {
 char*
 commonuser(void)
 {
-       return up->env->user;
+       return current->user;
 }
 
 }
 
-Chan*
+struct chan*
 commonfdtochan(int fd, int mode, int a, int b)
 {
 commonfdtochan(int fd, int mode, int a, int b)
 {
-       return fdtochan(up->env->fgrp, fd, mode, a, b);
+       return fdtochan(current->fgrp, fd, mode, a, b);
 }
 
 char*
 commonerror(void)
 {
 }
 
 char*
 commonerror(void)
 {
-       return up->env->errstr;
+       return current_errstr();
 }
 
 int
 }
 
 int
-postnote(Proc *p, int, char *, int)
+postnote(struct proc *p, int unused_int, char *note, int val)
 {
 {
-       swiproc(p, 0);
+       panic("postnote");
        return 0;
 }
        return 0;
 }