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

---
 gnot/segment.h | 6 +++---
 pc/devincon.c  | 5 +++--
 port/stream.c  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnot/segment.h b/gnot/segment.h
index 09583003a19e98469bbee8ab55e4700cb0d6cbe9..6ae272a2e96cd0dc4544f36ae5bb88861210bf3a 100644
--- a/gnot/segment.h
+++ b/gnot/segment.h
@@ -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 	},
 };
diff --git a/pc/devincon.c b/pc/devincon.c
index e7d8fc8c7dbf0d53e0cca561bb9519a14f71ffd5..c0555e6a2382d645d19f31738d6e8633f25a08d1 100644
--- a/pc/devincon.c
+++ b/pc/devincon.c
@@ -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);
 
diff --git a/port/stream.c b/port/stream.c
index 58645683accaecbd566a3530ae9444a933eae8d8..b1fc0130e4f535d5ca20846bf96715391bbddcc7 100644
--- a/port/stream.c
+++ b/port/stream.c
@@ -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;
 		}