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

M pc/devarch.c
M pc/etherelnk3.c
M pc/pci.c
M port/auth.c
M port/devcons.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

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

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

@@ 5,7 5,7 @@
 #include	"fns.h"
 #include	"../port/error.h"
 
-#include	<auth.h>
+#include	<authsrv.h>
 
 char	*eve;
 char	evekey[DESKEYLEN];

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