From ba1dce5cab0e216c904e5e7dd4b58d8e572e1542 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 25 Sep 2001 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2001-09-25

---
 pc/devarch.c    | 1 +
 pc/etherelnk3.c | 4 ++--
 pc/pci.c        | 4 ++--
 port/auth.c     | 2 +-
 port/devcons.c  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pc/devarch.c b/pc/devarch.c
index f2b4029701aa40e113f7e8b0b2bb3f2945687bc9..03aad5be4394b369e2b8e9cea51223e235eeda18 100644
--- a/pc/devarch.c
+++ b/pc/devarch.c
@@ -107,6 +107,7 @@ ioinit(void)
 
 	// a dummy entry at 2^16
 	ioalloc(0x10000, 1, 0, "dummy");
+	ioalloc(0x1000, 1, 0, "dummy");
 }
 
 // Reserve a range to be ioalloced later.  This is in particular useful for exchangable cards, such
diff --git a/pc/etherelnk3.c b/pc/etherelnk3.c
index c1947848663e6f025d5d4cbca6a252c5f3e736b0..bd3a1f674cb8092f5549219291f7a24d4c2426bf 100644
--- a/pc/etherelnk3.c
+++ b/pc/etherelnk3.c
@@ -1491,8 +1491,8 @@ tcm59Xpci(void)
 		if(!(p->mem[0].bar & 0x01))
 			continue;
 		port = p->mem[0].bar & ~0x01;
-		print("tcm59Xpci: Allocating port %X\n", port);
-		if(ioalloc(port, p->mem[0].size, 0, "tcm59Xpci") < 0){
+		if((port = ioalloc((port == 0)? -1: port,  p->mem[0].size, 
+					  0, "tcm59Xpci")) < 0){
 			print("tcm59Xpci: port 0x%uX in use\n", port);
 			continue;
 		}
diff --git a/pc/pci.c b/pc/pci.c
index 10514849f5d29fb71740eda12c33b235c4db66b3..f3f386adc6b141424065c834b8a9af8c943c0096 100644
--- a/pc/pci.c
+++ b/pc/pci.c
@@ -575,7 +575,7 @@ pcicfginit(void)
 					/* reset the cardbus */
 					bcr = pcicfgr16(pci, PciBCR);
 					pcicfgw16(pci, PciBCR, 0x40 | bcr);
-					pcicfgw16(pci, PciBCR, bcr);
+					delay(50);
 				}
 				pci = pci->link;
 			}
@@ -851,7 +851,7 @@ pcilhinv(Pcidev* p)
 	}
 	while(p != nil) {
 		if(p->bridge != nil)
-			pcihinv(p->bridge);
+			pcilhinv(p->bridge);
 		p = p->link;
 	}	
 }
diff --git a/port/auth.c b/port/auth.c
index 27267a5df5c43ac60c1a2fbfd654b13e57efe7c4..c186f1a6a8ce6ca3bb2a7ed721e8ba07ede50dad 100644
--- a/port/auth.c
+++ b/port/auth.c
@@ -5,7 +5,7 @@
 #include	"fns.h"
 #include	"../port/error.h"
 
-#include	<auth.h>
+#include	<authsrv.h>
 
 char	*eve;
 char	evekey[DESKEYLEN];
diff --git a/port/devcons.c b/port/devcons.c
index 85a09066e9421b14419b814347680eeacb8b56ce..f00f36d4a4c58d7f52df08aca8d8e4bb6a0ef0d9 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -5,7 +5,7 @@
 #include	"fns.h"
 #include	"../port/error.h"
 
-#include	<auth.h>
+#include	<authsrv.h>
 
 void	(*consdebug)(void) = nil;
 void	(*screenputs)(char*, int) = nil;