9 files changed, 3 insertions(+), 15 deletions(-)

M pc/dat.h
M pc/main.c
M port/devcons.c
M power/conf.h
M power/dat.h
M power/io.h
M power/main.c
M ss/dat.h
M ss/main.c

@@ 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 */

@@ 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;

@@ 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);

@@ 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 },

@@ 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 */

@@ 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)

@@ 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;

@@ 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 */

@@ 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;