From a3f6a18ee16caf9a757347fa3c09dda001cdf4d3 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 28 Feb 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-02-28

---
 pc/dat.h       | 2 --
 pc/main.c      | 2 --
 port/devcons.c | 2 ++
 power/conf.h   | 2 --
 power/dat.h    | 2 --
 power/io.h     | 2 +-
 power/main.c   | 2 --
 ss/dat.h       | 2 --
 ss/main.c      | 2 --
 9 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pc/dat.h b/pc/dat.h
index df11d8a3261a2064b698edf00dbf15015f6491d4..3ac8d3c731515e9300a58b763d70a099a671010e 100644
--- a/pc/dat.h
+++ b/pc/dat.h
@@ -78,8 +78,6 @@ struct Conf
 	ulong	nbitbyte;	/* bytes of bitmap data (devbit.c) */
 	int	nfont;		/* GFont structs (devbit.c) */
 	ulong	nsubfont;	/* Gsubfont structs (devbit.c) */
-	ulong	nnoifc;		/* number of nonet interfaces */
-	ulong	nnoconv;	/* number of nonet conversations/ifc */
 	ulong	nurp;		/* max urp conversations */
 	ulong	nasync;		/* number of async protocol modules */
 	ulong	npipe;		/* number of pipes */
diff --git a/pc/main.c b/pc/main.c
index d286417a8cc81c8b1d791877fe3caafcce537d0e..2a059336f2a057d0a0aeb63cb7dd95a200b2665d 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -222,8 +222,6 @@ confinit(void)
 	conf.nbitbyte = conf.nbitmap*1024*screenbits();
 	conf.nfont = 10*mul;
 	conf.nsubfont = 30*mul;
-	conf.nnoifc = 1;
-	conf.nnoconv = 32;
 	conf.nurp = 32;
 	conf.nasync = 1;
 	conf.nstream = (conf.nproc*3)/2;
diff --git a/port/devcons.c b/port/devcons.c
index 024d13c2a274b0ac1a32005affc1c4c58a341e7a..62865cb3ac360047e10512fd1e90843e5b6dc632 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -854,6 +854,8 @@ conswrite(Chan *c, void *va, long n, ulong offset)
 			error(Egreg);
 		memmove(buf, va, n);	/* so we can NUL-terminate */
 		buf[n] = 0;
+		if(buf[0]<'0' && '9'<buf[0])
+			error(Ebadarg);
 		fd = strtoul(buf, 0, 0);
 		swc = fdtochan(fd, -1, 1);
 		setswapchan(swc);
diff --git a/power/conf.h b/power/conf.h
index 2f134af4bbd981b05a7228ce021dc51c09aa96b4..2cfc3be7e63cda200a7896818312adffde9a62db 100644
--- a/power/conf.h
+++ b/power/conf.h
@@ -23,8 +23,6 @@ Conftab conftab[] = {
 	{"nqueue", &conf.nqueue },
 	{"nblock", &conf.nblock },
 	{"nsrv", &conf.nsrv },
-	{"nnoifc", &conf.nnoifc },
-	{"nnoconv", &conf.nnoconv },
 	{"nurp", &conf.nurp },
 	{"nasync", &conf.nasync },
 	{"npipe", &conf.npipe },
diff --git a/power/dat.h b/power/dat.h
index 225053d73dc39d0037163c1110802118f3334ba5..4908199c43bc16f15c3bfda1cf28f61a6ea0ad80 100644
--- a/power/dat.h
+++ b/power/dat.h
@@ -60,8 +60,6 @@ struct Conf
 	ulong	nqueue;		/* stream queues */
 	ulong	nblock;		/* stream blocks */
 	ulong	nsrv;		/* public servers (devsrv.c) */
-	ulong	nnoifc;		/* number of nonet interfaces */
-	ulong	nnoconv;	/* number of nonet conversations/ifc */
 	ulong	nurp;		/* max urp conversations */
 	ulong	nasync;		/* number of async protocol modules */
 	ulong	npipe;		/* number of pipes */
diff --git a/power/io.h b/power/io.h
index ae49245fd4ae055d049067edfe8c0a4e6dabad64..f1a7c29eb7e5455ed39b61caaaa5d0feeda86bee 100644
--- a/power/io.h
+++ b/power/io.h
@@ -76,7 +76,7 @@ struct MODE {
  * MP2VME takes a physical MP bus address and returns an address
  * usable by a VME device through A32 space.  VME2MP is its inverse
  */
-#define	MASTER	0x0
+#define	MASTER	0x1	/* 0x10000000 - Map for cyclone A32 addressing */
 #define	SLAVE	0x4
 #define	MP2VME(addr)	(((ulong)(addr) & 0x0fffffff) | (SLAVE<<28))
 #define	VME2MP(addr)	(((ulong)(addr) & 0x0fffffff) | KZERO)
diff --git a/power/main.c b/power/main.c
index 8816a6d932df6409796d791c0956c249b79641ba..f05a3fb196dc561aeabaf38309b1992810019779 100644
--- a/power/main.c
+++ b/power/main.c
@@ -578,8 +578,6 @@ confinit(void)
 	conf.nalarm = 500;
 	conf.nmount = 500;
 	conf.nsrv = 20;
-	conf.nnoifc = 1;
-	conf.nnoconv = 32;
 	conf.nurp = 25;
 	conf.dkif = 1;
 	conf.nqueue = 5 * conf.nstream;
diff --git a/ss/dat.h b/ss/dat.h
index f2a0bd49f3d9bef3a2d3bf729bd5a5ed9e1f2989..dcbafa8754ce5547b721be6e319711c319b9bd7f 100644
--- a/ss/dat.h
+++ b/ss/dat.h
@@ -87,8 +87,6 @@ struct Conf
 	int	nbitbyte;	/* bytes of bitmap data (devbit.c) */
 	int	nfont;		/* GFont structs (devbit.c) */
 	int	nsubfont;	/* Gsubfont structs (devbit.c) */
-	ulong	nnoifc;		/* number of nonet interfaces */
-	ulong	nnoconv;	/* number of nonet conversations/ifc */
 	int	nurp;		/* max urp conversations */
 	int	nasync;		/* number of async protocol modules */
 	int	npipe;		/* number of pipes */
diff --git a/ss/main.c b/ss/main.c
index 960d05725a273295433bc5f357fc92a9a4c82b0c..5678547a303a927bc26e38153f173b74ba5cf4b4 100644
--- a/ss/main.c
+++ b/ss/main.c
@@ -231,8 +231,6 @@ confinit(void)
 	conf.nbitbyte = 300*1024*mul;
 	conf.nfont = 10*mul;
 	conf.nsubfont = 10*mul;
-	conf.nnoifc = 1;
-	conf.nnoconv = 32;
 	conf.nurp = 32;
 	conf.nasync = 1;
 	conf.npipe = conf.nstream/2;