3 files changed, 7 insertions(+), 6 deletions(-)

M gnot/segment.h
M pc/devincon.c
M port/stream.c

@@ 12,9 12,9 @@ struct Physseg
 	Page	*(*pgalloc)(ulong);	/* Allocation if we need it */
 	void	(*pgfree)(Page*);
 }physseg[] = {
-	{ SG_SHARED,	"lock",		0,	SEGMAXSIZE,	&snewpage, 	&putpage },
-	{ SG_SHARED,	"shared",	0,	SEGMAXSIZE,	&snewpage, 	&putpage },
+	{ SG_SHARED,	"lock",		0,	SEGMAXSIZE,	snewpage, 	putpage },
+	{ SG_SHARED,	"shared",	0,	SEGMAXSIZE,	snewpage, 	putpage },
 	{ SG_PHYSICAL,	"kmem",		KZERO,	SEGMAXSIZE,	0,		0 	},
-	{ SG_BSS,	"memory",	0,	SEGMAXSIZE,	&snewpage,	&putpage },
+	{ SG_BSS,	"memory",	0,	SEGMAXSIZE,	snewpage,	putpage },
 	{ 0,		0,		0,	0,		0,		0 	},
 };

@@ 179,7 179,7 @@ reset(int dev)				/* hardware reset */
 {
 	outb(dev+Qpcr, Finitbar);
 	outb(dev+Qpcr, 0);
-	outb(dev+Qpcr, Finitbar|Fie);
+	outb(dev+Qpcr, Finitbar);
 }
 
 static void


@@ 464,7 464,6 @@ inconreset(void)
 {
 	int i;
 
-	setvec(Parallelvec, inconintr);
 	/*
 	 * state is Selected if we used incon as the boot device
 	 * i.e. we've already got a station number.


@@ 497,10 496,12 @@ inconattach(char *spec)
 	int i;
 	Chan *c;
 
+	setvec(Parallelvec, inconintr);
 	i = strtoul(spec, 0, 0);
 	if(i >= Nincon)
 		error(Ebadarg);
 	ip = &incon[i];
+	rdstatus(ip);
 	if(ip->state != Selected)
 		inconrestart(ip);
 

@@ 1166,7 1166,7 @@ streamread(Chan *c, void *vbuf, long n)
 					error(Ehungup);
 			}
 			q->rp = &q->r;
-			sleep(q->rp, &isinput, (void *)q);
+			sleep(q->rp, isinput, (void *)q);
 			continue;
 		}