both PLAN9NET options compile - vx32 - Local 9vx git repository for patches.

Log

Files

Refs

---

commit b72d34503d7eb3e48c6f0d3ed1bd031c8e584941

parent 8aa03c4f1dc493f3a62bc88eb7d0c1ac26e24cea

Author: Jesus Galan Lopez (yiyus) 

Date:   Thu,  3 Jun 2010 20:45:26 +0200

both PLAN9NET options compile

Diffstat:
  src/9vx/Makefrag                    |      15 ++++++---------
  src/9vx/devtab.c                    |      47 ++++---------------------------
  src/9vx/devtabve.c                  |      98 +++++++++++++++++++++++++++++++

3 files changed, 109 insertions(+), 51 deletions(-)
---

diff --git a/src/9vx/Makefrag b/src/9vx/Makefrag

@@ -22,8 +22,6 @@ endif
 PLAN9NET=virtualip
 #PLAN9NET=posixip
 
-PLAN9NATIVEFS=1
-
 ifeq ($(PLAN9VX),1)
 
 all: 9vx/9vx
@@ -37,8 +35,8 @@ PLAN9_OBJS = \
                 devmntloop.o \
                 devmouse.o \
                 devram.o \
-                devtab.o \
                 factotum.o \
+                fossil.o \
                 kprocdev.o \
                 label.o \
                 main.o \
@@ -50,6 +48,7 @@ PLAN9_OBJS = \
                 time.o \
                 trap.o \
                 tty.o \
+                venti.o \
                 vx32.o \
         )
 
@@ -93,6 +92,7 @@ PLAN9_A_OBJS = \
                 page.o \
                 parse.o \
                 parseip.o \
+                part.o \
                 pgrp.o \
                 print.o \
                 proc.o \
@@ -114,14 +114,16 @@ PLAN9_A_OBJS = \
         )
 
 PLAN9_posixip_OBJS = \
-        bo.o \
+        9vx/devtab.o \
         $(addprefix 9vx/, \
+                a/bo.o \
                 devip.o \
                 devip-posix.o \
         )
 PLAN9_posixip_LIBS =
 
 PLAN9_virtualip_OBJS = \
