8 files changed, 740 insertions(+), 694 deletions(-)

M gnot/fault.c
M port/devdk.c
M port/fault.c
M port/stream.c
M power/bboot.c
M power/boot.c
M power/boot.h
M power/main.c

@@ 162,7 162,6 @@ fault(Ureg *ur, FFrame *f)
 			k = kmap(pg);
 			qlock(o->chan);
 			if(waserror()){
-				print("demand load i/o error %s\n", u->error);
 				kunmap(k);
 				qunlock(o->chan);
 				pg->o = 0;

@@ 128,6 128,8 @@ struct Dk {
 	int	restart;
 	int	urpwindow;
 	Rendez	timer;
+	Rendez	rallclosed;
+	int	allclosedp;	/* true once a closeall has been seen */
 };
 static Dk dk[Ndk];
 static Lock dklock;


@@ 525,6 527,14 @@ dkoput(Queue *q, Block *bp)
  *
  *  we can configure only once
  */
+static int
+allclosed(void *arg)
+{
+	Dk *dp;
+
+	dp = arg;
+	return dp->allclosedp;
+}
 static void
 dkmuxconfig(Queue *q, Block *bp)
 {


@@ 603,6 613,17 @@ dkmuxconfig(Queue *q, Block *bp)
 	dp->csc = dkopenline(dp, dp->ncsc);
 
 	/*
+	 *  start a process to listen to csc messages
+	 */
+	sprint(buf, "csc.%s.%d", dp->name, dp->ncsc);
+	kproc(buf, dkcsckproc, dp);
+
+	/*
+	 *  wait for first possible closeall (may not come)
+	 */
+	tsleep(&dp->rallclosed, allclosed, dp, 2000);
+
+	/*
 	 *  tell datakit we've rebooted. It should close all channels.
 	 *  do this here to get it done before trying to open a channel.
 	 */


@@ 612,16 633,16 @@ dkmuxconfig(Queue *q, Block *bp)
 	}
 
 	/*
-	 *  start a process to listen to csc messages
-	 */
-	sprint(buf, "csc.%s.%d", dp->name, dp->ncsc);
-	kproc(buf, dkcsckproc, dp);
-
-	/*
 	 *  start a keepalive process
 	 */
 	sprint(buf, "timer.%s.%d", dp->name, dp->ncsc);
 	kproc(buf, dktimer, dp);
+
+	/*
+	 *  wait for closeall in response to D_RESTART
+	 */
+	if(dp->restart)
+		tsleep(&dp->rallclosed, allclosed, dp, 10000);
 }
 
 /*


@@ 1564,6 1585,8 @@ dkchgmesg(Chan *c, Dk *dp, Dkmsg *dialp, int line)
 				break;
 			}
 		}
+		dp->allclosedp = 1;
+		wakeup(&dp->rallclosed);
 		break;
 
 	default:

@@ 94,7 94,6 @@ fault(Ureg *ur, int user, int code)
 			pg = newpage(1, o, addr);
 			qlock(o->chan);
 			if(waserror()){
-				print("demand load i/o error %s\n", u->error);
 				qunlock(o->chan);
 				pg->o = 0;
 				pg->ref--;

@@ 1076,11 1076,34 @@ streamread(Chan *c, void *vbuf, long n)
 }
 
 /*
+ *  look for an instance of the line discipline `name' on
+ *  the stream `s'
+ */
+void
+qlook(Stream *s, char *name)
+{
+	Queue *q;
+
+	for(q = s->procq; q; q = q->next){
+		if(strcmp(q->info->name, name) == 0)
+			return;
+
+		/*
+		 *  this may be 2 streams joined device end to device end
+		 */
+		if(q == s->devq->other)
+			break;
+	}
+	errors("not found");
+}
+
+/*
  *  Handle a ctl request.  Streamwide requests are:
  *
  *	hangup			-- send an M_HANGUP up the stream
  *	push ldname		-- push the line discipline named ldname
  *	pop			-- pop a line discipline
+ *	look ldname		-- look for a line discipline
  *
  *  This routing is entrered with s->wrlock'ed and must unlock.
  */


@@ 1116,6 1139,9 @@ streamctlwrite(Chan *c, void *a, long n)
 	} else if(streamparse("pop", bp)){
 		popq(s);
 		freeb(bp);
+	} else if(streamparse("look", bp)){
+		qlook(s, (char *)bp->rptr);
+		freeb(bp);
 	} else {
 		bp->type = M_CTL;
 		bp->flags |= S_DELIM;

@@ 7,12 7,11 @@
 #define DEFSYS "bit!bootes"
 
 Fcall	hdr;
-char	*sys;
 char	*scmd;
-char	*bootfile;
+char	bootfile[5*NAMELEN];
+char	conffile[5*NAMELEN];
+char	sys[NAMELEN];
 
-char	sbuf[2*NAMELEN];
-char	bbuf[5*NAMELEN];
 char	buf[4*1024];
 
 int fd;


@@ 66,7 65,7 @@ int	bitdial(char *);
 int	readseg(int, int, long, long, int);
 int	readkernel(int);
 int	readconf(int);
-int	outin(char *, char *, char *, int);
+int	outin(char *, char *, int);
 void	prerror(char *);
 void	error(char *);
 void	boot(int, char *);


@@ 97,15 96,15 @@ main(int argc, char *argv[])
 			break;
 	}
 
-	sys = DEFSYS;
-	bootfile = DEFFILE;
+	strcpy(sys, DEFSYS);
+	strcpy(bootfile, DEFFILE);
 	switch(argc){
 	case 1:
-		bootfile = argv[0];
+		strcpy(bootfile, argv[0]);
 		break;
 	case 2:
-		bootfile = argv[0];
-		sys = argv[1];
+		strcpy(bootfile, argv[0]);
+		strcpy(sys, argv[1]);
 		break;
 	}
 


