4 files changed, 15 insertions, 7 deletions
diff --git a/emu/Plan9/devfs.c b/emu/Plan9/devfs.c
index d0db522d..c64c0f88 100644
--- a/emu/Plan9/devfs.c
+++ b/emu/Plan9/devfs.c
@@ -68,7 +68,7 @@ fsattach(char *spec)
 
 	c = devattach('U', spec);
 	lock(&l);
-	c->dev = devno++;
+	c->devno = devno++;
 	c->qid = rootqid;
 	unlock(&l);
 	c->aux = smalloc(sizeof(Fsinfo));
@@ -105,7 +105,6 @@ fswalk(Chan *c, Chan *nc, char **name, int nname)
 	}
 	if(nc == nil){
 		nc = devclone(c);
-		nc->type = 0;
 		alloc = 1;
 	}
 	wq->clone = nc;
@@ -152,7 +151,8 @@ fswalk(Chan *c, Chan *nc, char **name, int nname)
 	}else if(wq->clone){
 		/* now attach to our device */
 		nc->aux = smalloc(sizeof(Fsinfo));
-		nc->type = c->type;
+		devtabincref(c->dev);
+		wq->clone->dev = c->dev;
 		FS(nc)->rootqid = FS(c)->rootqid;
 		FS(nc)->name = current;
 		FS(nc)->fd = -1;
@@ -349,7 +349,9 @@ Dev fsdevtab = {
 	'U',
 	"fs",
 
+	devreset,
 	devinit,
+	devshutdown,
 	fsattach,
 	fswalk,
 	fsstat,
diff --git a/emu/Plan9/devsrv9.c b/emu/Plan9/devsrv9.c
index 7ea26dfb..c0e0e6e8 100644
--- a/emu/Plan9/devsrv9.c
+++ b/emu/Plan9/devsrv9.c
@@ -128,7 +128,7 @@ srv9walk(Chan *c, Chan *nc, char **name, int nname)
 	}
 	if(nc == nil){
 		nc = devclone(c);
-		nc->type = 0;	/* device doesn't know about this channel yet */
+		/* device doesn't know about this channel yet */
 		alloc = 1;
 	}
 	wq->clone = nc;
@@ -161,7 +161,8 @@ srv9walk(Chan *c, Chan *nc, char **name, int nname)
 		wq->clone = nil;
 	}else{
 		/* attach cloned channel to device */
-		wq->clone->type = c->type;
+		devtabincref(c->dev);
+		wq->clone->dev = c->dev;
 		if(wq->clone != c)
 			nc->aux = srvget(nc->qid.path);
 	}
@@ -379,7 +380,9 @@ Dev srv9devtab = {
 	L'₪',
 	"srv9",
 
+	devreset,
 	srv9init,	
+	devshutdown,
 	srv9attach,
 	srv9walk,
 	srv9stat,
diff --git a/emu/Plan9/emu b/emu/Plan9/emu
index 0a6c0f53..29da3d40 100644
--- a/emu/Plan9/emu
+++ b/emu/Plan9/emu
@@ -13,7 +13,7 @@ dev
 	fs
 	cmd	cmd
 	indir
-	sign
+#	sign
 
 	draw	win
 	pointer
@@ -33,7 +33,6 @@ lib
 
 	memlayer
 	memdraw
-	keyring
 	sec
 	mp
 	dynld
@@ -57,6 +56,8 @@ port
 	cache
 	chan
 	dev
+	devtab
+
 	dial
 	dis
 	discall
diff --git a/emu/Plan9/emusig b/emu/Plan9/emusig
index 1975a4cc..295fb7f3 100644
--- a/emu/Plan9/emusig
+++ b/emu/Plan9/emusig
@@ -47,6 +47,8 @@ port
 	cache
 	chan
 	dev
+	devtab
+
 	dial
 	dis
 	discall