+        9vx/devtabve.o \
         9vx/etherve.o \
         $(addprefix 9vx/a/,\
                 devaoe.o \
@@ -188,11 +190,6 @@ PLAN9_GUI_LIBS = $(PLAN9_$(PLAN9GUI)_LIBS)
 PLAN9_IP_OBJS = $(PLAN9_$(PLAN9NET)_OBJS)
 PLAN9_IP_LIBS = $(PLAN9_$(PLAN9NET)_LIBS)
 
-ifeq ($(PLAN9NATIVEFS),1)
-PLAN9_OBJS := $(PLAN9_OBJS) 9vx/fossil.o 9vx/venti.o
-PLAN9_A_OBJS := $(PLAN9_A_OBJS) 9vx/a/part.o
-endif
-
 PLAN9_DEPS = \
         $(PLAN9_OBJS) \
         $(PLAN9_A_OBJS) \

diff --git a/src/9vx/devtab.c b/src/9vx/devtab.c

@@ -7,7 +7,6 @@
 #include "ip/ip.h"
 #include "sd.h"
 
-extern Dev aoedevtab;
 extern Dev consdevtab;
 extern Dev rootdevtab;
 extern Dev pipedevtab;
@@ -27,20 +26,15 @@ extern Dev mntloopdevtab;
 extern Dev dupdevtab;
 extern Dev sddevtab;
 extern Dev capdevtab;
-extern Dev etherdevtab;
-
-extern SDifc sdloopifc;
-extern SDifc sdaoeifc;
 
 Dev *devtab[] = {
         &rootdevtab,        /* must be first */
-        &aoedevtab,
         &audiodevtab,
+        &capdevtab,
         &consdevtab,
         &drawdevtab,
         &dupdevtab,
         &envdevtab,
-        ðerdevtab,
         &fsdevtab,
         &ipdevtab,
         &mntdevtab,
@@ -49,50 +43,19 @@ Dev *devtab[] = {
         &pipedevtab,
         &procdevtab,
         &ramdevtab,
+        &sddevtab,
         &srvdevtab,
         &ssldevtab,
         &tlsdevtab,
-        &sddevtab,
-        &capdevtab,
         0
 };
 
-extern void ethervelink(void);
-extern void ethermediumlink(void);
-extern void loopbackmediumlink(void);
-extern void netdevmediumlink(void);
-void links(void) {
-        ethermediumlink();
-        loopbackmediumlink();
-        netdevmediumlink();
-        ethervelink();
+void
+links(void)
+{
 }
 
-extern void ilinit(Fs*);
-extern void tcpinit(Fs*);
-extern void udpinit(Fs*);
-extern void ipifcinit(Fs*);
-extern void icmpinit(Fs*);
-extern void icmp6init(Fs*);
-extern void greinit(Fs*);
-extern void ipmuxinit(Fs*);
-extern void espinit(Fs*);
-void (*ipprotoinit[])(Fs*) = {
-        ilinit,
-        tcpinit,
-        udpinit,
-        ipifcinit,
-        icmpinit,
-        icmp6init,
-        greinit,
-        ipmuxinit,
-        espinit,
-        nil,
-};
-
 SDifc *sdifc[] =
 {
-        &sdloopifc,
-        &sdaoeifc,
         0,
 };

diff --git a/src/9vx/devtabve.c b/src/9vx/devtabve.c

@@ -0,0 +1,98 @@
+#include "u.h"
+#include "mem.h"
+#include "lib.h"
+#include "dat.h"
+#include "fns.h"
+#include "error.h"
+#include "ip/ip.h"
+#include "sd.h"
+
+extern Dev aoedevtab;
+extern Dev consdevtab;
+extern Dev rootdevtab;
+extern Dev pipedevtab;
+extern Dev ramdevtab;
+extern Dev ssldevtab;
+extern Dev tlsdevtab;
+extern Dev mousedevtab;
+extern Dev drawdevtab;
+extern Dev ipdevtab;
+extern Dev fsdevtab;
+extern Dev mntdevtab;
+extern Dev audiodevtab;
+extern Dev envdevtab;
+extern Dev srvdevtab;
+extern Dev procdevtab;
+extern Dev mntloopdevtab;
+extern Dev dupdevtab;
+extern Dev sddevtab;
+extern Dev capdevtab;
+extern Dev etherdevtab;
+
+extern SDifc sdloopifc;
+extern SDifc sdaoeifc;
+
+Dev *devtab[] = {
+        &rootdevtab,        /* must be first */
+        &aoedevtab,
+        &audiodevtab,
+        &capdevtab,
+        &consdevtab,
+        &drawdevtab,
+        &dupdevtab,
+        &envdevtab,
+        ðerdevtab,
+        &fsdevtab,
+        &ipdevtab,
+        &mntdevtab,
+        &mntloopdevtab,
+        &mousedevtab,
+        &pipedevtab,
+        &procdevtab,
+        &ramdevtab,
+        &sddevtab,
+        &srvdevtab,
+        &ssldevtab,
+        &tlsdevtab,
+        0
+};
+
+extern void ethervelink(void);
+extern void ethermediumlink(void);
+extern void loopbackmediumlink(void);
+extern void netdevmediumlink(void);
+void links(void) {
+        ethermediumlink();
+        loopbackmediumlink();
+        netdevmediumlink();
+        ethervelink();
+}
+
+extern void ilinit(Fs*);
+extern void tcpinit(Fs*);
+extern void udpinit(Fs*);
+extern void ipifcinit(Fs*);
+extern void icmpinit(Fs*);
+extern void icmp6init(Fs*);
+extern void greinit(Fs*);
+extern void ipmuxinit(Fs*);
+extern void espinit(Fs*);
+void (*ipprotoinit[])(Fs*) = {
+        ilinit,
+        tcpinit,
+        udpinit,
+        ipifcinit,
+        icmpinit,
+        icmp6init,
+        greinit,
+        ipmuxinit,
+        espinit,
+        nil,
+};
+
+SDifc *sdifc[] =
+{
+        &sdloopifc,
+        &sdaoeifc,
+        0,
+};