@@ 255,14 254,11 @@ void
 boot(int ask, char *addr)
 {
 	int n, tries;
-	char conffile[128];
 	char *srvname;
 
 	if(ask){
-		outin("bootfile", bootfile, bbuf, sizeof(bbuf));
-		bootfile = bbuf;
-		outin("server", sys, sbuf, sizeof(sbuf));
-		sys = sbuf;
+		outin("bootfile", bootfile, sizeof(bootfile));
+		outin("server", sys, sizeof(sys));
 	}
 
 	for(tries = 0; tries < 5; tries++){


@@ 271,8 267,8 @@ boot(int ask, char *addr)
 			fd = bitdial(srvname = &sys[4]);
 		else if(strncmp(sys, "dk!", 3) == 0)
 			fd = dkdial(srvname = &sys[3]);
-		else if(strncmp(sys, "nonet!", 5) == 0)
-			fd = nonetdial(srvname = &sys[5]);
+		else if(strncmp(sys, "nonet!", 6) == 0)
+			fd = nonetdial(srvname = &sys[6]);
 		else
 			fd = nonetdial(srvname = sys);
 		if(fd >= 0)


@@ 361,7 357,7 @@ boot(int ask, char *addr)
 	sprint(conffile, "/mips/conf/%s", addr);
 	print("%s...", conffile);
 	while((fd = open(conffile, OREAD)) < 0){
-		outin("conffile", conffile, conffile, sizeof(conffile));
+		outin("conffile", conffile, sizeof(conffile));
 	}
 	if(readconf(fd) < 0)
 		prerror("readconf");


@@ 369,8 365,7 @@ boot(int ask, char *addr)
 
 	print("%s...", bootfile);
 	while((fd = open(bootfile, OREAD)) < 0){
-		outin("bootfile", bootfile, bbuf, sizeof(bbuf));
-		bootfile = bbuf;
+		outin("bootfile", bootfile, sizeof(bootfile));
 	}
 	readkernel(fd);
 	prerror("couldn't read kernel");


@@ 551,7 546,7 @@ readkernel(int fd)
  *  prompt and get input
  */
 int
-outin(char *prompt, char *def, char *buf, int len)
+outin(char *prompt, char *def, int len)
 {
 	int n;
 


@@ 561,9 556,9 @@ outin(char *prompt, char *def, char *buf, int len)
 	}while(n==0);
 	if(n < 0)
 		error("can't read #c/cons; please reboot");
-	if(n == 1)
-		strcpy(buf, def);
-	else
+	if(n != 1){
 		buf[n-1] = 0;
+		strcpy(def, buf);
+	}
 	return n;
 }

@@ 6,12 6,11 @@
 #define DEFFILE "/mips/9"
 
 Fcall	hdr;
-char	*sys;
 char	*scmd;
-char	*bootfile;
 
-char	sbuf[2*NAMELEN];
 char	buf[4*1024];
+char	bootfile[5*NAMELEN];
+char	sys[NAMELEN];
 
 int fd;
 int cfd;


@@ 35,7 34,7 @@ Address addr[] = {
 /*
  *  predeclared
  */
-int	outin(char *, char *, char *, int);
+int	outin(char *, char *, int);
 void	prerror(char *);
 void	error(char *);
 void	boot(int);


@@ 60,7 59,7 @@ main(int argc, char *argv[])
 	i = create("#e/sysname", 1, 0666);
 	if(i < 0)
 		error("sysname");
-	if(write(i, argv[0], strlen(argv[0])) <= 0)
+	if(write(i, argv[0], strlen(argv[0])) != strlen(argv[0]))
 		error("sysname");
 	close(i);
 


@@ 77,15 76,15 @@ main(int argc, char *argv[])
 			break;
 	}
 
-	sys = DEFSYS;
-	bootfile = DEFFILE;
+	strcpy(sys, DEFSYS);
+	strcpy(bootfile, DEFFILE);
 	switch(argc){
 	case 1:
-		bootfile = argv[0];
+		strcpy(bootfile, argv[0]);
 		break;
 	case 2:
-		bootfile = argv[0];
-		sys = argv[1];
+		strcpy(bootfile, argv[0]);
+		strcpy(sys, argv[1]);
 		break;
 	}
 


@@ 238,8 237,7 @@ boot(int ask)
 	char *srvname;
 
 	if(ask){
-		outin("server", sys, sbuf, sizeof(sbuf));
-		sys = sbuf;
+		outin("server", sys, sizeof(sys));
 	}
 
 	for(tries = 0; tries < 5; tries++){


@@ 248,8 246,8 @@ boot(int ask)
 			fd = bitdial(srvname = &sys[4]);
 		else if(strncmp(sys, "dk!", 3) == 0)
 			fd = dkdial(srvname = &sys[3]);
-		else if(strncmp(sys, "nonet!", 5) == 0)
-			fd = nonetdial(srvname = &sys[5]);
+		else if(strncmp(sys, "nonet!", 6) == 0)
+			fd = nonetdial(srvname = &sys[6]);
 		else
 			fd = nonetdial(srvname = sys);
 		if(fd >= 0)


@@ 385,9 383,11 @@ error(char *s)
  *  prompt and get input
  */
 int
-outin(char *prompt, char *def, char *buf, int len)
+int
+outin(char *prompt, char *def, int len)
 {
 	int n;
+	char buf[256];
 
 	do{
 		print("%s[%s]: ", prompt, def);


@@ 395,9 395,9 @@ outin(char *prompt, char *def, char *buf, int len)
 	}while(n==0);
 	if(n < 0)
 		error("can't read #c/cons; please reboot");
-	if(n == 1)
-		strcpy(buf, def);
-	else
+	if(n != 1){
 		buf[n-1] = 0;
+		strcpy(def, buf);
+	}
 	return n;
 }

@@ 1,8 1,8 @@
 ulong bootcode[]={
 	0x000000407,
-	0x0000048c0,
-	0x000000640,
-	0x000001100,
+	0x0000048f8,
+	0x000000620,
+	0x000001190,
 	0x000000000,
 	0x000001020,
 	0x000000000,


@@ 16,160 16,185 @@ ulong bootcode[]={
 	0x0afa10004,
 	0x00c000415,
 	0x0afa20008,
-	0x00c000833,
+	0x00c000840,
 	0x0afa10004,
 	0x008000411,
 	0x000000027,
-	0x023bdffe4,
+	0x023bdffe0,
 	0x0afbf0000,
-	0x0afa00014,
-	0x023c28219,
+	0x0afa00018,
+	0x023c281f5,
 	0x0afa20004,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa00008,
-	0x023c38221,
+	0x023c381fd,
 	0x0afa30004,
 	0x020020001,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa20008,
-	0x023c38229,
+	0x023c38205,
 	0x0afa30004,
 	0x020020001,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa20008,
-	0x023c28231,
+	0x023c2820d,
 	0x0afa20004,
 	0x020040001,
 	0x0afa40008,
 	0x0200201b6,
-	0x00c00095e,
+	0x00c00096b,
 	0x0afa2000c,
 	0x004210004,
-	0x0afa10018,
-	0x023c3823c,
-	0x00c0007bf,
+	0x0afa1001c,
+	0x023c38218,
+	0x00c0007d2,
 	0x0afa30004,
-	0x08fa40024,
+	0x08fa20028,
+	0x000000027,
+	0x08c420000,
+	0x00c000944,
+	0x0afa20004,
+	0x0afa10014,
+	0x08fa40028,
 	0x000000027,
 	0x08c840000,
-	0x00c000937,
+	0x00c000944,
 	0x0afa40004,
 	0x0afa10010,
-	0x08fa40018,
+	0x08fa4001c,
 	0x000000027,
 	0x0afa40004,
-	0x08fa30024,
+	0x08fa30028,
 	0x000000027,
 	0x08c630000,
 	0x000000027,
 	0x0afa30008,
 	0x08fa40010,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa4000c,
-	0x01c200004,
+	0x08fa30014,
+	0x000000027,
+	0x010230004,
 	0x000000027,
-	0x023c28244,
-	0x00c0007bf,
+	0x023c28220,
+	0x00c0007d2,
 	0x0afa20004,
-	0x08fa30018,
-	0x00c000959,
+	0x08fa3001c,
+	0x00c000966,
 	0x0afa30004,
-	0x08fa70014,
-	0x02009002d,
-	0x08fa20024,
-	0x02008006d,
-	0x08fa30020,
+	0x02007006d,
+	0x08fa20028,
+	0x020090001,
 	0x024450004,
+	0x0afa50028,
+	0x08fa30024,
+	0x02008002d,
 	0x02466ffff,
-	0x018c00017,
-	0x0200a0001,
+	0x018c00012,
+	0x0afa60024,
 	0x08ca30000,
 	0x000000027,
 	0x080630000,
 	0x000000027,
-	0x014690011,
+	0x01468000c,
 	0x000000027,
 	0x08ca30000,
 	0x000000027,
 	0x080630001,
 	0x000000027,
-	0x014680002,
+	0x014670002,
 	0x000000027,
-	0x0000a3825,
-	0x024c6ffff,
-	0x018c00007,
+	0x0afa90018,
 	0x024a50004,
-	0x08ca30000,
-	0x000000027,
-	0x080630000,
-	0x000000027,
-	0x01069fff1,
+	0x0afa50028,
+	0x00800045b,
+	0x024c6ffff,
+	0x023c28002,
+	0x0afa20004,
+	0x023c38228,
+	0x00c000904,
+	0x0afa30008,
+	0x023c286a6,
+	0x0afa20004,
+	0x023c38233,
+	0x00c000904,
+	0x0afa30008,
+	0x08fa60028,
+	0x08fa20024,
 	0x000000027,
-	0x023c2824c,
-	0x0afc28002,
-	0x023c38257,
-	0x038c20001,
-	0x010400021,
-	0x0afc38062,
-	0x038c20002,
-	0x010400018,
+	0x038430001,
+	0x010600029,
+	0x023c586a6,
+	0x038430002,
+	0x010600019,
 	0x000000027,
-	0x00c0005d6,
-	0x0afa70004,
-	0x08fc5809e,
+	0x08fa20018,
+	0x00c0005ef,
+	0x0afa20004,
+	0x08fc580b2,
 	0x000000027,
 	0x018a00003,
 	0x000000027,
-	0x00c000959,
+	0x00c000966,
 	0x0afa50004,
-	0x08fc28076,
+	0x08fc3808a,
 	0x000000027,
-	0x018400004,
+	0x018600004,
 	0x000000027,
-	0x08fc38076,
-	0x00c000959,
-	0x0afa30004,
-	0x0afc08076,
-	0x0afc0809e,
-	0x020030001,
-	0x00c0005d6,
-	0x0afa30004,
-	0x08fc5809e,
-	0x008000477,
+	0x08fc2808a,
+	0x00c000966,
+	0x0afa20004,
+	0x0afc0808a,
+	0x0afc080b2,
+	0x020020001,
+	0x00c0005ef,
+	0x0afa20004,
+	0x08fc580b2,
+	0x008000486,
 	0x000000027,
-	0x08ca30000,
+	0x0afa50004,
+	0x08cc30000,
+	0x00c000904,
+	0x0afa30008,
+	0x023c28002,
+	0x0afa20004,
+	0x08fa30028,
+	0x000000027,
+	0x08c630004,
+	0x00c000904,
+	0x0afa30008,
+	0x008000481,
+	0x000000027,
+	0x0afa50004,
+	0x08cc30000,
+	0x00c000904,
+	0x0afa30008,
+	0x008000481,
 	0x000000027,
-	0x0afc38062,
-	0x08ca20004,
-	0x008000473,
-	0x0afc28002,
-	0x08ca20000,
-	0x008000473,
-	0x0afc28062,
 	0x023bdfff4,
 	0x0afbf0000,
-	0x023c2825f,
-	0x0afa20004,
-	0x020030002,
-	0x00c000972,
-	0x0afa30008,
+	0x023c3823b,
+	0x0afa30004,
+	0x020020002,
+	0x00c00097f,
+	0x0afa20008,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd000c,
 	0x023bdffdc,
 	0x0afbf0000,
-	0x023c580a2,
-	0x08ca20000,
+	0x023c580b6,
+	0x08ca30000,
 	0x000000027,
-	0x01040000b,
+	0x01060000b,
 	0x000000027,
 	0x0afa50014,
-	0x08ca20000,
+	0x08ca30000,
 	0x000000027,
-	0x0afa20004,
+	0x0afa30004,
 	0x08fa40028,
-	0x00c0008e1,
+	0x00c0008ee,
 	0x0afa40008,
 	0x08fa50014,
 	0x0142000a1,


@@ 179,26 204,26 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400008,
 	0x000000027,
-	0x023c38267,
-	0x00c00085e,
+	0x023c38243,
+	0x00c00086b,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
-	0x08fc2807e,
+	0x08fc28092,
 	0x000000027,
 	0x014400048,
 	0x000000027,
-	0x023c28295,
+	0x023c28271,
 	0x0afa20004,
 	0x020040002,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa40008,
 	0x004210008,
 	0x000000027,
-	0x023c3829e,
-	0x00c0007ad,
+	0x023c3827a,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,


@@ 206,88 231,88 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x0afa10020,
 	0x0afa10004,
-	0x023c482af,
+	0x023c4828b,
 	0x0afa40008,
 	0x02003000d,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa3000c,
 	0x08fa50020,
 	0x00421000a,
 	0x000000027,
-	0x00c000959,
+	0x00c000966,
 	0x0afa50004,
-	0x023c382bd,
-	0x00c0007ad,
+	0x023c38299,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c482cb,
+	0x023c482a7,
 	0x0afa40008,
 	0x02003000c,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa3000c,
 	0x08fa50020,
 	0x00421000a,
 	0x000000027,
-	0x00c000959,
+	0x00c000966,
 	0x0afa50004,
-	0x023c382d8,
-	0x00c0007ad,
+	0x023c382b4,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c482e5,
+	0x023c482c1,
 	0x0afa40008,
 	0x02003000c,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa3000c,
 	0x00421000b,
 	0x000000027,
 	0x08fa20020,
-	0x00c000959,
+	0x00c000966,
 	0x0afa20004,
-	0x023c382f2,
-	0x00c0007ad,
+	0x023c382ce,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
 	0x020020001,
-	0x0afc2807e,
-	0x023c282ff,
+	0x0afc28092,
+	0x023c282db,
 	0x0afa20004,
 	0x020040002,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa40008,
 	0x004210008,
 	0x0afa10018,
-	0x023c3830e,
-	0x00c0007ad,
+	0x023c382ea,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0024,
 	0x000400008,
 	0x02001ffff,
-	0x023c38325,
+	0x023c38301,
 	0x0afa30004,
 	0x020040002,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa40008,
 	0x00421000c,
 	0x0afa1001c,
 	0x08fa20018,
-	0x00c000959,
+	0x00c000966,
 	0x0afa20004,
-	0x023c28333,
+	0x023c2830f,
 	0x0afa20004,
-	0x00c0007ad,
+	0x00c0007c0,
 	0x02003ffff,
 	0x08fa20000,
 	0x023bd0024,


@@ 296,7 321,7 @@ ulong bootcode[]={
 	0x08fa40014,
 	0x000000027,
 	0x08c840004,
-	0x00c000937,
+	0x00c000944,
 	0x0afa40004,
 	0x0afa10010,
 	0x08fa4001c,


@@ 308,22 333,22 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08fa40010,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa4000c,
 	0x004210012,
 	0x000000027,
 	0x08fa2001c,
-	0x00c000959,
+	0x00c000966,
 	0x0afa20004,
 	0x08fa30018,
-	0x00c000959,
+	0x00c000966,
 	0x0afa30004,
 	0x08fa30014,
 	0x000000027,
 	0x08c630004,
 	0x000000027,
 	0x0afa30004,
-	0x00c0007ad,
+	0x00c0007c0,
 	0x02002ffff,
 	0x08fa20000,
 	0x023bd0024,


@@ 334,96 359,96 @@ ulong bootcode[]={
 	0x000000027,
 	0x000400008,
 	0x023bd0024,
-	0x0080004a1,
+	0x0080004ba,
 	0x024a50008,
 	0x023bdffa8,
 	0x0afbf0000,
-	0x08fc2810e,
+	0x08fc280ea,
 	0x000000027,
 	0x014400038,
 	0x000000027,
-	0x023c28349,
+	0x023c28325,
 	0x0afa20004,
 	0x020040002,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa40008,
 	0x004210008,
-	0x0afc1807a,
-	0x023c38350,
-	0x00c0007ad,
+	0x0afc1808e,
+	0x023c3832c,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
 	0x0afa10004,
-	0x023c4835f,
+	0x023c4833b,
 	0x0afa40008,
 	0x02003000a,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa3000c,
-	0x08fc5807a,
+	0x08fc5808e,
 	0x00421000a,
 	0x000000027,
-	0x00c000959,
+	0x00c000966,
 	0x0afa50004,
-	0x023c3836a,
-	0x00c0007ad,
+	0x023c38346,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
 	0x0afa50004,
-	0x023c48375,
+	0x023c48351,
 	0x0afa40008,
 	0x020030017,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa3000c,
 	0x00421000b,
 	0x000000027,
-	0x08fc2807a,
-	0x00c000959,
+	0x08fc2808e,
+	0x00c000966,
 	0x0afa20004,
-	0x023c3838d,
-	0x00c0007ad,
+	0x023c38369,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
 	0x020020001,
-	0x0afc2810e,
+	0x0afc280ea,
 	0x0200307d0,
-	0x00c00097c,
+	0x00c000989,
 	0x0afa30004,
-	0x023c383a5,
+	0x023c38381,
 	0x0afa30004,
 	0x020040002,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa40008,
 	0x004210008,
 	0x0afa10054,
-	0x023c283b1,
-	0x00c0007ad,
+	0x023c2838d,
+	0x00c0007c0,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0058,
 	0x000400008,
 	0x02001ffff,
-	0x023c283c5,
+	0x023c283a1,
 	0x0afa20004,
 	0x020040002,
-	0x00c000972,
+	0x00c00097f,
 	0x0afa40008,
 	0x00421000c,
-	0x0afc18076,
+	0x0afc1808a,
 	0x08fa30054,
-	0x00c000959,
+	0x00c000966,
 	0x0afa30004,
-	0x023c383d0,
+	0x023c383ac,
 	0x0afa30004,
-	0x00c0007ad,
+	0x00c0007c0,
 	0x02002ffff,
 	0x08fa20000,
 	0x023bd0058,


@@ 431,34 456,34 @@ ulong bootcode[]={
 	0x02001ffff,
 	0x023a20014,
 	0x0afa20004,
-	0x023c383e3,
+	0x023c383bf,
 	0x0afa30008,
 	0x08fa2005c,
-	0x00c0008a8,
+	0x00c0008b5,
 	0x0afa2000c,
 	0x023a40014,
-	0x00c000937,
+	0x00c000944,
 	0x0afa40004,
 	0x0afa10010,
-	0x08fc48076,
+	0x08fc4808a,
 	0x023a20014,
 	0x0afa40004,
 	0x0afa20008,
 	0x08fa40010,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa4000c,
 	0x004210010,
 	0x000000027,
-	0x08fc28076,
-	0x00c000959,
+	0x08fc2808a,
+	0x00c000966,
 	0x0afa20004,
 	0x08fa30054,
-	0x00c000959,
+	0x00c000966,
 	0x0afa30004,
 	0x02002ffff,
-	0x0afc28076,
+	0x0afc2808a,
 	0x023a30014,
-	0x00c0007ad,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x023bd0058,


@@ 471,100 496,96 @@ ulong bootcode[]={
 	0x023bd0058,
 	0x023bdffd4,
 	0x0afbf0000,
-	0x08fc6809e,
+	0x08fc680b2,
 	0x08fa20030,
 	0x000000027,
-	0x01040000d,
+	0x01040000a,
 	0x000000027,
-	0x023c383ee,
+	0x023c383ca,
 	0x0afa30004,
-	0x08fc28002,
-	0x023c380d2,
+	0x023c28002,
 	0x0afa20008,
+	0x02003001c,
+	0x00c0007e6,
 	0x0afa3000c,
-	0x020020038,
-	0x00c0007d3,
-	0x0afa20010,
-	0x08fc6809e,
-	0x023c380d2,
-	0x0afc38002,
+	0x08fc680b2,
+	0x000000027,
 	0x000002825,
 	0x028a20005,
-	0x010400014,
+	0x010400013,
 	0x0afa50020,
 	0x02002ffff,
-	0x0afc2809e,
-	0x08fc28002,
-	0x023c483f5,
+	0x0afc280b2,
+	0x023c28002,
 	0x0afa20004,
+	0x023c483d1,
 	0x0afa40008,
 	0x020020004,
-	0x00c0008c0,
+	0x00c0008cd,
 	0x0afa2000c,
-	0x08fc58002,
 	0x014200192,
-	0x000000027,
+	0x023c58002,
 	0x024a20004,
 	0x0afa2001c,
-	0x00c000493,
+	0x00c0004ac,
 	0x0afa20004,
 	0x000013025,
 	0x004c00181,
-	0x0afc6809e,
+	0x0afc680b2,
 	0x004c10008,
 	0x000000027,
-	0x023c38421,
-	0x00c00085e,
+	0x023c383fd,
+	0x00c00086b,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x023c28430,
-	0x00c00085e,
+	0x023c2840c,
+	0x00c00086b,
 	0x0afa20004,
 	0x020030032,
-	0x0a3c396c6,
+	0x0a3c39732,
 	0x02002ffff,
-	0x0a7c296ca,
-	0x023c296c6,
+	0x0a7c29736,
+	0x023c29732,
 	0x0afa20004,
-	0x023c486c6,
-	0x00c000986,
+	0x023c48732,
+	0x00c000993,
 	0x0afa40008,
-	0x08fc3809e,
-	0x023c486c6,
+	0x08fc380b2,
+	0x023c48732,
 	0x0afa30004,
 	0x0afa40008,
 	0x0afa10028,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa1000c,
 	0x08fa50028,
 	0x000000027,
 	0x01025000c,
 	0x000000027,
-	0x023c28437,
+	0x023c28413,
 	0x0afa20004,
-	0x00c00085e,
+	0x00c00086b,
 	0x0afa50008,
-	0x023c2843f,
-	0x00c0007ad,
+	0x023c2841b,
+	0x00c0007c0,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x08fc2809e,
-	0x023c486c6,
+	0x08fc280b2,
+	0x023c48732,
 	0x0afa20004,
 	0x0afa40008,
 	0x020021000,
-	0x00c000977,
+	0x00c000984,
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c38449,
-	0x00c0007ad,
+	0x023c38425,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,


@@ 573,386 594,384 @@ ulong bootcode[]={
 	0x020030002,
 	0x014230003,
 	0x000000027,
-	0x00800062b,
+	0x008000640,
 	0x000000027,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa30004,
-	0x023c496c6,
+	0x023c49732,
 	0x0afa40008,
 	0x0afa10028,
-	0x00c000d39,
+	0x00c000d46,
 	0x0afa1000c,
 	0x014200019,
 	0x000000027,
-	0x023c28452,
+	0x023c2842e,
 	0x0afa20004,
 	0x08fa30028,
 	0x000000027,
 	0x0afa30008,
-	0x083c286c6,
+	0x083c28732,
 	0x000000027,
 	0x0afa2000c,
-	0x083c386c7,
+	0x083c38733,
 	0x000000027,
 	0x0afa30010,
-	0x083c286c8,
+	0x083c28734,
 	0x000000027,
 	0x0afa20014,
-	0x083c386c9,
-	0x00c00085e,
+	0x083c38735,
+	0x00c00086b,
 	0x0afa30018,
-	0x023c28475,
-	0x00c0007ad,
+	0x023c28451,
+	0x00c0007c0,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x083c396c6,
+	0x083c39732,
 	0x020020033,
 	0x010620008,
 	0x000000027,
-	0x023c38480,
-	0x00c0007ad,
+	0x023c3845c,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x087c296ca,
+	0x087c29736,
 	0x02003ffff,
 	0x010430008,
 	0x000000027,
-	0x023c28489,
-	0x00c0007ad,
+	0x023c28465,
+	0x00c0007c0,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x023c38494,
-	0x00c00085e,
+	0x023c38470,
+	0x00c00086b,
 	0x0afa30004,
 	0x020020034,
-	0x0a3c296c6,
+	0x0a3c29732,
 	0x02003ffff,
-	0x0a7c396ca,
-	0x023c396c6,
+	0x0a7c39736,
+	0x023c39732,
 	0x0afa30004,
-	0x023c486c6,
-	0x00c000986,
+	0x023c48732,
+	0x00c000993,
 	0x0afa40008,
-	0x08fc2809e,
-	0x023c486c6,
+	0x08fc280b2,
+	0x023c48732,
 	0x0afa20004,
 	0x0afa40008,
 	0x0afa10028,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa1000c,
 	0x08fa40028,
 	0x000000027,
 	0x010240008,
 	0x000000027,
-	0x023c2849f,
-	0x00c0007ad,
+	0x023c2847b,
+	0x00c0007c0,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x08fc2809e,
-	0x023c486c6,
+	0x08fc280b2,
+	0x023c48732,
 	0x0afa20004,
 	0x0afa40008,
 	0x020021000,
-	0x00c000977,
+	0x00c000984,
 	0x0afa2000c,
 	0x01c200008,
 	0x000000027,
-	0x023c384ad,
-	0x00c0007ad,
+	0x023c38489,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa30004,
-	0x023c496c6,
+	0x023c49732,
 	0x0afa40008,
-	0x00c000d39,
+	0x00c000d46,
 	0x0afa1000c,
 	0x014200008,
 	0x000000027,
-	0x023c284ba,
-	0x00c0007ad,
+	0x023c28496,
+	0x00c0007c0,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x087c396ca,
+	0x087c39736,
 	0x02002ffff,
 	0x010620008,
 	0x000000027,
-	0x023c384c9,
-	0x00c0007ad,
+	0x023c384a5,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x083c296c6,
+	0x083c29732,
 	0x020030037,
 	0x01443000d,
 	0x000000027,
 	0x020020002,
 	0x0afa20004,
-	0x023c384d4,
+	0x023c384b0,
 	0x0afa30008,
-	0x023c296c6,
+	0x023c29732,
 	0x024420008,
-	0x00c000883,
+	0x00c000890,
 	0x0afa2000c,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x083c396c6,
+	0x083c39732,
 	0x020020035,
 	0x010620008,
 	0x000000027,
-	0x023c384e4,
-	0x00c0007ad,
+	0x023c384c0,
+	0x00c0007c0,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x023c284f1,
-	0x00c00085e,
+	0x023c284cd,
+	0x00c00086b,
 	0x0afa20004,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa30004,
-	0x023c284f9,
+	0x023c284d5,
 	0x0afa20008,
 	0x08fa3001c,
-	0x00c0008a8,
+	0x00c0008b5,
 	0x0afa3000c,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa30004,
 	0x020040001,
 	0x0afa40008,
 	0x0200301b6,
-	0x00c00095e,
+	0x00c00096b,
 	0x0afa3000c,
 	0x004210004,
 	0x0afa10024,
-	0x023c284ff,
-	0x00c0007bf,
+	0x023c284db,
+	0x00c0007d2,
 	0x0afa20004,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa30004,
-	0x023c28506,
+	0x023c284e2,
 	0x0afa20008,
-	0x08fc3809e,
-	0x00c0008a8,
+	0x08fc380b2,
+	0x00c0008b5,
 	0x0afa3000c,
-	0x023c286c6,
-	0x00c000937,
+	0x023c28732,
+	0x00c000944,
 	0x0afa20004,
 	0x0afa10018,
-	0x023c486c6,
-	0x00c000937,
+	0x023c48732,
+	0x00c000944,
 	0x0afa40004,
 	0x0afa10014,
 	0x08fa40024,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa40004,
 	0x0afa30008,
 	0x08fa40014,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa4000c,
 	0x08fa30018,
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c28509,
-	0x00c0007bf,
+	0x023c284e5,
+	0x00c0007d2,
 	0x0afa20004,
 	0x08fa30024,
-	0x00c000959,
+	0x00c000966,
 	0x0afa30004,
-	0x023c3850f,
+	0x023c384eb,
 	0x0afa30004,
 	0x020040001,
 	0x0afa40008,
 	0x0200301b6,
-	0x00c00095e,
+	0x00c00096b,
 	0x0afa3000c,
 	0x004210004,
 	0x0afa10024,
-	0x023c28517,
-	0x00c0007bf,
+	0x023c284f3,
+	0x00c0007d2,
 	0x0afa20004,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa30004,
-	0x023c2851e,
+	0x023c284fa,
 	0x0afa20008,
-	0x08fc3809e,
-	0x00c0008a8,
+	0x08fc380b2,
+	0x00c0008b5,
 	0x0afa3000c,
-	0x023c286c6,
-	0x00c000937,
+	0x023c28732,
+	0x00c000944,
 	0x0afa20004,
 	0x0afa10018,
-	0x023c486c6,
-	0x00c000937,
+	0x023c48732,
+	0x00c000944,
 	0x0afa40004,
 	0x0afa10014,
 	0x08fa40024,
-	0x023c386c6,
+	0x023c38732,
 	0x0afa40004,
 	0x0afa30008,
 	0x08fa40014,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa4000c,
 	0x08fa30018,
 	0x000000027,
 	0x010230004,
 	0x000000027,
-	0x023c28521,
-	0x00c0007bf,
+	0x023c284fd,
+	0x00c0007d2,
 	0x0afa20004,
 	0x08fa30024,
-	0x00c000959,
+	0x00c000966,
 	0x0afa30004,
-	0x023c28527,
-	0x00c00085e,
+	0x023c28503,
+	0x00c00086b,
 	0x0afa20004,
-	0x023c28530,
+	0x023c2850c,
 	0x0afa20004,
-	0x023c48532,
+	0x023c4850e,
 	0x0afa40008,
-	0x00c000954,
+	0x00c000961,
 	0x0afa0000c,
 	0x004210004,
 	0x000000027,
-	0x023c28534,
-	0x00c0007bf,
+	0x023c28510,
+	0x00c0007d2,
 	0x0afa20004,
-	0x08fc2809e,
-	0x023c48539,
+	0x08fc280b2,
+	0x023c48515,
 	0x0afa20004,
 	0x0afa40008,
 	0x020020006,
 	0x0afa2000c,
-	0x023c4853b,
+	0x023c48517,
 	0x0afa40010,
-	0x023c2853c,
-	0x00c00096d,
+	0x023c28518,
+	0x00c00097a,
 	0x0afa20014,
 	0x004210004,
 	0x000000027,
-	0x023c3853d,
-	0x00c0007bf,
+	0x023c38519,
+	0x00c0007d2,
 	0x0afa30004,
-	0x023c28543,
-	0x00c00085e,
+	0x023c2851f,
+	0x00c00086b,
 	0x0afa20004,
-	0x08fc3809e,
-	0x00c000959,
+	0x08fc380b2,
+	0x00c000966,
 	0x0afa30004,
 	0x08fa20030,
 	0x000000027,
 	0x010400010,
 	0x000000027,
-	0x023c3854c,
+	0x023c38528,
 	0x0afa30004,
-	0x023c28557,
+	0x023c28533,
 	0x0afa20008,
-	0x023c3855c,
+	0x023c38538,
 	0x0afa3000c,
-	0x00c000943,
+	0x00c000950,
 	0x0afa00010,
-	0x023c2856f,
-	0x00c0007bf,
+	0x023c2854b,
+	0x00c0007d2,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x023c2855f,
+	0x023c2853b,
 	0x0afa20004,
-	0x023c3856a,
+	0x023c38546,
 	0x0afa30008,
-	0x00c000943,
+	0x00c000950,
 	0x0afa0000c,
-	0x023c2856f,
-	0x00c0007bf,
+	0x023c2854b,
+	0x00c0007d2,
 	0x0afa20004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd002c,
-	0x023c28405,
-	0x00c00085e,
+	0x023c283e1,
+	0x00c00086b,
 	0x0afa20004,
 	0x0200303e8,
-	0x00c00097c,
+	0x00c000989,
 	0x0afa30004,
-	0x08fc6809e,
+	0x08fc680b2,
 	0x08fa20020,
-	0x0080005ea,
+	0x008000600,
 	0x024450001,
 	0x0afa50004,
-	0x023c483fa,
+	0x023c483d6,
 	0x0afa40008,
 	0x020030003,
-	0x00c0008c0,
+	0x00c0008cd,
 	0x0afa3000c,
-	0x08fc58002,
 	0x014200007,
-	0x000000027,
+	0x023c58002,
 	0x024a30003,
 	0x0afa3001c,
-	0x00c000551,
+	0x00c00056a,
 	0x0afa30004,
-	0x0080005fe,
+	0x008000613,
 	0x000013025,
 	0x0afa50004,
-	0x023c483fe,
+	0x023c483da,
 	0x0afa40008,
-	0x020020005,
-	0x00c0008c0,
+	0x020020006,
+	0x00c0008cd,
 	0x0afa2000c,
-	0x08fc58002,
 	0x014200007,
-	0x000000027,
-	0x024a20005,
+	0x023c58002,
+	0x024a20006,
 	0x0afa2001c,
-	0x00c00049e,
+	0x00c0004b7,
 	0x0afa20004,
-	0x0080005fe,
+	0x008000613,
 	0x000013025,
 	0x0afa5001c,
-	0x00c00049e,
+	0x00c0004b7,
 	0x0afa50004,
-	0x0080005fe,
+	0x008000613,
 	0x000013025,
 	0x023bdffac,
 	0x0afbf0000,
 	0x023a30014,
-	0x00c000963,
+	0x00c000970,
 	0x0afa30004,
 	0x020020002,
 	0x0afa20004,
-	0x023c3857a,
+	0x023c38556,
 	0x0afa30008,
 	0x08fa20058,
 	0x023a30014,
 	0x0afa2000c,
-	0x00c000883,
+	0x00c000890,
 	0x0afa30010,
 	0x08fa20000,
 	0x000000027,


@@ 961,75 980,69 @@ ulong bootcode[]={
 	0x023bdffac,
 	0x0afbf0000,
 	0x023a20014,
-	0x00c000963,
+	0x00c000970,
 	0x0afa20004,
 	0x020030002,
 	0x0afa30004,
-	0x023c28588,
+	0x023c28564,
 	0x0afa20008,
 	0x08fa30058,
 	0x023a20014,
 	0x0afa3000c,
-	0x00c000883,
+	0x00c000890,
 	0x0afa20010,
-	0x00c000842,
+	0x00c00084f,
 	0x0afa00004,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0054,
-	0x023bdffec,
+	0x023bdfeec,
 	0x0afbf0000,
-	0x023c28596,
+	0x023c28572,
 	0x0afa20004,
-	0x08fa30018,
+	0x08fa30118,
 	0x000000027,
 	0x0afa30008,
-	0x08fa2001c,
-	0x00c00085e,
+	0x08fa2011c,
+	0x00c00086b,
 	0x0afa2000c,
 	0x0afa00004,
-	0x08fa20020,
-	0x000000027,
+	0x023a20010,
 	0x0afa20008,
-	0x08fa40024,
-	0x00c000977,
+	0x08fa40120,
+	0x00c000984,
 	0x0afa4000c,
 	0x014200003,
 	0x000012825,
-	0x0080007d5,
+	0x0080007e8,
 	0x000000027,
 	0x004210006,
-	0x0afa10010,
-	0x023c3859f,
-	0x00c0007bf,
+	0x0afa10110,
+	0x023c3857b,
+	0x00c0007d2,
 	0x0afa30004,
-	0x08fa50010,
+	0x08fa50110,
 	0x000000027,
 	0x020030001,
-	0x014a3000c,
-	0x000000027,
-	0x08fa20020,
+	0x010a3000b,
 	0x000000027,
+	0x023a20010,
+	0x000a21021,
+	0x0a040ffff,
+	0x08fa2011c,
+	0x023a30010,
 	0x0afa20004,
-	0x08fa3001c,
-	0x00c0008f7,
+	0x00c000904,
 	0x0afa30008,
-	0x08fa50010,
-	0x08fa20000,
-	0x023bd0014,
-	0x000400008,
-	0x000050825,
-	0x08fa30020,
+	0x08fa50110,
 	0x000000027,
-	0x000a31021,
-	0x0a040ffff,
 	0x08fa20000,
-	0x023bd0014,
+	0x023bd0114,
 	0x000400008,
 	0x000050825,
 	0x023bdfff8,
-	0x023c68642,
+	0x023c68622,
 	0x000002825,
 	0x028a20021,
 	0x010400011,


@@ 1055,7 1068,7 @@ ulong bootcode[]={
 	0x000070825,
 	0x023bdfff8,
 	0x08fa7000c,
-	0x023c58642,
+	0x023c58622,
 	0x000002025,
 	0x028820021,
 	0x01040000d,


@@ 1080,10 1093,10 @@ ulong bootcode[]={
 	0x000000027,
 	0x014400003,
 	0x000000027,
-	0x00c000842,
+	0x00c00084f,
 	0x0afa00004,
-	0x023c38086,
-	0x00c000842,
+	0x023c3809a,
+	0x00c00084f,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,


@@ 1091,7 1104,7 @@ ulong bootcode[]={
 	0x023bd0008,
 	0x023bdfff0,
 	0x0afbf0000,
-	0x023c68642,
+	0x023c68622,
 	0x020040020,
 	0x004800010,
 	0x000000027,


@@ 1107,11 1120,11 @@ ulong bootcode[]={
 	0x000a0f809,
 	0x0ac400000,
 	0x08fa4000c,
-	0x023c68642,
-	0x008000846,
+	0x023c68622,
+	0x008000853,
 	0x02484ffff,
 	0x08fa30014,
-	0x00c00094f,
+	0x00c00095c,
 	0x0afa30004,
 	0x08fa20000,
 	0x000000027,


@@ 1127,26 1140,26 @@ ulong bootcode[]={
 	0x023a41020,
 	0x0afa3000c,
 	0x024840004,
-	0x00c00100e,
+	0x00c00101b,
 	0x0afa40010,
 	0x023a6001c,
 	0x020020001,
 	0x0afa20004,
 	0x0afa60008,
 	0x000261023,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa2000c,
 	0x0afa10014,
 	0x00421000c,
 	0x000012825,
-	0x08fc3806e,
+	0x08fc38082,
 	0x000000027,
 	0x024630001,
 	0x02862000a,
 	0x014400006,
-	0x0afc3806e,
+	0x0afc38082,
 	0x020020001,
-	0x00c000833,
+	0x00c000840,
 	0x0afa20004,
 	0x08fa50014,
 	0x000000027,


@@ 1164,26 1177,26 @@ ulong bootcode[]={
 	0x023a41024,
 	0x0afa3000c,
 	0x024840004,
-	0x00c00100e,
+	0x00c00101b,
 	0x0afa40010,
 	0x08fa21020,
 	0x023a6001c,
 	0x0afa20004,
 	0x0afa60008,
 	0x000261023,
-	0x00c000981,
+	0x00c00098e,
 	0x0afa2000c,
 	0x0afa10014,
 	0x00421000c,
 	0x000012825,
-	0x08fc3806e,
+	0x08fc38082,
 	0x000000027,
 	0x024630001,
 	0x02862000a,
 	0x014400006,
-	0x0afc3806e,
+	0x0afc38082,
 	0x020020001,
-	0x00c000833,
+	0x00c000840,
 	0x0afa20004,
 	0x08fa50014,
 	0x000000027,


@@ 1194,7 1207,7 @@ ulong bootcode[]={
 	0x023bdffe4,
 	0x0afbf0000,
 	0x08fa50020,
-	0x08fc28072,
+	0x08fc28086,
 	0x024a41000,
 	0x0afa20014,
 	0x0afa50004,


@@ 1203,11 1216,11 @@ ulong bootcode[]={
 	0x023a40024,
 	0x0afa2000c,
 	0x024840004,
-	0x00c00100e,
+	0x00c00101b,
 	0x0afa40010,
 	0x08fa20014,
 	0x000000027,
-	0x0afc28072,
+	0x0afc28086,
 	0x08fa20020,
 	0x000000027,
 	0x000220823,


@@ 1339,7 1352,7 @@ ulong bootcode[]={
 	0x08fa20010,
 	0x000000027,
 	0x0afa20004,
-	0x00c001510,
+	0x00c00151d,
 	0x0afa00008,
 	0x08fa30010,
 	0x08fa20000,


@@ 1352,7 1365,7 @@ ulong bootcode[]={
 	0x023a30010,
 	0x0afa20004,
 	0x024630004,
-	0x00c000968,
+	0x00c000975,
 	0x0afa30008,
 	0x08fa20000,
 	0x000000027,


@@ 1454,10 1467,10 @@ ulong bootcode[]={
 	0x038620034,
 	0x01040000a,
 	0x000000027,
-	0x023c38006,
+	0x023c3801e,
 	0x0afa30004,
 	0x080a20000,
-	0x00c00085e,
+	0x00c00086b,
 	0x0afa20008,
 	0x08fa20000,
 	0x023bd0014,


@@ 1479,7 1492,7 @@ ulong bootcode[]={
 	0x038620039,
 	0x01040fff1,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a2000a,
 	0x000000027,


@@ 1500,7 1513,7 @@ ulong bootcode[]={
 	0x024a20008,
 	0x0afa20008,
 	0x020030040,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,


@@ 1523,7 1536,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024a20008,
 	0x0afa20008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa7000c,
 	0x08fa20010,
 	0x02003001c,


@@ 1534,7 1547,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420024,
 	0x0afa20008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20010,
 	0x02003001c,


@@ 1545,7 1558,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024420040,
 	0x0afa20008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20010,
 	0x000000027,


@@ 1571,7 1584,7 @@ ulong bootcode[]={
 	0x03862003d,
 	0x010400003,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a30002,
 	0x000000027,


@@ 1663,7 1676,7 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x024a3000c,
 	0x0afa30008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa7000c,
 	0x08fa30010,
 	0x08fa2001c,


@@ 1679,7 1692,7 @@ ulong bootcode[]={
 	0x038620040,
 	0x010400003,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a30002,
 	0x000000027,


@@ 1806,7 1819,7 @@ ulong bootcode[]={
 	0x038620044,
 	0x010400003,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a30002,
 	0x000000027,


@@ 1903,7 1916,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024a2000c,
 	0x0afa20008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa7000c,
 	0x08fa70018,
 	0x08fa20010,


@@ 1956,7 1969,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,


@@ 1979,7 1992,7 @@ ulong bootcode[]={
 	0x038620048,
 	0x010400003,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a20002,
 	0x000000027,


@@ 2056,7 2069,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa20008,
 	0x08ca3000c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20018,
 	0x08fa30010,


@@ 2098,7 2111,7 @@ ulong bootcode[]={
 	0x03862004c,
 	0x010400003,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a20002,
 	0x000000027,


@@ 2153,7 2166,7 @@ ulong bootcode[]={
 	0x0afa30004,
 	0x024a30008,
 	0x0afa30008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa8000c,
 	0x08fa30010,
 	0x08fa2001c,


@@ 2169,7 2182,7 @@ ulong bootcode[]={
 	0x03862004f,
 	0x010400003,
 	0x000000027,
-	0x0080009af,
+	0x0080009bc,
 	0x000000027,
 	0x084a30002,
 	0x000000027,


@@ 2196,7 2209,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x024a20008,
 	0x0afa20008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa8000c,
 	0x08fa20010,
 	0x000000027,


@@ 2217,7 2230,7 @@ ulong bootcode[]={
 	0x08fa30018,
 	0x000000027,
 	0x0afa30008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,


@@ 2228,7 2241,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x02463001c,
 	0x0afa30008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa2000c,
 	0x08fa30010,
 	0x02002001c,


@@ 2239,7 2252,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x024630038,
 	0x0afa30008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa2000c,
 	0x08fa40018,
 	0x08fa30010,


@@ 2402,10 2415,10 @@ ulong bootcode[]={
 	0x038430034,
 	0x01060000a,
 	0x000000027,
-	0x023c28014,
+	0x023c2802c,
 	0x0afa20004,
 	0x080c30000,
-	0x00c00085e,
+	0x00c00086b,
 	0x0afa30008,
 	0x08fa20000,
 	0x023bd0014,


@@ 2435,24 2448,24 @@ ulong bootcode[]={
 	0x038430039,
 	0x01060ffe9,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c2000a,
 	0x024c20008,
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
 	0x020020040,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000d6c,
+	0x008000d79,
 	0x024650040,
 	0x090a20000,
 	0x090a30001,


@@ 2464,7 2477,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa7000c,
 	0x08fa30010,
 	0x08fa2001c,


@@ 2474,7 2487,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa2000c,
 	0x08fa30010,
 	0x08fa2001c,


@@ 2484,10 2497,10 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02002001c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa2000c,
 	0x08fa30010,
-	0x008000d6c,
+	0x008000d79,
 	0x02465001c,
 	0x02443ffc2,
 	0x01c600050,


@@ 2503,14 2516,14 @@ ulong bootcode[]={
 	0x03843003d,
 	0x010600003,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,


@@ 2523,7 2536,7 @@ ulong bootcode[]={
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20008,
 	0x090a20000,
 	0x090a30001,


@@ 2554,7 2567,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000d6c,
+	0x008000d79,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,


@@ 2566,10 2579,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa7000c,
 	0x08fa30010,
-	0x008000d6c,
+	0x008000d79,
 	0x02465001c,
 	0x03843003f,
 	0x010600011,


@@ 2577,7 2590,7 @@ ulong bootcode[]={
 	0x038430040,
 	0x010600003,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,


@@ 2588,7 2601,7 @@ ulong bootcode[]={
 	0x024a30002,
 	0x024650001,
 	0x080630000,
-	0x008000d6c,
+	0x008000d79,
 	0x0a0c30028,
 	0x090a20000,
 	0x090a30001,


@@ 2619,7 2632,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000d6c,
+	0x008000d79,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,


@@ 2650,7 2663,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000d6c,
+	0x008000d79,
 	0x0acc20010,
 	0x02443ffb7,
 	0x01c6000c1,


@@ 2671,7 2684,7 @@ ulong bootcode[]={
 	0x038430044,
 	0x010600003,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,


@@ 2696,7 2709,7 @@ ulong bootcode[]={
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0acc2000c,
 	0x090a20000,
 	0x090a30001,


@@ 2727,7 2740,7 @@ ulong bootcode[]={
 	0x000031e00,
 	0x000431025,
 	0x024a50004,
-	0x008000d6c,
+	0x008000d79,
 	0x0acc20010,
 	0x090a20000,
 	0x090a30001,


@@ 2739,7 2752,7 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa7000c,
 	0x08fa6001c,
 	0x08fa30010,


@@ 2759,7 2772,7 @@ ulong bootcode[]={
 	0x024a30004,
 	0x024650001,
 	0x080630000,
-	0x008000d6c,
+	0x008000d79,
 	0x0a0c30028,
 	0x090a20000,
 	0x090a30001,


@@ 2777,7 2790,7 @@ ulong bootcode[]={
 	0x024650001,
 	0x0acc50010,
 	0x08cc3000c,
-	0x008000d6c,
+	0x008000d79,
 	0x000a32821,
 	0x038430046,
 	0x01060001d,


@@ 2788,14 2801,14 @@ ulong bootcode[]={
 	0x038430048,
 	0x010600003,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,


@@ 2808,7 2821,7 @@ ulong bootcode[]={
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0acc2000c,
 	0x090a20000,
 	0x090a30001,


@@ 2838,14 2851,14 @@ ulong bootcode[]={
 	0x024650001,
 	0x0acc50010,
 	0x08cc3000c,
-	0x008000d6c,
+	0x008000d79,
 	0x000a32821,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x02443ffb3,
 	0x01c600032,


@@ 2861,28 2874,28 @@ ulong bootcode[]={
 	0x03843004c,
 	0x010600003,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,


@@ 2894,10 2907,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa8000c,
 	0x08fa30010,
-	0x008000d6c,
+	0x008000d79,
 	0x024650074,
 	0x03843004e,
 	0x01060000d,


@@ 2905,14 2918,14 @@ ulong bootcode[]={
 	0x03843004f,
 	0x010600003,
 	0x000000027,
-	0x008000d63,
+	0x008000d70,
 	0x000000027,
 	0x090a20000,
 	0x090a30001,
 	0x024a50002,
 	0x000031a00,
 	0x000431025,
-	0x008000d6c,
+	0x008000d79,
 	0x0a4c20002,
 	0x090a20000,
 	0x090a30001,


@@ 2924,10 2937,10 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa50010,
 	0x0afa50008,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa8000c,
 	0x08fa30010,
-	0x008000d6c,
+	0x008000d79,
 	0x024650074,
 	0x023bdffec,
 	0x0afbf0000,


@@ 2938,7 2951,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,


@@ 2948,7 2961,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa20010,
 	0x08fa3001c,


@@ 2958,7 2971,7 @@ ulong bootcode[]={
 	0x0afa50010,
 	0x0afa50008,
 	0x02003001c,
-	0x00c0015c9,
+	0x00c0015d6,
 	0x0afa3000c,
 	0x08fa5001c,
 	0x08fa20010,


@@ 3056,14 3069,14 @@ ulong bootcode[]={
 	0x000400008,
 	0x023bd0014,
 	0x023bdfffc,
-	0x08fc78052,
+	0x08fc7806a,
 	0x083a2000b,
 	0x028e3001e,
 	0x03042007f,
 	0x000022e00,
 	0x000052e03,
 	0x014600004,
-	0x023c685c2,
+	0x023c6859e,
 	0x023bd0004,
 	0x003e00008,
 	0x020010001,


@@ 3071,13 3084,13 @@ ulong bootcode[]={
 	0x000031e03,
 	0x000661821,
 	0x024e20001,
-	0x0afc28052,
+	0x0afc2806a,
 	0x0a0670000,
 	0x000051600,
 	0x000021603,
 	0x000461021,
 	0x080420000,
-	0x023c3811a,
+	0x023c380f6,
 	0x000021080,
 	0x08fa4000c,
 	0x000431021,


@@ 3092,19 3105,19 @@ ulong bootcode[]={
 	0x02008fc18,
 	0x08fa60040,
 	0x020120030,
-	0x08fc28026,
+	0x08fc2803e,
 	0x02011002a,
 	0x0afa2001c,
-	0x08fc3810a,
+	0x08fc380e6,
 	0x0200e002e,
 	0x0afa30018,
 	0x08fb00038,
 	0x0200c0039,
-	0x0afd08026,
+	0x0afd0803e,
 	0x08fa3003c,
 	0x000004825,
 	0x02463ffff,
-	0x0afc3810a,
+	0x0afc380e6,
 	0x000062825,
 	0x080a50000,
 	0x000000027,


@@ 3112,7 3125,7 @@ ulong bootcode[]={
 	0x024c60001,
 	0x014a00012,
 	0x000000027,
-	0x08fc3810a,
+	0x08fc380e6,
 	0x000000027,
 	0x00203202b,
 	0x014800002,


@@ 3121,31 3134,31 @@ ulong bootcode[]={
 	0x0a2000000,
 	0x08fa3001c,
 	0x000000027,
-	0x0afc38026,
+	0x0afc3803e,
 	0x08fa20018,
 	0x000000027,
-	0x0afc2810a,
+	0x0afc280e6,
 	0x08fa20000,
 	0x023bd0034,
 	0x000400008,
 	0x000100825,
-	0x08fc3810a,
+	0x08fc380e6,
 	0x000000027,
 	0x00203202b,
 	0x010800005,
 	0x000000027,
 	0x000101025,
 	0x026100001,
-	0x0afd08026,
+	0x0afd0803e,
 	0x0a0450000,
-	0x08fc28072,
+	0x08fc28086,
 	0x000000027,
 	0x024420001,
-	0x0afc28072,
+	0x0afc28086,
 	0x02002000a,
 	0x014a20071,
 	0x000000027,
-	0x0afc98072,
+	0x0afc98086,
 	0x000062825,
 	0x080a50000,
 	0x000000027,


@@ 3161,14 3174,14 @@ ulong bootcode[]={
 	0x000000027,
 	0x014a00003,
 	0x000000027,
-	0x008001022,
+	0x00800102f,
 	0x024c6ffff,
 	0x014ae0006,
 	0x000000027,
 	0x014e80002,
 	0x000000027,
 	0x000093825,
-	0x008001053,
+	0x008001060,
 	0x000097825,
 	0x028a20031,
 	0x01440001f,


@@ 3187,11 3200,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x014a0ffe9,
 	0x0000a3825,
-	0x008001022,
+	0x00800102f,
 	0x024c6ffff,
 	0x014a0ffe5,
 	0x0000a7825,
-	0x008001022,
+	0x00800102f,
 	0x024c6ffff,
 	0x02002000a,
 	0x001420018,


@@ 3201,22 3214,22 @@ ulong bootcode[]={
 	0x024c60001,
 	0x0afa60040,
 	0x080a50000,
-	0x00800106a,
+	0x008001077,
 	0x0246affd0,
 	0x014b20005,
 	0x000000027,
 	0x010e80003,
 	0x000000027,
-	0x008001069,
+	0x008001076,
 	0x000000027,
 	0x014b10008,
 	0x000000027,
 	0x08d650000,
 	0x014e80003,
 	0x0256b0004,
-	0x008001053,
+	0x008001060,
 	0x000053825,
-	0x008001053,
+	0x008001060,
 	0x000057825,
 	0x030a5007f,
 	0x0afab0044,


@@ 3228,17 3241,17 @@ ulong bootcode[]={
 	0x0afad0028,
 	0x0afad0010,
 	0x0afa50014,
-	0x023c285c2,
+	0x023c2859e,
 	0x000451021,
 	0x080420000,
-	0x023c3811a,
+	0x023c380f6,
 	0x000021080,
 	0x000431021,
 	0x08c420000,
 	0x000000027,
 	0x00040f809,
 	0x000000027,
-	0x08fd08026,
+	0x08fd0803e,
 	0x020120030,
 	0x08faf002c,
 	0x02011002a,


@@ 3253,20 3266,20 @@ ulong bootcode[]={
 	0x020130025,
 	0x08fa40028,
 	0x001211023,
-	0x008001053,
+	0x008001060,
 	0x000826825,
-	0x008001022,
+	0x00800102f,
 	0x001615821,
 	0x020020009,
 	0x014a2ff66,
 	0x000000027,
-	0x08fc38072,
+	0x08fc38086,
 	0x000000027,
 	0x024630007,
 	0x0201cfff8,
 	0x0007c1824,
-	0x008001022,
-	0x0afc38072,
+	0x00800102f,
+	0x0afc38086,
 	0x023bdfff0,
 	0x0afbf0000,
 	0x08fa40018,


@@ 3283,13 3296,13 @@ ulong bootcode[]={
 	0x0afa20004,
 	0x0afa40008,
 	0x08fa2001c,
-	0x00c0011ad,
+	0x00c0011ba,
 	0x0afa2000c,
 	0x08fa20000,
 	0x000000027,
 	0x000400008,
 	0x023bd0010,
-	0x0080010cf,
+	0x0080010dc,
 	0x000042023,
 	0x023bdffa8,
 	0x0afbf0000,


@@ 3384,7 3397,7 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa30008,
 	0x0afad000c,
-	0x00c0010c4,
+	0x00c0010d1,
 	0x0afa70010,
 	0x08fa10028,
 	0x08fa20000,


@@ 3401,7 3414,7 @@ ulong bootcode[]={
 	0x0a0640000,
 	0x024a5ffff,
 	0x001651021,
-	0x00800112d,
+	0x00800113a,
 	0x0a0520000,
 	0x024a5ffff,
 	0x001651021,


@@ 3409,7 3422,7 @@ ulong bootcode[]={
 	0x0a0440000,
 	0x024a5ffff,
 	0x001651021,
-	0x00800112d,
+	0x00800113a,
 	0x0a0520000,
 	0x030e30040,
 	0x01060001c,


@@ 3429,26 3442,26 @@ ulong bootcode[]={
 	0x000000027,
 	0x01d000003,
 	0x000000027,
-	0x008001120,
+	0x00800112d,
 	0x000000027,
 	0x01d400003,
 	0x000000027,
-	0x008001120,
+	0x00800112d,
 	0x000000027,
 	0x030e30040,
 	0x01460ffa5,
 	0x024a5ffff,
 	0x00149001b,
-	0x008001117,
+	0x008001124,
 	0x000003010,
 	0x00149001b,
-	0x00800115b,
+	0x008001168,
 	0x000005012,
 	0x000158025,
-	0x00800110f,
+	0x00800111c,
 	0x0026a5023,
 	0x08cca0000,
-	0x00800110a,
+	0x008001117,
 	0x0afa50028,
 	0x08cc30000,
 	0x0afa50028,


@@ 3456,13 3469,13 @@ ulong bootcode[]={
 	0x000063403,
 	0x000061400,
 	0x000021403,
-	0x00800110a,
+	0x008001117,
 	0x000025025,
 	0x08cca0000,
-	0x00800110a,
+	0x008001117,
 	0x0afa50028,
 	0x08cca0000,
-	0x00800110a,
+	0x008001117,
 	0x0afa50028,
 	0x038620030,
 	0x010400009,


@@ 3470,24 3483,24 @@ ulong bootcode[]={
 	0x038620048,
 	0x010400003,
 	0x000000027,
-	0x008001108,
+	0x008001115,
 	0x000000027,
 	0x08cc80000,
-	0x00800110a,
+	0x008001117,
 	0x0afa50028,
 	0x08cc20000,
 	0x0afa50028,
 	0x000023400,
 	0x000063403,
 	0x030c3ffff,
-	0x00800110a,
+	0x008001117,
 	0x000035025,
-	0x0080010f9,
+	0x008001106,
 	0x02009000a,
 	0x000158825,
-	0x0080010f9,
+	0x008001106,
 	0x000144825,
-	0x0080010f9,
+	0x008001106,
 	0x000164825,
 	0x039220075,
 	0x010400006,


@@ 3495,24 3508,24 @@ ulong bootcode[]={
 	0x039220078,
 	0x01040fff7,
 	0x000000027,
-	0x0080010f9,
+	0x008001106,
 	0x000000027,
 	0x02009000a,
-	0x0080010f9,
+	0x008001106,
 	0x034e70020,
 	0x023bdfff0,
 	0x0afbf0000,
 	0x08fa30014,
-	0x00c000937,
+	0x00c000944,
 	0x0afa30004,
 	0x08fad0014,
 	0x0200efc18,
 	0x08faa0018,
 	0x0200c0020,
-	0x08fc9810a,
-	0x08fc88072,
+	0x08fc980e6,
+	0x08fc88086,
 	0x08fa7001c,
-	0x08fc68026,
+	0x08fc6803e,
 	0x000012825,
 	0x0114e0003,
 	0x000007825,


@@ 3549,28 3562,28 @@ ulong bootcode[]={
 	0x000000027,
 	0x000061825,
 	0x024c60001,
-	0x0afc68026,
+	0x0afc6803e,
 	0x0a06c0000,
 	0x025080001,
 	0x024a50001,
-	0x0080011d6,
-	0x0afc88072,
+	0x0080011e3,
+	0x0afc88086,
 	0x000c9202b,
 	0x010800005,
 	0x000000027,
 	0x000061025,
 	0x024c60001,
-	0x0afc68026,
+	0x0afc6803e,
 	0x0a04b0000,
 	0x025080001,
 	0x02002000a,
 	0x015620007,
-	0x0afc88072,
+	0x0afc88086,
 	0x0000f4025,
-	0x0afcf8072,
+	0x0afcf8086,
 	0x010eeffcd,
 	0x000000027,
-	0x0080011bf,
+	0x0080011cc,
 	0x024e7ffff,
 	0x020020009,
 	0x01562fffa,


@@ 3579,8 3592,8 @@ ulong bootcode[]={
 	0x0201cfff8,
 	0x0007c4024,
 	0x010eeffc3,
-	0x0afc88072,
-	0x0080011bf,
+	0x0afc88086,
+	0x0080011cc,
 	0x024e7ffff,
 	0x000aa202a,
 	0x01080ffbe,


@@ 3590,12 3603,12 @@ ulong bootcode[]={
 	0x000000027,
 	0x000061025,
 	0x024c60001,
-	0x0afc68026,
+	0x0afc6803e,
 	0x0a04c0000,
 	0x025080001,
 	0x024a50001,
-	0x0080011ff,
-	0x0afc88072,
+	0x00800120c,
+	0x0afc88086,
 	0x023bdffec,
 	0x0afbf0000,
 	0x02004002a,


@@ 3608,7 3621,7 @@ ulong bootcode[]={
 	0x023a30010,
 	0x0afa30004,
 	0x0afa00008,
-	0x00c0011ad,
+	0x00c0011ba,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,


@@ 3626,7 3639,7 @@ ulong bootcode[]={
 	0x08fa3001c,
 	0x02002fc18,
 	0x0afa30008,
-	0x00c0011ad,
+	0x00c0011ba,
 	0x0afa2000c,
 	0x08fa20000,
 	0x023bd0014,


@@ 3646,21 3659,21 @@ ulong bootcode[]={
 	0x000000027,
 	0x0afa3000c,
 	0x08fa20024,
-	0x00c0010c4,
+	0x00c0010d1,
 	0x0afa20010,
 	0x08fa20000,
 	0x023bd0014,
 	0x000400008,
 	0x020010004,
 	0x023bdfffc,
-	0x08fc58026,
-	0x08fc2810a,
+	0x08fc5803e,
+	0x08fc280e6,
 	0x000000027,
 	0x000a2202b,
 	0x010800005,
 	0x000000027,
 	0x024a20001,
-	0x0afc28026,
+	0x0afc2803e,
 	0x020040025,
 	0x0a0a40000,
 	0x023bd0004,


@@ 3771,10 3784,10 @@ ulong bootcode[]={
 	0x023a20034,
 	0x0e7a10004,
 	0x0e7a00008,
-	0x00c001542,
+	0x00c00154f,
 	0x0afa2000c,
-	0x0c7c1805a,
-	0x0c7c0805e,
+	0x0c7c18072,
+	0x0c7c08076,
 	0x0c7a20034,
 	0x000000027,
 	0x0468010a1,


@@ 3786,7 3799,7 @@ ulong bootcode[]={
 	0x000023043,
 	0x0afa60030,
 	0x000061023,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x0c7a30048,
 	0x0c7a2004c,


@@ 3798,7 3811,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,


@@ 3821,7 3834,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,


@@ 3830,10 3843,10 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x0080012e2,
+	0x0080012ef,
 	0x023ae0078,
-	0x0c7c18066,
-	0x0c7c0806a,
+	0x0c7c1807a,
+	0x0c7c0807e,
 	0x000000027,
 	0x04626003e,
 	0x000000027,


@@ 3847,7 3860,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x000000027,
 	0x000431023,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x08fad00b4,
 	0x08fac00ac,


@@ 3856,7 3869,7 @@ ulong bootcode[]={
 	0x0c7a2003c,
 	0x000000027,
 	0x046201182,
-	0x0080012f9,
+	0x008001306,
 	0x023ae0078,
 	0x02003fc18,
 	0x015830002,


@@ 3891,7 3904,7 @@ ulong bootcode[]={
 	0x0200cffff,
 	0x0afac00ac,
 	0x0200d0065,
-	0x0080012af,
+	0x0080012bc,
 	0x0afad00b4,
 	0x0c7a70048,
 	0x0c7a6004c,


@@ 3905,7 3918,7 @@ ulong bootcode[]={
 	0x08fa30034,
 	0x02002ffff,
 	0x000431023,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x08fad00b4,
 	0x023ae0078,


@@ 3927,7 3940,7 @@ ulong bootcode[]={
 	0x000671823,
 	0x00460012b,
 	0x0afa7002c,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa30004,
 	0x0c7a30040,
 	0x0c7a20044,


@@ 3936,7 3949,7 @@ ulong bootcode[]={
 	0x046201083,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0014a5,
+	0x00c0014b2,
 	0x000000027,
 	0x08fad00b4,
 	0x023ae0078,


@@ 3985,7 3998,7 @@ ulong bootcode[]={
 	0x024e70001,
 	0x02484fff6,
 	0x0a0440001,
-	0x008001380,
+	0x00800138d,
 	0x024c6ffff,
 	0x010e00007,
 	0x0200b0001,


@@ 4053,7 4066,7 @@ ulong bootcode[]={
 	0x020030030,
 	0x0a0430000,
 	0x024e7ffff,
-	0x0080013c7,
+	0x0080013d4,
 	0x024c60001,
 	0x019000013,
 	0x000000027,


@@ 4073,7 4086,7 @@ ulong bootcode[]={
 	0x0256b0001,
 	0x0a0430000,
 	0x02508ffff,
-	0x0080013d8,
+	0x0080013e5,
 	0x024c60001,
 	0x08fa300b0,
 	0x000000027,


@@ 4102,7 4115,7 @@ ulong bootcode[]={
 	0x0afa30008,
 	0x0afa2000c,
 	0x08fa300b0,
-	0x00c0010c4,
+	0x00c0010d1,
 	0x0afa30010,
 	0x08fa20000,
 	0x023bd00a0,


@@ 4158,19 4171,19 @@ ulong bootcode[]={
 	0x000001810,
 	0x024630030,
 	0x0a0430000,
-	0x0080013ff,
+	0x00800140c,
 	0x024c60001,
 	0x000061825,
 	0x001231021,
 	0x02003002b,
 	0x0a0430000,
-	0x008001420,
+	0x00800142d,
 	0x024c60001,
 	0x000061025,
 	0x001221821,
 	0x020020065,
 	0x0a0620000,
-	0x008001416,
+	0x008001423,
 	0x024c60001,
 	0x020030067,
 	0x011a30006,


@@ 4178,7 4191,7 @@ ulong bootcode[]={
 	0x020030068,
 	0x011a30003,
 	0x000000027,
-	0x0080013f9,
+	0x008001406,
 	0x000000027,
 	0x024c7ffff,
 	0x004e00006,


@@ 4198,11 4211,11 @@ ulong bootcode[]={
 	0x000000027,
 	0x01107ff93,
 	0x000073025,
-	0x0080013f9,
+	0x008001406,
 	0x024c60001,
-	0x00800145e,
+	0x00800146b,
 	0x02508ffff,
-	0x008001456,
+	0x008001463,
 	0x024e7ffff,
 	0x08fa30034,
 	0x02002ffff,


@@ 4212,7 4225,7 @@ ulong bootcode[]={
 	0x000003825,
 	0x08fa30034,
 	0x0200d0068,
-	0x0080013b4,
+	0x0080013c1,
 	0x001835023,
 	0x08fa200b0,
 	0x000000027,


@@ 4223,17 4236,17 @@ ulong bootcode[]={
 	0x001221821,
 	0x02002002b,
 	0x0a0620000,
-	0x0080013a5,
+	0x0080013b2,
 	0x024c60001,
-	0x0c7c38066,
-	0x0c7c2806a,
+	0x0c7c3807a,
+	0x0c7c2807e,
 	0x000000027,
 	0x046223182,
 	0x0e7a70040,
 	0x0e7a60044,
 	0x0e7a70004,
 	0x0e7a60008,
-	0x00c0014a5,
+	0x00c0014b2,
 	0x000000027,
 	0x08fad00b4,
 	0x08fa8002c,


@@ 4251,14 4264,14 @@ ulong bootcode[]={
 	0x046201181,
 	0x0e7a70040,
 	0x0e7a60044,
-	0x008001377,
+	0x008001384,
 	0x023ae0078,
-	0x00800131c,
+	0x008001329,
 	0x0258cffff,
 	0x020020001,
 	0x0afa20014,
 	0x025ad0020,
-	0x0080012af,
+	0x0080012bc,
 	0x0afad00b4,
 	0x023bdffe8,
 	0x0afbf0000,


@@ 4275,7 4288,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c001591,
+	0x00c00159e,
 	0x0afa2000c,
 	0x04620c032,
 	0x000000027,


@@ 4304,7 4317,7 @@ ulong bootcode[]={
 	0x023a2001c,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c001591,
+	0x00c00159e,
 	0x0afa2000c,
 	0x0c7a1001c,
 	0x0c7a00020,


@@ 4320,7 4333,7 @@ ulong bootcode[]={
 	0x04624c081,
 	0x0e7a30004,
 	0x0e7a20008,
-	0x00c0014a5,
+	0x00c0014b2,
 	0x000000027,
 	0x08fa20000,
 	0x023bd000c,


@@ 4333,7 4346,7 @@ ulong bootcode[]={
 	0x004810008,
 	0x000000027,
 	0x000041023,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x08fa20000,
 	0x023bd0014,


@@ 4343,7 4356,7 @@ ulong bootcode[]={
 	0x01060000a,
 	0x000000027,
 	0x000041880,
-	0x023c2802a,
+	0x023c28042,
 	0x000621821,
 	0x08c630000,
 	0x08fa20000,


@@ 4354,12 4367,12 @@ ulong bootcode[]={
 	0x000042843,
 	0x0afa50010,
 	0x000851823,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa30004,
 	0x0e7a10008,
 	0x0e7a0000c,
 	0x08fa20010,
-	0x00c0014e7,
+	0x00c0014f4,
 	0x0afa20004,
 	0x0c7a30008,
 	0x0c7a2000c,


@@ 4520,7 4533,7 @@ ulong bootcode[]={
 	0x00065102a,
 	0x014400013,
 	0x000000027,
-	0x08fc18112,
+	0x08fc180ee,
 	0x08fa30008,
 	0x000a10807,
 	0x0201cffff,


@@ 4542,7 4555,7 @@ ulong bootcode[]={
 	0x00065102a,
 	0x01440fff3,
 	0x000000027,
-	0x08fc38116,
+	0x08fc380f2,
 	0x024a1ffea,
 	0x000230807,
 	0x0201cffff,


@@ 4550,7 4563,7 @@ ulong bootcode[]={
 	0x08fa3000c,
 	0x000000027,
 	0x000610824,
-	0x0080015b1,
+	0x0080015be,
 	0x0afa1000c,
 	0x023bdfffc,
 	0x08fa30010,


@@ 4661,9 4674,16 @@ ulong bootcode[]={
 	0x000000027,
 	0x0a0c8ffff,
 	0x024c6ffff,
-	0x008001630,
+	0x00800163d,
 	0x024e7ffff,
 	0x000000000,
+	0x000000000,
+	0x000000000,
+	0x000000000,
+	0x000000000,
+	0x000000000,
+	0x000000000,
+	0x000000000,
 	0x062616420,
 	0x074797065,
 	0x03a202564,


@@ 4687,7 4707,6 @@ ulong bootcode[]={
 	0x000000000,
 	0x03fd34413,
 	0x055475a32,
-	0x000000000,
 	0x040240000,
 	0x000000000,
 	0x000000000,


@@ 4703,43 4722,29 @@ ulong bootcode[]={
 	0x061747573,
 	0x000000000,
 	0x000000000,
-	0x000006190,
-	0x000006195,
-	0x0000061aa,
-	0x0000061b1,
-	0x0000061c6,
-	0x0000061cc,
-	0x0000061e1,
-	0x0000061e9,
-	0x0000061fe,
-	0x000006202,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
-	0x000000000,
+	0x00000616c,
+	0x000006171,
+	0x000006186,
+	0x00000618d,
+	0x0000061a2,
+	0x0000061a8,
+	0x0000061bd,
+	0x0000061c5,
+	0x0000061da,
+	0x0000061de,
 	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x0001fffff,
 	0x07fffffff,
-	0x000004834,
-	0x00000494c,
-	0x000004370,
-	0x000004a28,
-	0x00000487c,
-	0x0000048c4,
-	0x000004914,
+	0x000004868,
+	0x000004980,
+	0x0000043a4,
+	0x000004a5c,
+	0x0000048b0,
+	0x0000048f8,
+	0x000004948,
 	0x000000000,
 	0x000000000,
 	0x000000000,


@@ 5063,8 5068,7 @@ ulong bootcode[]={
 	0x000010000,
 	0x002000000,
 	0x000000000,
-	0x00004f20,
-	0x0,
-	0x00004f20,
+	0x000000000,
+	0x00004f38,
 	0x0,
 };

@@ 601,26 601,26 @@ confinit(void)
 	 *  set minimal default values
 	 */
 	conf.nmach = 1;
-	conf.nmod = 10000;
-	conf.nalarm = 10000;
-	conf.norig = 500;
-	conf.nchan = 1000;
-	conf.npgenv = 800;
-	conf.nmtab = 100;
-	conf.nmount = 5000;
-	conf.nmntdev = 150;
-	conf.nmntbuf = 120;
-	conf.nmnthdr = 120;
-	conf.nstream = 128;
-	conf.nsrv = 32;
-	conf.nproc = 386;
-	conf.npgrp = 100;
-	conf.nnoifc = 1;
-	conf.nnoconv = 32;
-	conf.nurp = 256;
-	conf.nenv = 15*conf.nproc;
+	conf.nproc = 32;
+	conf.npgrp = conf.nproc / 4;
+	conf.npgenv = 4 * conf.npgrp;
+	conf.nenv = 4 * conf.nproc;
 	conf.nenvchar = 20 * conf.nenv;
+	conf.nmtab = conf.nproc;
+	conf.norig = 4 * conf.nproc;
+	conf.nmod = 10 * conf.norig;
+	conf.nchan = 20 * conf.nproc;
+	conf.nmntdev = conf.nproc;
+	conf.nmntbuf = conf.nproc;
+	conf.nmnthdr = conf.nproc;
+	conf.nstream = 2 * conf.nproc;
 	conf.npte = 4 * conf.npage;
+	conf.nalarm = 500;
+	conf.nmount = 500;
+	conf.nsrv = 3;
+	conf.nnoifc = 1;
+	conf.nnoconv = 32;
+	conf.nurp = 25;
 	conf.nqueue = 5 * conf.nstream;
 	conf.nblock = 10 * conf.nstream;
 	conf.npipe = conf.nstream/2;