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

M ip/esp.c
M pc/devarch.c
M port/chan.c
M port/devdraw.c
M port/devsdp.c

@@ 776,7 776,7 @@ rc4cipher(Espcb *ecb, uchar *p, int n)
 print("missing packet: %uld %ld\n", seq, d);
 			// this link is hosed
 			if(d > RC4forward) {
-				strcpy(up->error, "rc4cipher: skipped too much");
+				strcpy(up->errstr, "rc4cipher: skipped too much");
 				return 0;
 			}
 			esprc4->lgseq = seq;


@@ 792,7 792,7 @@ print("missing packet: %uld %ld\n", seq, d);
 print("reordered packet: %uld %ld\n", seq, d);
 			dd = seq - esprc4->oseq;
 			if(!esprc4->ovalid || -d > RC4back || dd < 0) {
-				strcpy(up->error, "rc4cipher: too far back");
+				strcpy(up->errstr, "rc4cipher: too far back");
 				return 0;
 			}
 			memmove(&tmpstate, &esprc4->old, sizeof(RC4state));

@@ 107,7 107,8 @@ ioinit(void)
 
 	// a dummy entry at 2^16
 	ioalloc(0x10000, 1, 0, "dummy");
-	ioalloc(0x1000, 1, 0, "dummy");
+	ioalloc(0x0fff, 1, 0, "dummy");	// i82557 is at 0x1000, the dummy
+							// entry is needed for swappable devs.
 }
 
 // Reserve a range to be ioalloced later.  This is in particular useful for exchangable cards, such

@@ 353,7 353,7 @@ cclose(Chan *c)
 		return;
 
 	if(waserror()){
-//		print("cclose error: type %C; error %s\n", devtab[c->type]->dc, up!=nil? up->error : "no user");
+//		print("cclose error: type %C; error %s\n", devtab[c->type]->dc, up!=nil? up->errstr : "no user");
 		chanfree(c);
 		return;
 	}

@@ 1292,7 1292,7 @@ drawmesg(Client *client, void *av, int n)
 	fmt = nil;
 	if(waserror()){
 		if(fmt) printmesg(fmt, a, 1);
-	/*	iprint("error: %s\n", up->error);	*/
+	/*	iprint("error: %s\n", up->errstr);	*/
 		nexterror();
 	}
 	while((n-=m) > 0){

@@ 1818,7 1818,7 @@ convreader(void *a)
 		}
 		qlock(c);
 		if(b == nil) {
-			if(strcmp(up->error, Eintr) != 0) {
+			if(strcmp(up->errstr, Eintr) != 0) {
 				convsetstate(c, CClosed);
 				break;
 			}