6 files changed, 1081 insertions(+), 891 deletions(-)

M gnot/boot.c
M gnot/boot.h
M gnot/chan.c
M gnot/main.c
M gnot/stasync.c
M port/chan.c

@@ 6,6 6,7 @@
 Fcall	hdr;
 char	buf[100];
 char	bootline[64];
+char	bootdevice;
 
 void	error(char*);
 void	sendmsg(int, char*);


@@ 26,19 27,44 @@ main(int argc, char *argv[])
 		close(fd);
 	}
 
+	fd = open("#e/bootdevice", OREAD);
+	if(fd >= 0){
+		read(fd, &bootdevice, 1);
+		close(fd);
+	}
+
+	switch(bootdevice){
+	case 'a':
+		/*
+		 *  grab the rs232 line,
+		 *  make it 19200 baud,
+		 *  push the async protocol onto it,
+		 */
+		cfd = open("#c/rs232ctl", 2);
+		if(cfd < 0)
+			error("opening #c/rs232ctl");
+		sendmsg(cfd, "B19200");
+		sendmsg(cfd, "push async");
+		break;
+	default:
+		/*
+		 *  grab the incon,
+		 */
+		cfd = open("#i/ctl", 2);
+		if(cfd < 0)
+			error("opening #i/ctl");
+		break;
+	}
+
 	/*
-	 *  grab the incon,
-	 *  push the dk multiplexor onto it,
+	 *  push the dk multiplexor onto the communications link,
 	 *  and use line 1 as the signalling channel.
 	 */
-	cfd = open("#i/ctl", 2);
-	if(cfd < 0)
-		error("opening #i/ctl");
 	sendmsg(cfd, "push dkmux");
 	sendmsg(cfd, "config 1 16 norestart");
 
 	/*
-	 *  fork a process to hold the incon channel open
+	 *  fork a process to hold the device channel open
 	 */
 	switch(fork()){
 	case -1:


@@ 53,7 79,7 @@ main(int argc, char *argv[])
 	}
 
 	/*
-	 *  open a datakit channel and call ken via r70, leave the
+	 *  open a datakit channel and call ken, leave the
 	 *  incon ctl channel open
 	 */
 	fd = open("#k/2/data", 2);


@@ 62,7 88,7 @@ main(int argc, char *argv[])
 	cfd = open("#k/2/ctl", 2);
 	if(cfd < 0)
 		error("opening #k/2/ctl");
-	sendmsg(cfd, "connect helix.bootfs");
+	sendmsg(cfd, "connect nfs");
 	print("connected to helix.bootfs\n");
 	close(cfd);
 

@@ 1,7 1,7 @@
 ulong bootcode[]={
 	0x000000107,
-	0x0000020fc,
-	0x000000418,
+	0x000002356,
+	0x00000043c,
 	0x000000170,
 	0x000000000,
 	0x000002020,


@@ 13,102 13,118 @@ ulong bootcode[]={
 	0x000142f2f,
 	0x00014610c,
 	0x02f006100,
-	0x004e44fef,
+	0x005604fef,
 	0x0001c4e75,
 	0x04fefffc8,
 	0x042a7486e,
-	0x081ae6100,
-	0x020b84878,
+	0x081366100,
+	0x023124878,
 	0x00001486e,
-	0x081b66100,
-	0x020ac4878,
+	0x0813e6100,
+	0x023064878,
 	0x00001486e,
-	0x081be6100,
-	0x020a042a7,
-	0x0486e81c6,
-	0x061002096,
+	0x081466100,
+	0x022fa42a7,
+	0x0486e814e,
+	0x0610022f0,
 	0x04a806d1e,
 	0x048780040,
-	0x0486e854a,
+	0x0486e856e,
 	0x02f002f40,
 	0x0005c6100,
-	0x020862f2f,
+	0x022e02f2f,
 	0x0005c6100,
-	0x020544fef,
-	0x000104878,
-	0x00002486e,
-	0x081d26100,
-	0x020682f40,
-	0x0005c4aaf,
-	0x0005c6c0a,
-	0x0486e81d9,
-	0x0610003ec,
+	0x022ae4fef,
+	0x0001042a7,
+	0x0486e815a,
+	0x0610022c4,
+	0x024006d1e,
+	0x048780001,
+	0x0486e8002,
+	0x02f022f42,
+	0x000646100,
+	0x022b42f2f,
+	0x000646100,
+	0x022824fef,
+	0x00010102e,
+	0x0800249c0,
+	0x04fef0028,
+	0x07261b200,
+	0x0670003de,
+	0x048780002,
+	0x0486e819a,
+	0x061002284,
+	0x02f40003c,
+	0x04aaf003c,
+	0x0508f6c0a,
+	0x0486e81a1,
+	0x061000428,
 	0x0588f486e,
-	0x081e82f2f,
-	0x000606100,
-	0x003ae486e,
-	0x081f32f2f,
-	0x000686100,
-	0x003a26100,
-	0x0202c4fef,
-	0x0003872ff,
+	0x081b02f2f,
+	0x000386100,
+	0x003ea486e,
+	0x081bb2f2f,
+	0x000406100,
+	0x003de6100,
+	0x022464fef,
+	0x0001072ff,
 	0x0b2806700,
-	0x0038e4281,
+	0x003904281,
 	0x0b2806700,
-	0x003782f2f,
+	0x0037a2f2f,
 	0x000346100,
-	0x01ff8588f,
+	0x02212588f,
 	0x048780002,
-	0x0486e8209,
-	0x06100200e,
+	0x0486e81d1,
+	0x061002228,
 	0x04a8042e7,
 	0x02f40003a,
 	0x044df6c0a,
-	0x0486e8213,
-	0x061000390,
+	0x0486e81db,
+	0x0610003cc,
 	0x0588f4878,
 	0x00002486e,
-	0x082256100,
-	0x01fec2f40,
+	0x081ed6100,
+	0x022062f40,
 	0x000444aaf,
 	0x000446c0a,
-	0x0486e822e,
-	0x061000370,
+	0x0486e81f6,
+	0x0610003ac,
 	0x0588f486e,
-	0x0823f2f2f,
+	0x082072f2f,
 	0x000486100,
-	0x00332486e,
-	0x082546100,
-	0x0042a2f2f,
+	0x0036e486e,
+	0x082136100,
+	0x004662f2f,
 	0x000506100,
-	0x01f98486e,
-	0x0826f6100,
-	0x0041a422e,
-	0x08502486f,
+	0x021b2486e,
+	0x0822e6100,
+	0x00456422e,
+	0x08526486f,
 	0x0002c486e,
-	0x085026100,
-	0x0104e2f00,
+	0x085266100,
+	0x012222f00,
 	0x02f40005c,
 	0x0486f0038,
 	0x02f2f0064,
-	0x061001fa4,
+	0x0610021be,
 	0x0b0af0064,
 	0x0670a486e,
-	0x082766100,
-	0x0031a588f,
+	0x082356100,
+	0x00356588f,
 	0x04878001c,
 	0x0486f0044,
 	0x02f2f0070,
-	0x061001f78,
+	0x061002192,
 	0x02f400070,
 	0x04aaf0070,
 	0x06e0a486e,
-	0x082806100,
-	0x002f6588f,
+	0x0823f6100,
+	0x00332588f,
 	0x02f2f0070,
-	0x0486e8502,
+	0x0486e8526,
 	0x0486f0054,
-	0x06100179e,
+	0x061001972,
 	0x04a806638,
 	0x0102f005b,
 	0x049c02f00,


@@ 119,176 135,191 @@ ulong bootcode[]={
 	0x0102f0064,
 	0x049c02f00,
 	0x02f2f008c,
-	0x0486e8289,
-	0x061000384,
-	0x0486e82ac,
-	0x0610002ac,
+	0x0486e8248,
+	0x0610003c0,
+	0x0486e826b,
+	0x0610002e8,
 	0x04fef001c,
 	0x00c2e0001,
-	0x08502670a,
-	0x0486e82b7,
-	0x061000298,
+	0x08526670a,
+	0x0486e8276,
+	0x0610002d4,
 	0x0588f486e,
-	0x082c06100,
-	0x0035e1d7c,
-	0x000028502,
+	0x0827f6100,
+	0x0039a1d7c,
+	0x000028526,
 	0x01d7c0076,
-	0x0850c486f,
+	0x08530486f,
 	0x0005c486e,
-	0x085026100,
-	0x00f8a2f00,
+	0x085266100,
+	0x0115e2f00,
 	0x02f40008c,
 	0x0486f0068,
 	0x02f2f0094,
-	0x061001ee0,
+	0x0610020fa,
 	0x0b0af0094,
 	0x0670a486e,
-	0x082cb6100,
-	0x00256588f,
+	0x0828a6100,
+	0x00292588f,
 	0x04878001c,
 	0x0486f0074,
 	0x02f2f00a0,
-	0x061001eb4,
+	0x0610020ce,
 	0x02f4000a0,
 	0x04aaf00a0,
 	0x06e0a486e,
-	0x082d96100,
-	0x00232588f,
+	0x082986100,
+	0x0026e588f,
 	0x02f2f00a0,
-	0x0486e8502,
+	0x0486e8526,
 	0x0486f0084,
-	0x0610016da,
+	0x0610018ae,
 	0x04a80660a,
-	0x0486e82e6,
-	0x061000214,
+	0x0486e82a5,
+	0x061000250,
 	0x0588f0c2e,
-	0x000038502,
+	0x000038526,
 	0x0670a486e,
-	0x082f56100,
-	0x00202588f,
-	0x04a6e8506,
+	0x082b46100,
+	0x0023e588f,
+	0x04a6e852a,
 	0x0671c302e,
-	0x0850648c0,
+	0x0852a48c0,
 	0x02f00486e,
-	0x083026100,
-	0x002ba486e,
-	0x0830c6100,
-	0x001e24fef,
+	0x082c16100,
+	0x002f6486e,
+	0x082cb6100,
+	0x0021e4fef,
 	0x0000c486e,
-	0x083196100,
-	0x002a6486e,
-	0x08327486e,
-	0x08321486f,
+	0x082d86100,
+	0x002e2486e,
+	0x082e6486e,
+	0x082e0486f,
 	0x000946100,
-	0x003664878,
+	0x003a24878,
 	0x001b64878,
 	0x00001486f,
 	0x000a06100,
-	0x01e024a80,
+	0x0201c4a80,
 	0x042e72f40,
 	0x000c244df,
 	0x06c0a486e,
-	0x0832e6100,
-	0x001a2588f,
+	0x082ed6100,
+	0x001de588f,
 	0x02f2f00cc,
-	0x0486e8335,
+	0x0486e82f4,
 	0x0486f00ac,
-	0x061000330,
+	0x06100036c,
 	0x0486f00b0,
-	0x061000e7e,
+	0x061001052,
 	0x0588f2f00,
 	0x0486f00b4,
 	0x02f2f00d4,
-	0x061001df4,
+	0x06100200e,
 	0x02f00486f,
 	0x000c06100,
-	0x00e64588f,
+	0x01038588f,
 	0x0221fb280,
 	0x0670a486e,
-	0x083386100,
-	0x0015e588f,
+	0x082f76100,
+	0x0019a588f,
 	0x02f2f00d8,
-	0x061001d9a,
-	0x0486e8344,
-	0x0486e833e,
+	0x061001fb4,
+	0x0486e8303,
+	0x0486e82fd,
 	0x0486f00c8,
-	0x0610002e4,
+	0x061000320,
 	0x0487801b6,
 	0x048780001,
-	0x0486e834b,
-	0x061001d80,
+	0x0486e830a,
+	0x061001f9a,
 	0x04a8042e7,
 	0x02f4000f6,
 	0x044df6c0a,
-	0x0486e8353,
-	0x061000120,
+	0x0486e8312,
+	0x06100015c,
 	0x0588f2f2f,
 	0x00100486e,
-	0x0835a486f,
+	0x08319486f,
 	0x000e06100,
-	0x002ae486f,
+	0x002ea486f,
 	0x000e46100,
-	0x00dfc588f,
+	0x00fd0588f,
 	0x02f00486f,
 	0x000e82f2f,
 	0x001086100,
-	0x01d722f00,
+	0x01f8c2f00,
 	0x0486f00f4,
-	0x061000de2,
+	0x061000fb6,
 	0x0588f221f,
 	0x0b280670a,
-	0x0486e835d,
-	0x0610000dc,
+	0x0486e831c,
+	0x061000118,
 	0x0588f2f2f,
 	0x0010c6100,
-	0x01d18486e,
-	0x083636100,
-	0x0019a42a7,
-	0x0486e836e,
-	0x0486e836c,
-	0x061000dca,
+	0x01f32486e,
+	0x083226100,
+	0x001d642a7,
+	0x0486e832d,
+	0x0486e832b,
+	0x061000f9e,
 	0x04a806c0a,
-	0x0486e8370,
-	0x0610000b0,
+	0x0486e832f,
+	0x0610000ec,
 	0x0588f486e,
-	0x083774878,
+	0x083364878,
 	0x00006486e,
-	0x083752f2f,
+	0x083342f2f,
 	0x001386100,
-	0x01cfe4a80,
+	0x01f184a80,
 	0x06c0a486e,
-	0x083786100,
-	0x0008e588f,
-	0x0486e837e,
-	0x061000154,
+	0x083376100,
+	0x000ca588f,
+	0x0486e833d,
+	0x061000190,
 	0x048780020,
-	0x0486e854a,
-	0x061000d48,
-	0x04a80671e,
+	0x0486e856e,
+	0x061000f1c,
+	0x04a806720,
+	0x042a7486e,
+	0x08357486e,
+	0x08352486e,
+	0x083466100,
+	0x00e66486e,
+	0x0836b6100,
+	0x000964fef,
+	0x001644e75,
 	0x042a7486e,
-	0x08398486e,
-	0x08393486e,
-	0x083876100,
-	0x00d1e486e,
-	0x083ac615a,
-	0x04fef0164,
-	0x04e7542a7,
-	0x0486e83a7,
-	0x0486e839b,
-	0x061000d04,
-	0x0598f60e2,
-	0x048790000,
-	0x0ea606100,
-	0x01cb0588f,
-	0x060f26000,
-	0x0fc84598f,
+	0x08366486e,
+	0x0835a6100,
+	0x00e4a598f,
+	0x060e04879,
+	0x00000ea60,
+	0x061001ec8,
+	0x0588f60f2,
+	0x06000fc82,
+	0x048780002,
+	0x0486e8168,
+	0x061001ea8,
+	0x02f40003c,
+	0x04aaf003c,
+	0x06c08486e,
+	0x08174614e,
+	0x0588f486e,
+	0x081882f2f,
+	0x000406112,
+	0x0486e818f,
+	0x02f2f0048,
+	0x061084fef,
+	0x000186000,
+	0x0fc0e598f,
 	0x02f2f000c,
-	0x061000d1e,
+	0x061000eb6,
 	0x02f002f40,
 	0x000082f2f,
 	0x000142f2f,
 	0x000146100,
-	0x01c92b0af,
+	0x01e70b0af,
 	0x000106708,
 	0x02f2f001c,
 	0x06108588f,


@@ 296,10 327,10 @@ ulong bootcode[]={
 	0x04e754fef,
 	0x0ffc04857,
 	0x042a76100,
-	0x01c48486f,
+	0x01e26486f,
 	0x000082f2f,
 	0x00050486e,
-	0x083b84878,
+	0x083774878,
 	0x000026100,
 	0x0011a42a7,
 	0x061744fef,


@@ 307,10 338,10 @@ ulong bootcode[]={
 	0x0598f4281,
 	0x07021b081,
 	0x06f1e4ab6,
-	0x01d20841a,
+	0x01d20843e,
 	0x0660e2daf,
 	0x000081d20,
-	0x0841a7001,
+	0x0843e7001,
 	0x0588f4e75,
 	0x052817021,
 	0x0b0816ee2,


@@ 320,30 351,30 @@ ulong bootcode[]={
 	0x042827021,
 	0x0b0826f18,
 	0x020362d20,
-	0x0841ab088,
+	0x0843eb088,
 	0x0660642b6,
-	0x02d20841a,
+	0x02d20843e,
 	0x052827021,
 	0x0b0826ee8,
 	0x0588f4e75,
 	0x04aaf0004,
 	0x0660642a7,
 	0x0610c588f,
-	0x0486e83e2,
+	0x0486e8426,
 	0x06104588f,
 	0x04e75518f,
 	0x072204a81,
 	0x06d222eb6,
-	0x01d20841a,
+	0x01d20843e,
 	0x04a976712,
 	0x02f410004,
 	0x042b61d20,
-	0x0841a4eb7,
+	0x0843e4eb7,
 	0x00151222f,
 	0x000045381,
 	0x04a816cde,
 	0x02f2f000c,
-	0x061001b78,
+	0x061001d56,
 	0x04fef000c,
 	0x04e754fef,
 	0x0eff841ef,


@@ 354,18 385,18 @@ ulong bootcode[]={
 	0x000001000,
 	0x02f08486f,
 	0x000146100,
-	0x001262200,
+	0x0011a2200,
 	0x041ef0018,
 	0x092882f01,
 	0x0486f001c,
 	0x048780001,
-	0x061001b74,
+	0x061001d52,
 	0x0240042e7,
 	0x02f40001e,
 	0x044df6c1a,
-	0x052ae800a,
+	0x052ae8012,
 	0x0700ab0ae,
-	0x0800a6e0e,
+	0x080126e0e,
 	0x048780001,
 	0x06100ff5a,
 	0x0242f0020,


@@ 380,18 411,18 @@ ulong bootcode[]={
 	0x000001000,
 	0x02f08486f,
 	0x000146100,
-	0x000be2200,
+	0x000b22200,
 	0x041ef0018,
 	0x092882f01,
 	0x0486f001c,
 	0x02f2f1024,
-	0x061001b0c,
+	0x061001cea,
 	0x0240042e7,
 	0x02f40001e,
 	0x044df6c1a,
-	0x052ae800a,
+	0x052ae8012,
 	0x0700ab0ae,
-	0x0800a6e0e,
+	0x080126e0e,
 	0x048780001,
 	0x06100fef2,
 	0x0242f0020,


@@ 399,296 430,319 @@ ulong bootcode[]={
 	0x04fef1024,
 	0x04e75518f,
 	0x0226f000c,
-	0x02eae800e,
+	0x02eae8016,
 	0x041ef0010,
 	0x058882f08,
 	0x02f2f0014,
 	0x048691000,
-	0x02f09615a,
+	0x02f09614e,
 	0x02d6f0010,
-	0x0800e90af,
+	0x0801690af,
 	0x0001c4fef,
 	0x000184e75,
 	0x0142f0007,
 	0x0c43c007f,
-	0x0100249c0,
-	0x04a360920,
-	0x0808e661e,
 	0x0701eb0ae,
-	0x080126e04,
+	0x0801a6e04,
 	0x070014e75,
-	0x0202e8012,
+	0x0202e801a,
 	0x0120249c1,
 	0x01d801920,
-	0x0808e52ae,
-	0x080121202,
+	0x0809652ae,
+	0x0801a1202,
 	0x049c11036,
-	0x01920808e,
+	0x019208096,
 	0x049c02daf,
 	0x000080d20,
-	0x080164280,
+	0x0801e4280,
 	0x04e754fef,
-	0x0ffe4226f,
-	0x00028282f,
-	0x0002c2f6e,
-	0x080060004,
-	0x02eae8002,
+	0x0ffe42a2f,
+	0x0002c226f,
+	0x000282f6e,
+	0x0800a0004,
+	0x02eae8006,
 	0x02d6f0020,
-	0x08006202f,
+	0x0800a202f,
 	0x000245380,
-	0x02d408002,
+	0x02d408006,
 	0x0101949c0,
 	0x024007025,
 	0x0b0826768,
 	0x04a826628,
-	0x0202e8006,
-	0x0b0ae8002,
+	0x0202e800a,
+	0x0b0ae8006,
 	0x0650453ae,
-	0x080064236,
-	0x001618006,
-	0x0202e8006,
+	0x0800a4236,
+	0x00161800a,
+	0x0202e800a,
 	0x02d6f0004,
-	0x080062d57,
-	0x080024fef,
+	0x0800a2d57,
+	0x080064fef,
 	0x0001c4e75,
-	0x0202e8006,
-	0x0b0ae8002,
+	0x0202e800a,
+	0x0b0ae8006,
 	0x0640a1d82,
-	0x001618006,
-	0x052ae8006,
-	0x052ae800e,
+	0x00161800a,
+	0x052ae800a,
+	0x052ae8016,
 	0x0700ab082,
 	0x0660642ae,
-	0x0800e60a4,
+	0x0801660a4,
 	0x07009b082,
 	0x0669e7007,
-	0x0d0ae800e,
+	0x0d0ae8016,
 	0x0c0bcffff,
 	0x0fff82d40,
-	0x0800e608c,
-	0x0428574ff,
-	0x0260242af,
-	0x000101419,
-	0x049c22f49,
-	0x00028702a,
-	0x0b0826600,
-	0x000e02a30,
-	0x049905884,
-	0x024041419,
-	0x049c22f49,
-	0x00028702e,
-	0x0b082676a,
-	0x04a826606,
-	0x053892f49,
-	0x000282f2f,
-	0x000102f03,
-	0x02f43001c,
-	0x02f052f45,
-	0x000242f04,
-	0x02f44003c,
-	0x0727fc282,
-	0x010361920,
-	0x0808e49c0,
-	0x020760d20,
-	0x080164e90,
-	0x02a2f0028,
-	0x0226f0038,
-	0x0282f003c,
-	0x0262f0024,
-	0x024006c16,
-	0x0448285af,
-	0x000201419,
-	0x049c22002,
-	0x02f490038,
-	0x04fef0010,
-	0x060a2d880,
-	0x020044fef,
-	0x000106000,
-	0x0fef41019,
-	0x049c02400,
-	0x02f490028,
-	0x0702ab082,
-	0x066162630,
-	0x049905884,
-	0x020041019,
-	0x049c02400,
-	0x02f490028,
-	0x06000ff72,
-	0x07030b082,
-	0x06e00ff6a,
+	0x08016608c,
+	0x076ff70ff,
+	0x02f400014,
+	0x042af0010,
+	0x0101949c0,
+	0x024002f49,
+	0x000284a82,
+	0x066065389,
+	0x06000ff6e,
+	0x0702eb082,
+	0x0660c4a83,
+	0x06c024283,
+	0x042af0014,
+	0x060da7031,
+	0x0b0826e44,
 	0x07039b082,
-	0x06d00ff62,
-	0x04a836c02,
-	0x042832003,
-	0x02203d281,
+	0x06d3e4284,
+	0x07030b082,
+	0x06e067039,
+	0x0b0826c0e,
+	0x04a836c04,
+	0x0260460c2,
+	0x02f440014,
+	0x060bc2004,
+	0x02204d281,
 	0x0d281d081,
 	0x0d080d082,
 	0x090bc0000,
-	0x000302600,
+	0x000302800,
 	0x0101949c0,
 	0x024002f49,
-	0x0002860c8,
-	0x04286702d,
-	0x0b082660c,
-	0x074012c02,
-	0x0141949c2,
-	0x02f490028,
+	0x0002860c4,
 	0x07030b082,
-	0x06e067039,
-	0x0b0826c0c,
-	0x04a866700,
-	0x0ff0e4485,
-	0x06000ff08,
-	0x020052205,
-	0x0d281d281,
-	0x0d081d080,
-	0x0d08290bc,
-	0x000000030,
-	0x02a001019,
-	0x049c02400,
-	0x02f490028,
-	0x060c64fef,
-	0x0ffc4282f,
-	0x0004c226f,
-	0x000402a2f,
-	0x00050206f,
-	0x00048262f,
-	0x000044286,
-	0x0700fc084,
-	0x07201b081,
-	0x06d0000f2,
-	0x07209b081,
-	0x06e0000ea,
-	0x030360b20,
-	0x083cc4efb,
-	0x000007004,
-	0x0c0846604,
-	0x04a836d72,
-	0x0422f0039,
-	0x0741c2003,
-	0x04c450001,
-	0x028017030,
-	0x0d8807039,
-	0x0b0846c04,
-	0x07027d880,
-	0x022021f84,
-	0x02920001c,
-	0x07002b082,
-	0x06f2a4a86,
+	0x066044a83,
+	0x06cb8702a,
+	0x0b082661a,
+	0x024305990,
+	0x058852005,
+	0x04a836c06,
+	0x026026000,
+	0x0ff702f42,
+	0x000146000,
+	0x0ff68c4bc,
+	0x00000007f,
+	0x02f022f2f,
+	0x000142f2f,
+	0x0001c2f03,
+	0x02f430028,
+	0x02f052f45,
+	0x000401036,
+	0x029208096,
+	0x049c02076,
+	0x00d20801e,
+	0x04e902a2f,
+	0x00040226f,
+	0x0003c262f,
+	0x0002c4a80,
+	0x06c0e4480,
+	0x081af0024,
+	0x04fef0014,
+	0x06000ff1e,
+	0x0da802005,
+	0x04fef0014,
+	0x06000fe92,
+	0x04fefffbc,
+	0x02a2f0058,
+	0x0226f0048,
+	0x0206f0050,
+	0x02e2f0054,
+	0x02c2f0004,
+	0x02817367c,
+	0x000002005,
+	0x02405726f,
+	0x0b0816d00,
+	0x001cc6e00,
+	0x001a47008,
+	0x02a00347c,
+	0x000007078,
+	0x0c0877228,
+	0x0b0816d00,
+	0x001546e00,
+	0x0011a2c11,
+	0x070042f40,
+	0x000147020,
+	0x0c0876606,
+	0x04a866d00,
+	0x000fc422f,
+	0x00041741c,
+	0x07040c087,
+	0x0670000d8,
+	0x020044c45,
+	0x008012601,
+	0x07030d680,
+	0x07039b083,
+	0x06c047027,
+	0x0d6802202,
+	0x01f832920,
+	0x000247002,
+	0x0b0826f7a,
+	0x07004c087,
+	0x0671a0c37,
+	0x000302920,
+	0x000246710,
+	0x07008b085,
+	0x066365382,
+	0x01fbc0030,
+	0x029200024,
+	0x0b4fc0000,
 	0x0670a5382,
 	0x01fbc002d,
-	0x02920001c,
+	0x029200024,
 	0x04878ffff,
-	0x02f2f0048,
+	0x02f2f0050,
 	0x048772920,
-	0x000246100,
-	0x000e0202f,
-	0x000184fef,
-	0x000484e75,
-	0x020034c45,
-	0x000012600,
-	0x0b0fc0000,
-	0x06d08701e,
-	0x09088b082,
-	0x06f044a83,
-	0x06fbc5382,
-	0x060944483,
-	0x07c016088,
-	0x026117004,
-	0x02f40000c,
-	0x04a836c04,
-	0x044837c01,
-	0x0422f0039,
-	0x0741c2003,
-	0x04c450801,
-	0x028017030,
-	0x0d8807039,
-	0x0b0846c04,
-	0x07027d880,
-	0x022021f84,
-	0x02920001c,
-	0x07002b082,
-	0x06e00ff78,
-	0x020034c45,
-	0x008012600,
+	0x0002c6100,
+	0x0013e202f,
+	0x000204fef,
+	0x000504e75,
+	0x07010b085,
+	0x066ceb6fc,
+	0x000006716,
+	0x053821fbc,
+	0x000582920,
+	0x000245382,
+	0x01fbc0030,
+	0x029200024,
+	0x060b25382,
+	0x01fbc0078,
+	0x029200024,
+	0x060e87040,
+	0x0c087673e,
+	0x020044c45,
+	0x008012800,
 	0x0b0fc0000,
 	0x06d08701e,
 	0x09088b082,
-	0x06f064a83,
-	0x06f00ff5c,
-	0x0538260ba,
-	0x026117004,
-	0x02f40000c,
-	0x06000ff18,
-	0x026113403,
-	0x042833602,
+	0x06f127040,
+	0x0c0876706,
+	0x04a846f00,
+	0x0ff604a86,
+	0x06f00ff5a,
+	0x053827040,
+	0x0c0876600,
+	0x0ff2c2006,
+	0x04c450001,
+	0x026016000,
+	0x0ff282006,
+	0x04c450001,
+	0x02c0060c0,
+	0x04486347c,
+	0x000016000,
+	0x0fefe7230,
+	0x0b280671e,
+	0x07248b280,
+	0x0670c2c11,
 	0x070042f40,
-	0x0000c6000,
-	0x0ff062611,
+	0x000146000,
+	0x0feda2811,
 	0x070042f40,
-	0x0000c6000,
-	0x0fefa2611,
+	0x000146000,
+	0x0fece2c11,
+	0x034064286,
+	0x03c027004,
+	0x02f400014,
+	0x06000febc,
+	0x07208b280,
+	0x0672a7210,
+	0x0b2806712,
+	0x07220b280,
+	0x066c42c11,
 	0x070042f40,
-	0x0000c6000,
-	0x0feee2611,
-	0x034033602,
-	0x048c37004,
-	0x02f40000c,
-	0x06000fedc,
-	0x026117004,
-	0x02f40000c,
-	0x06000fed0,
-	0x04feffff4,
-	0x0242f0010,
-	0x0282f0014,
-	0x0262f0018,
-	0x0226e8002,
-	0x0206e8006,
-	0x042812442,
-	0x04a1a6706,
-	0x052814a1a,
-	0x066fa4a84,
+	0x000146000,
+	0x0fe9e2c11,
+	0x034063c02,
+	0x048c67004,
+	0x02f400014,
+	0x06000fe8c,
+	0x02c117004,
+	0x02f400014,
+	0x06000fe80,
+	0x07275b280,
+	0x067107278,
+	0x0b2806600,
+	0x0fe567010,
+	0x02a006000,
+	0x0fe4e8ebc,
+	0x000000020,
+	0x0700a2a00,
+	0x06000fe40,
+	0x07258b280,
+	0x0670a7264,
+	0x0b2806600,
+	0x0fe3260e8,
+	0x070012640,
+	0x060d4518f,
+	0x02f2f000c,
+	0x0610008da,
+	0x0262f0014,
+	0x0266f0010,
+	0x0246f0018,
+	0x0226e8006,
+	0x0206e800a,
+	0x022004a83,
 	0x06d1e2001,
-	0x0b2846c18,
+	0x0b2836c18,
 	0x0b1c96408,
 	0x010fc0020,
-	0x02d488006,
-	0x052ae800e,
+	0x02d48800a,
+	0x052ae8016,
 	0x052812001,
-	0x0b2846de8,
-	0x02442101a,
-	0x049c02400,
-	0x067264a83,
-	0x067f4b1c9,
+	0x0b2836de8,
+	0x0101b49c0,
+	0x024006728,
+	0x0b4fc0000,
+	0x067f2b1c9,
 	0x0640610c2,
-	0x02d488006,
-	0x052ae800e,
+	0x02d48800a,
+	0x052ae8016,
 	0x0700ab082,
 	0x0663642ae,
-	0x0800e5383,
-	0x0101a49c0,
-	0x0240066da,
-	0x04a846c1e,
-	0x024044482,
+	0x08016538a,
+	0x0101b49c0,
+	0x0240066d8,
+	0x04a836c1e,
+	0x024034482,
 	0x0b2826c16,
 	0x0b1c96408,
 	0x010fc0020,
-	0x02d488006,
-	0x052ae800e,
+	0x02d48800a,
+	0x052ae8016,
 	0x05281b282,
 	0x06dea4fef,
 	0x0000c4e75,
 	0x07009b082,
 	0x066c87007,
-	0x0d0ae800e,
+	0x0d0ae8016,
 	0x0c0bcffff,
 	0x0fff82d40,
-	0x0800e60b6,
+	0x0801660b6,
+	0x0598f1ebc,
+	0x0002a202f,
+	0x000181f40,
+	0x000011f7c,
+	0x0002a0002,
+	0x0422f0003,
 	0x04878ffff,
-	0x042a7486e,
-	0x083c66100,
-	0x0ff3c4280,
-	0x04fef000c,
+	0x042a7486f,
+	0x000086100,
+	0x0ff2a4280,
+	0x04fef0010,
 	0x04e75598f,
 	0x020370161,
 	0x000081e80,


@@ 696,332 750,376 @@ ulong bootcode[]={
 	0x04878ffff,
 	0x02f2f0010,
 	0x0486f0008,
-	0x06100ff16,
+	0x06100ff04,
 	0x070044fef,
 	0x000104e75,
-	0x04878000a,
-	0x02f2f0014,
-	0x02f2f0014,
-	0x02f2f0014,
-	0x02f2f0014,
-	0x06100fd8c,
-	0x04fef0014,
-	0x04e7570fe,
-	0x04e757001,
-	0x0c0af0010,
-	0x0670470f8,
-	0x04e7570ff,
-	0x04e754878,
-	0x000082f2f,
-	0x000142f2f,
-	0x000142f2f,
-	0x000142f2f,
-	0x000146100,
-	0x0fd5a4fef,
-	0x000144e75,
 	0x02f2f000c,
 	0x02f2f000c,
 	0x02f370161,
 	0x0000c6100,
-	0x0feac7004,
+	0x0feea7004,
 	0x04fef000c,
+	0x04e75202e,
+	0x0800ab0ae,
+	0x08006640c,
+	0x01dbc0025,
+	0x00161800a,
+	0x052ae800a,
+	0x042804e75,
+	0x0202f0014,
+	0x07268b081,
+	0x06d2a6e04,
+	0x070f04e75,
+	0x0726cb280,
+	0x0670e7275,
+	0x0b2806704,
+	0x042804e75,
+	0x070e04e75,
+	0x07008c0af,
+	0x000106704,
+	0x070c04e75,
+	0x070f84e75,
+	0x07223b280,
+	0x06714722b,
+	0x0b280670a,
+	0x0722db280,
+	0x066d670fe,
+	0x04e7570ff,
 	0x04e7570fc,
-	0x04e754878,
-	0x000102f2f,
-	0x000142f2f,
-	0x000142f2f,
-	0x000142f2f,
-	0x000146100,
-	0x0fd1e4fef,
-	0x000144e75,
-	0x0202e8006,
-	0x0b0ae8002,
-	0x0640c1dbc,
-	0x000250161,
-	0x0800652ae,
-	0x080064280,
 	0x04e754fef,
-	0x0ff802e2f,
-	0x0009042af,
-	0x0000cf22f,
-	0x0543a0084,
-	0x0f2930016,
-	0x0f22f5400,
-	0x00084f200,
-	0x0001af22f,
-	0x074000084,
-	0x052af000c,
-	0x042af001c,
-	0x0f23c4000,
-	0x000000000,
-	0x0f2000100,
+	0x0ff74f237,
+	0x054000161,
+	0x00090f22f,
+	0x074000034,
+	0x042af0010,
+	0x0f22f543a,
+	0x00034f293,
+	0x00016f22f,
+	0x054000034,
+	0x0f200001a,
+	0x0f22f7400,
+	0x0003452af,
+	0x000104297,
+	0x07041b0af,
+	0x000a06e0a,
+	0x0705ab0af,
+	0x000a06c00,
+	0x004e242af,
+	0x00020f23c,
+	0x040000000,
+	0x00000f22f,
+	0x07400002c,
 	0x0f22f543a,
-	0x00084f281,
-	0x000ee486f,
-	0x0001cf22f,
-	0x054000088,
+	0x00034f281,
+	0x000e2486f,
+	0x00020f22f,
+	0x054000038,
 	0x0f2277400,
-	0x061000412,
+	0x0610004c2,
 	0x0f22f4000,
-	0x00028f23c,
+	0x0002cf23c,
 	0x054233fd3,
 	0x044135547,
 	0x05a32f22f,
-	0x060000028,
-	0x0202f0028,
+	0x06000002c,
+	0x0202f002c,
 	0x0e2802f40,
-	0x000244480,
+	0x000284480,
 	0x02f006100,
-	0x0053af22f,
-	0x054230094,
+	0x005eaf22f,
+	0x054230044,
 	0x0f22f7400,
-	0x00030202f,
-	0x0002890af,
-	0x0002c2f00,
-	0x061000520,
-	0x02e2f00a4,
+	0x00034202f,
+	0x0002c90af,
+	0x000302f00,
+	0x0610005d0,
 	0x0f22f5423,
-	0x00034f200,
+	0x00038f200,
 	0x00100f23c,
 	0x040000000,
 	0x00001f200,
 	0x00838f295,
-	0x0003453af,
-	0x00030202f,
-	0x0002c90af,
-	0x000302f00,
-	0x0610004f0,
-	0x02e2f00a8,
+	0x0003053af,
+	0x00034202f,
+	0x0003090af,
+	0x000342f00,
+	0x0610005a4,
 	0x0f22f5423,
-	0x00038f200,
+	0x0003cf200,
 	0x00100f23c,
 	0x040000000,
 	0x00001f200,
 	0x00838588f,
-	0x0f292ffd0,
+	0x0f292ffd4,
 	0x0f23c4000,
 	0x00000000a,
 	0x0f2000838,
 	0x04fef0014,
-	0x0f2920034,
-	0x052af001c,
-	0x0202f0018,
-	0x090af001c,
+	0x0f2920030,
+	0x052af0020,
+	0x0202f001c,
+	0x090af0020,
 	0x02f006100,
-	0x004aa2e2f,
-	0x00094f22f,
-	0x054230024,
+	0x00562f22f,
+	0x054230028,
 	0x0f2000100,
 	0x0f23c4000,
 	0x00000000a,
 	0x0f2000838,
 	0x0588ff295,
-	0x0ffd04a87,
-	0x06c027e08,
-	0x07067b0af,
-	0x000986606,
-	0x04a876e00,
-	0x002ac701e,
-	0x0b0876c02,
-	0x07e1e7402,
-	0x0d4872f47,
-	0x000907066,
+	0x0ffd44aaf,
+	0x000986c06,
+	0x070062f40,
+	0x000987067,
+	0x0b0af00a0,
+	0x066084aaf,
+	0x000986e00,
+	0x003c2701e,
 	0x0b0af0098,
-	0x06616202f,
-	0x0001cd480,
-	0x06e0e7401,
+	0x06c06701e,
+	0x02f400098,
+	0x07802d8af,
+	0x000987066,
+	0x0b0af00a0,
+	0x06618202f,
+	0x00020d880,
+	0x06e107801,
 	0x0f23c4000,
 	0x000000000,
+	0x0f22f7400,
+	0x0002c7020,
+	0x0b08442e7,
+	0x02f440016,
+	0x044df6e18,
+	0x07065b0af,
+	0x000a06606,
+	0x070ff2f40,
+	0x000987065,
+	0x02f4000a0,
+	0x06000fe90,
+	0x0f22f5400,
+	0x00034f22f,
+	0x07400002c,
+	0x04aaf0020,
+	0x06c2670ff,
+	0x090af0020,
+	0x02f006100,
+	0x004b2282f,
+	0x00018f227,
+	0x07400f22f,
+	0x054000038,
+	0x0f21f5423,
+	0x0f22f7400,
+	0x00030588f,
+	0x04283b684,
+	0x06c6e202f,
+	0x000209083,
+	0x02f430018,
+	0x04a806d00,
+	0x002d02f00,
+	0x06100047c,
 	0x0f2000100,
-	0x07020b082,
-	0x06e187065,
-	0x0b0af0098,
-	0x066067eff,
-	0x02f470090,
-	0x070652f40,
-	0x000986000,
-	0x0fe9c4284,
-	0x0b8826c3c,
-	0x0f2036100,
-	0x0f2034000,
-	0x0f2000838,
-	0x0f2950004,
-	0x05383f203,
-	0x04000f200,
-	0x001287030,
-	0x0d0832204,
-	0x01f804920,
-	0x00059f200,
-	0x00880f23c,
-	0x041230000,
-	0x0000af200,
-	0x008005284,
-	0x0b8826dc4,
-	0x0760570ff,
-	0x0d0822400,
-	0x04a826d38,
-	0x0200241f7,
-	0x029200059,
-	0x0101049c0,
-	0x0d0831080,
-	0x042830c37,
-	0x000392920,
-	0x000596f16,
-	0x0200241f7,
-	0x029200059,
-	0x0101049c0,
-	0x090bc0000,
-	0x0000a1080,
-	0x052835382,
-	0x04a826cc8,
-	0x07a014a83,
-	0x0670c1f7c,
-	0x000310058,
-	0x052af001c,
-	0x042854282,
-	0x04aaf000c,
-	0x0670a1fbc,
+	0x0f22f5480,
+	0x00030f200,
+	0x000a0f22f,
+	0x074000028,
+	0x0f2277480,
+	0x06100047c,
+	0x0262f0024,
+	0x0282f0020,
+	0x0f2026000,
+	0x0f2024000,
+	0x0f22f5423,
+	0x00030f22f,
+	0x054800038,
+	0x0f20000a8,
+	0x0f22f7480,
+	0x000387030,
+	0x0d0822203,
+	0x01f803920,
+	0x000715283,
+	0x0b6844fef,
+	0x0000c6d92,
+	0x0760574ff,
+	0x0d4844a82,
+	0x06d382002,
+	0x041f72920,
+	0x000651010,
+	0x049c0d083,
+	0x010804283,
+	0x00c370039,
+	0x029200065,
+	0x06f162002,
+	0x041f72920,
+	0x000651010,
+	0x049c090bc,
+	0x00000000a,
+	0x010805283,
+	0x053824a82,
+	0x06cc87c01,
+	0x04a83670c,
+	0x01f7c0031,
+	0x0006452af,
+	0x000204286,
+	0x042824aaf,
+	0x000106700,
+	0x001fc1fbc,
 	0x0002d2920,
-	0x000305282,
+	0x0003c5282,
 	0x042837801,
-	0x0d8872c07,
+	0x0d8af0098,
+	0x02a2f0098,
 	0x07067b0af,
-	0x000986612,
+	0x000a06614,
 	0x070fbb0af,
-	0x0001c6e0a,
-	0x0202f001c,
-	0x0b0876f00,
-	0x0017a7066,
+	0x000206e0c,
+	0x0202f0020,
 	0x0b0af0098,
-	0x0661a262f,
-	0x0001c4483,
-	0x06c024283,
-	0x0b6876f02,
+	0x06f0001ae,
+	0x07066b0af,
+	0x000a0661c,
+	0x0262f0020,
+	0x044836c02,
+	0x04283b6af,
+	0x000986f02,
 	0x02604202f,
-	0x0001cd880,
+	0x00020d880,
 	0x06c024284,
 	0x04a836f22,
 	0x02003d084,
-	0x0b086660a,
+	0x0b085660a,
 	0x01fbc002e,
-	0x029200030,
+	0x02920003c,
 	0x052821fbc,
 	0x000302920,
-	0x000305282,
+	0x0003c5282,
 	0x053834a83,
 	0x06ede4a84,
 	0x06f282003,
-	0x0d084b086,
+	0x0d084b085,
 	0x0660a1fbc,
 	0x0002e2920,
-	0x000305282,
+	0x0003c5282,
 	0x022021fb7,
-	0x059200058,
-	0x029200030,
-	0x052825285,
+	0x069200064,
+	0x02920003c,
+	0x052825286,
 	0x053844a84,
-	0x06ed87067,
-	0x0b0af0098,
-	0x0670000c2,
-	0x07068b0af,
-	0x000986700,
-	0x000b87065,
-	0x0b0af0098,
+	0x06ed87004,
+	0x0c0af009c,
+	0x0670000e2,
+	0x02003d084,
+	0x0b085660a,
+	0x01fbc002e,
+	0x02920003c,
+	0x052827065,
+	0x0b0af00a0,
 	0x067267067,
-	0x0b0af0098,
+	0x0b0af00a0,
 	0x0671e4237,
-	0x029200030,
+	0x02920003c,
 	0x04878ffff,
-	0x02f2f0090,
-	0x0486f0038,
-	0x06100fb5e,
+	0x02f2f0098,
+	0x0486f0044,
+	0x06100fac8,
 	0x070084fef,
-	0x0008c4e75,
-	0x01fbc0065,
-	0x029200030,
-	0x052821fbc,
-	0x0002b2920,
-	0x000305282,
-	0x0262f001c,
-	0x06c0a1fbc,
+	0x000984e75,
+	0x04a976700,
+	0x0008e1fbc,
+	0x000452920,
+	0x0003c5282,
+	0x0262f0020,
+	0x06c701fbc,
 	0x0002d2920,
-	0x0002f4483,
-	0x07064b083,
-	0x06e262003,
-	0x04c7c0801,
-	0x000000064,
-	0x0d0bc0000,
-	0x000302202,
-	0x01f802920,
-	0x000305282,
+	0x0003c5282,
+	0x044837064,
+	0x0b0836e26,
 	0x020034c7c,
 	0x008010000,
-	0x000642601,
-	0x020034c7c,
-	0x008010000,
-	0x0000ad0bc,
+	0x00064d0bc,
 	0x000000030,
 	0x022021f80,
-	0x029200030,
+	0x02920003c,
 	0x052822003,
 	0x04c7c0801,
+	0x000000064,
+	0x026012003,
+	0x04c7c0801,
 	0x00000000a,
-	0x02001d0bc,
-	0x000000030,
+	0x0d0bc0000,
+	0x000302202,
 	0x01f802920,
-	0x000305282,
-	0x06000ff5c,
-	0x076ffd682,
-	0x04a836d0a,
-	0x00c370030,
-	0x039200030,
-	0x067242803,
-	0x04a846d00,
-	0x0ff320c37,
-	0x0002e4920,
-	0x00030660e,
-	0x02403b883,
-	0x06700ff20,
+	0x0003c5282,
+	0x020034c7c,
+	0x008010000,
+	0x0000a2001,
+	0x0d0bc0000,
+	0x000301f80,
+	0x02920003c,
 	0x052826000,
-	0x0ff1a5384,
-	0x060de5383,
-	0x060ca76ff,
-	0x096af001c,
-	0x06c024283,
-	0x02c079caf,
-	0x0001c7068,
-	0x02f400098,
-	0x06000fe70,
-	0x053876000,
-	0x0fd524878,
-	0x000652f2f,
-	0x000142f2f,
-	0x000142f2f,
-	0x00014f237,
-	0x054000161,
-	0x00014f227,
-	0x074006100,
-	0x0fbee4fef,
-	0x000184e75,
-	0x048780066,
-	0x02f2f0014,
-	0x02f2f0014,
-	0x02f2f0014,
-	0x0f2375400,
-	0x001610014,
-	0x0f2277400,
-	0x06100fbc8,
-	0x04fef0018,
-	0x04e754878,
-	0x000672f2f,
-	0x000142f2f,
-	0x000142f2f,
-	0x00014f237,
-	0x054000161,
-	0x00014f227,
-	0x074006100,
-	0x0fba24fef,
-	0x000184e75,
+	0x0ff5e1fbc,
+	0x0002b2920,
+	0x0003c5282,
+	0x060901fbc,
+	0x000652920,
+	0x0003c5282,
+	0x06000ff72,
+	0x07067b0af,
+	0x000a0670a,
+	0x07068b0af,
+	0x000a06600,
+	0x0ff2276ff,
+	0x0d6824a83,
+	0x06d0a0c37,
+	0x000303920,
+	0x0003c6724,
+	0x028034a84,
+	0x06d00ff08,
+	0x00c37002e,
+	0x04920003c,
+	0x0660e2403,
+	0x0b8836700,
+	0x0fef65282,
+	0x06000fef0,
+	0x0538460de,
+	0x0538360ca,
+	0x076ff96af,
+	0x000206c02,
+	0x042832a2f,
+	0x000989aaf,
+	0x000207068,
+	0x02f4000a0,
+	0x06000fe3a,
+	0x07001c0af,
+	0x0009c6700,
+	0x0fe081fbc,
+	0x0002b2920,
+	0x0003c5282,
+	0x06000fdfa,
+	0x0f22f5500,
+	0x0002cf23c,
+	0x041230000,
+	0x0000af200,
+	0x00880f200,
+	0x00800f22f,
+	0x07500002c,
+	0x0f2277500,
+	0x0610001ac,
+	0x0262f0020,
+	0x0282f001c,
+	0x0f2026000,
+	0x0f2024000,
+	0x0f22f5480,
+	0x00034f200,
+	0x000a8f22f,
+	0x074800034,
+	0x0598f6000,
+	0x0fd3253af,
+	0x000986000,
+	0x0fc3a7001,
+	0x02e807020,
+	0x0d1af00a0,
+	0x06000fb14,
 	0x0518ff22f,
 	0x05500000c,
 	0x0206f0014,


@@ 1112,7 1210,42 @@ ulong bootcode[]={
 	0x000045888,
 	0x02f082f2f,
 	0x000086100,
-	0x00f8e508f,
+	0x01060508f,
+	0x04e75518f,
+	0x0f22f543a,
+	0x0000cf293,
+	0x00054486f,
+	0x0000cf22f,
+	0x054000010,
+	0x0f200001a,
+	0x0f2277400,
+	0x06100ff2a,
+	0x0f2000100,
+	0x0f200003a,
+	0x0f2810016,
+	0x0f22f5400,
+	0x00018f23c,
+	0x040220000,
+	0x00001f22f,
+	0x074000018,
+	0x0f22f5400,
+	0x00018f200,
+	0x0001af22f,
+	0x074000018,
+	0x0f22f5400,
+	0x000184fef,
+	0x000144e75,
+	0x0486f000c,
+	0x0f22f5400,
+	0x00010f227,
+	0x074006100,
+	0x0fedc60e0,
+	0x0f22f5480,
+	0x00004f200,
+	0x0049af227,
+	0x074806100,
+	0x0ff7ef200,
+	0x0001a508f,
 	0x04e75206f,
 	0x00004142f,
 	0x0000b6712,


@@ 1139,7 1272,7 @@ ulong bootcode[]={
 	0x005f07227,
 	0x0b0016e00,
 	0x005e83036,
-	0x00b20810e,
+	0x00b208386,
 	0x04efb0000,
 	0x0200890af,
 	0x0000c588f,


@@ 1518,8 1651,8 @@ ulong bootcode[]={
 	0x06000fa26,
 	0x0101149c0,
 	0x02f00486e,
-	0x083fa6100,
-	0x0edaa4280,
+	0x081166100,
+	0x0ec124280,
 	0x04fef000c,
 	0x04e753029,
 	0x000041080,


@@ 1629,7 1762,7 @@ ulong bootcode[]={
 	0x07227b001,
 	0x06e000576,
 	0x030360b20,
-	0x0815e4efb,
+	0x083d64efb,
 	0x00000202f,
 	0x00008d0af,
 	0x00010b088,


@@ 1979,8 2112,8 @@ ulong bootcode[]={
 	0x06000fa98,
 	0x0101149c0,
 	0x02f00486e,
-	0x084086100,
-	0x0e6764280,
+	0x081246100,
+	0x0e4de4280,
 	0x04fef000c,
 	0x04e754280,
 	0x010104281,


@@ 2080,64 2213,76 @@ ulong bootcode[]={
 	0x090af0014,
 	0x04fef0010,
 	0x04e75202f,
-	0x0000c6720,
+	0x0000c6f4c,
 	0x0246f0004,
 	0x0226f0008,
-	0x022098280,
-	0x082af0004,
-	0x0c27c0003,
-	0x0671eb5c9,
-	0x0620c14d9,
-	0x0538066fa,
+	0x0b5c96246,
+	0x02209c2bc,
+	0x000000003,
+	0x067105380,
+	0x06d3214d9,
+	0x02209c2bc,
+	0x000000003,
+	0x066f090bc,
+	0x000000010,
+	0x06d1024d9,
+	0x024d924d9,
+	0x024d990bc,
+	0x000000010,
+	0x06cf0d0bc,
+	0x00000000f,
+	0x06d0614d9,
+	0x053806cfa,
 	0x0202f0004,
 	0x04e75d3c0,
-	0x0d5c01521,
-	0x0538066fa,
-	0x0200a4e75,
-	0x0b5c9620c,
-	0x024d95980,
-	0x066fa202f,
-	0x000044e75,
-	0x0d3c0d5c0,
-	0x025215980,
-	0x066fa200a,
-	0x04e757008,
-	0x04e404e75,
-	0x070044e40,
-	0x04e757016,
+	0x0d5c02209,
+	0x0c2bc0000,
+	0x000036710,
+	0x053806de8,
+	0x015212209,
+	0x0c2bc0000,
+	0x0000366f0,
+	0x090bc0000,
+	0x000106d10,
+	0x025212521,
+	0x025212521,
+	0x090bc0000,
+	0x000106cf0,
+	0x0d0bc0000,
+	0x0000f6dbc,
+	0x015215380,
+	0x06db660f8,
+	0x070084e40,
+	0x04e757004,
 	0x04e404e75,
-	0x070064e40,
-	0x04e757007,
+	0x070164e40,
+	0x04e757006,
 	0x04e404e75,
-	0x070094e40,
-	0x04e75700d,
+	0x070074e40,
+	0x04e757009,
 	0x04e404e75,
-	0x0700e4e40,
-	0x04e75700f,
+	0x0700d4e40,
+	0x04e75700e,
 	0x04e404e75,
-	0x070114e40,
-	0x04e757014,
+	0x0700f4e40,
+	0x04e757011,
 	0x04e404e75,
+	0x070144e40,
+	0x04e750000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
-	0x00000000d,
-	0x000002ab4,
-	0x000002aca,
-	0x000002af0,
-	0x000002b0e,
-	0x000002b12,
-	0x000002b22,
-	0x000002b40,
-	0x000002b5a,
-	0x000002b5e,
-	0x000002b7c,
-	0x000002f8a,
-	0x000002fb0,
-	0x000002fd6,
 	0x000000000,
 	0x000000000,
+	0x000070000,
+	0x02b740000,
+	0x02bfc0000,
+	0x028b80000,
+	0x02c4e0000,
+	0x02ba20000,
+	0x02bc80000,
+	0x02be20000,
 	0x000000000,
 	0x000000000,
 	0x000000000,


@@ 2162,7 2307,6 @@ ulong bootcode[]={
 	0x000000000,
 	0x000000000,
 	0x000000000,
-	0x000090000,
 	0x000000000,
 	0x000000000,
 	0x000000000,


@@ 2170,216 2314,232 @@ ulong bootcode[]={
 	0x000000000,
 	0x000000000,
 	0x000000000,
+	0x000010006,
 	0x000000000,
+	0x000010001,
 	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
 	0x000000000,
+	0x000000003,
+	0x000030000,
 	0x000000000,
-	0x000000001,
-	0x0020a0b0c,
-	0x003000000,
-	0x004000005,
-	0x000000006,
-	0x000070000,
-	0x008000000,
 	0x000000000,
-	0x006180614,
-	0x0060c05f4,
-	0x005de05de,
-	0x005de05de,
-	0x005de05de,
-	0x0058e0558,
-	0x00562055e,
-	0x0055a0558,
-	0x0053c0538,
-	0x004d0047a,
-	0x004760414,
-	0x0038c0388,
-	0x003860384,
-	0x0034e034a,
-	0x0033202e8,
-	0x002b20286,
-	0x0025a0210,
-	0x001e4019a,
-	0x0013600d2,
-	0x00048000c,
-	0x005a605a2,
-	0x0059a0582,
-	0x0056c056c,
-	0x0056c056c,
-	0x0056c056c,
-	0x0051c04e6,
-	0x004f004ec,
-	0x004e804e6,
-	0x004ca04c6,
-	0x0045c0404,
-	0x0040003b6,
-	0x003540350,
-	0x0034e034c,
-	0x003160312,
-	0x002fa02b0,
-	0x0027a024e,
-	0x0022201d8,
-	0x001ac0162,
-	0x0010a00be,
-	0x0005a001c,
-	0x023632f63,
-	0x06f6e7300,
-	0x023632f63,
-	0x06f6e7300,
-	0x023632f63,
-	0x06f6e7300,
-	0x023652f62,
-	0x06f6f746c,
-	0x0696e6500,
-	0x023692f63,
-	0x0746c006f,
-	0x070656e69,
-	0x06e672023,
-	0x0692f6374,
-	0x06c007075,
-	0x073682064,
-	0x06b6d7578,
-	0x000636f6e,
-	0x066696720,
-	0x031203136,
-	0x0206e6f72,
-	0x065737461,
-	0x072740023,
-	0x06b2f322f,
-	0x064617461,
-	0x0006f7065,
-	0x06e696e67,
-	0x020236b2f,
-	0x0322f6461,
-	0x074610023,
-	0x06b2f322f,
+	0x000000000,
+	0x000000200,
+	0x000000000,
+	0x000000000,
+	0x000040203,
+	0x003030100,
+	0x000000100,
+	0x000020000,
+	0x000050001,
+	0x000000200,
+	0x000000000,
+	0x000006261,
+	0x064207479,
+	0x070653a20,
+	0x025640a00,
+	0x062616420,
+	0x074797065,
+	0x03a202564,
+	0x00a000000,
+	0x000002363,
+	0x02f636f6e,
+	0x073002363,
+	0x02f636f6e,
+	0x073002363,
+	0x02f636f6e,
+	0x073002365,
+	0x02f626f6f,
+	0x0746c696e,
+	0x065002365,
+	0x02f626f6f,
+	0x074646576,
+	0x069636500,
+	0x023632f72,
+	0x073323332,
 	0x063746c00,
 	0x06f70656e,
 	0x0696e6720,
-	0x0236b2f32,
+	0x023632f72,
+	0x073323332,
+	0x063746c00,
+	0x042313932,
+	0x030300070,
+	0x075736820,
+	0x06173796e,
+	0x063002369,
 	0x02f63746c,
-	0x000636f6e,
-	0x06e656374,
-	0x02068656c,
-	0x069782e62,
-	0x06f6f7466,
-	0x07300636f,
-	0x06e6e6563,
-	0x074656420,
-	0x0746f2068,
-	0x0656c6978,
-	0x02e626f6f,
-	0x07466730a,
-	0x0006e6f70,
-	0x02e2e2e00,
-	0x077726974,
-	0x065206e6f,
-	0x070007265,
-	0x06164206e,
-	0x06f70006e,
-	0x0203d2025,
-	0x0643b2062,
-	0x07566203d,
-	0x020252e32,
-	0x07820252e,
+	0x0006f7065,
+	0x06e696e67,
+	0x02023692f,
+	0x063746c00,
+	0x070757368,
+	0x020646b6d,
+	0x075780063,
+	0x06f6e6669,
+	0x067203120,
+	0x03136206e,
+	0x06f726573,
+	0x074617274,
+	0x000236b2f,
+	0x0322f6461,
+	0x07461006f,
+	0x070656e69,
+	0x06e672023,
+	0x06b2f322f,
+	0x064617461,
+	0x000236b2f,
+	0x0322f6374,
+	0x06c006f70,
+	0x0656e696e,
+	0x06720236b,
+	0x02f322f63,
+	0x0746c0063,
+	0x06f6e6e65,
+	0x06374206e,
+	0x066730063,
+	0x06f6e6e65,
+	0x063746564,
+	0x020746f20,
+	0x068656c69,
+	0x0782e626f,
+	0x06f746673,
+	0x00a006e6f,
+	0x0702e2e2e,
+	0x000777269,
+	0x07465206e,
+	0x06f700072,
+	0x065616420,
+	0x06e6f7000,
+	0x06e203d20,
+	0x025643b20,
+	0x062756620,
+	0x03d20252e,
 	0x032782025,
 	0x02e327820,
 	0x0252e3278,
-	0x00a00666f,
-	0x0726d6174,
-	0x0206e6f70,
-	0x0006e6f74,
-	0x020526e6f,
-	0x070007365,
-	0x07373696f,
-	0x06e2e2e2e,
-	0x000777269,
-	0x074652073,
+	0x020252e32,
+	0x0780a0066,
+	0x06f726d61,
+	0x074206e6f,
+	0x070006e6f,
+	0x07420526e,
+	0x06f700073,
 	0x065737369,
-	0x06f6e0072,
-	0x065616420,
+	0x06f6e2e2e,
+	0x02e007772,
+	0x069746520,
 	0x073657373,
 	0x0696f6e00,
-	0x0666f726d,
-	0x061742073,
-	0x065737369,
-	0x06f6e006e,
-	0x06f742052,
+	0x072656164,
+	0x020736573,
+	0x073696f6e,
+	0x000666f72,
+	0x06d617420,
 	0x073657373,
 	0x0696f6e00,
-	0x06572726f,
-	0x072202564,
-	0x03b007265,
-	0x06d6f7465,
-	0x020657272,
-	0x06f720070,
-	0x06f73742e,
-	0x02e2e0023,
-	0x0732f2573,
-	0x000626f6f,
-	0x074657300,
-	0x063726561,
-	0x074650025,
-	0x064007772,
-	0x069746500,
+	0x06e6f7420,
+	0x052736573,
+	0x073696f6e,
+	0x000657272,
+	0x06f722025,
+	0x0643b0072,
+	0x0656d6f74,
+	0x065206572,
+	0x0726f7200,
+	0x0706f7374,
+	0x02e2e2e00,
 	0x023732f25,
 	0x07300626f,
 	0x06f746573,
-	0x00023732f,
-	0x0626f6f74,
 	0x000637265,
 	0x061746500,
 	0x025640077,
 	0x072697465,
-	0x0006d6f75,
-	0x06e742e2e,
-	0x02e002f00,
-	0x02f006269,
-	0x06e64002f,
-	0x000006d6f,
-	0x0756e7400,
-	0x073756363,
-	0x06573730a,
-	0x0002f3638,
-	0x03032302f,
-	0x0696e6974,
-	0x000696e69,
-	0x074002d6d,
-	0x0002f3638,
-	0x03032302f,
-	0x0696e6974,
-	0x000696e69,
-	0x074002f36,
+	0x00023732f,
+	0x025730062,
+	0x06f6f7465,
+	0x073002373,
+	0x02f626f6f,
+	0x074006372,
+	0x065617465,
+	0x000256400,
+	0x077726974,
+	0x065006d6f,
+	0x0756e742e,
+	0x02e2e002f,
+	0x0002f0062,
+	0x0696e6400,
+	0x02f00006d,
+	0x06f756e74,
+	0x000737563,
+	0x063657373,
+	0x00a002f36,
 	0x038303230,
 	0x02f696e69,
-	0x07400626f,
-	0x06f743a20,
-	0x025733a20,
-	0x025730a00,
-	0x02a2a2a00,
-	0x000000000,
-	0x001280116,
-	0x000e0010a,
-	0x000fe00ec,
-	0x000e000e0,
-	0x000840000,
-	0x06e6f6e2d,
-	0x07a65726f,
-	0x020657869,
-	0x074207374,
-	0x061747573,
-	0x000000000,
-	0x062616420,
-	0x074797065,
-	0x03a202564,
-	0x00a006261,
-	0x064207479,
-	0x070653a20,
-	0x025640a00,
+	0x07400696e,
+	0x06974002d,
+	0x06d002f36,
+	0x038303230,
+	0x02f696e69,
+	0x07400696e,
+	0x06974002f,
+	0x036383032,
+	0x0302f696e,
+	0x069740062,
+	0x06f6f743a,
+	0x02025733a,
+	0x02025730a,
+	0x000000618,
+	0x00614060c,
+	0x005f405de,
+	0x005de05de,
+	0x005de05de,
+	0x005de058e,
+	0x005580562,
+	0x0055e055a,
+	0x00558053c,
+	0x0053804d0,
+	0x0047a0476,
+	0x00414038c,
+	0x003880386,
+	0x00384034e,
+	0x0034a0332,
+	0x002e802b2,
+	0x00286025a,
+	0x0021001e4,
+	0x0019a0136,
+	0x000d20048,
+	0x0000c05a6,
+	0x005a2059a,
+	0x00582056c,
+	0x0056c056c,
+	0x0056c056c,
+	0x0056c051c,
+	0x004e604f0,
+	0x004ec04e8,
+	0x004e604ca,
+	0x004c6045c,
+	0x004040400,
+	0x003b60354,
+	0x00350034e,
+	0x0034c0316,
+	0x0031202fa,
+	0x002b0027a,
+	0x0024e0222,
+	0x001d801ac,
+	0x00162010a,
+	0x000be005a,
+	0x0001c6e6f,
+	0x06e2d7a65,
+	0x0726f2065,
+	0x078697420,
+	0x073746174,
+	0x075730000,
 	0x000000000,
-	0x00002534,
+	0x000027b2,
 	0x0,
 };

@@ 374,7 374,6 @@ walk(Chan *ac, char *name, int domnt)
 
 	if(domnt){
 		if(waserror()){
-			print("domount error\n");
 			if(!first)
 				close(c);
 			return 0;

@@ 16,11 16,13 @@ struct Boot
 	char user[NAMELEN];
 	char server[64];
 	char line[64];
+	char device;
 };
 #define BOOT ((Boot*)0)
 
 char protouser[NAMELEN];
 char bootline[64];
+char bootdevice[2];
 int bank[2];
 
 void unloadboot(void);


@@ 53,6 55,7 @@ unloadboot(void)
 {
 	strncpy(protouser, BOOT->user, NAMELEN);
 	memcpy(bootline, BOOT->line, 64);
+	bootdevice[0] = BOOT->device;
 }
 
 void


@@ 108,6 111,9 @@ init0(void)
 		c = namec("#e/bootline", Acreate, OWRITE, 0600);
 		(*devtab[c->type].write)(c, bootline, 64);
 		close(c);
+		c = namec("#e/bootdevice", Acreate, OWRITE, 0600);
+		(*devtab[c->type].write)(c, bootdevice, 2);
+		close(c);
 	}
 	poperror();
 	touser();

@@ 61,7 61,7 @@ static void asyncclose(Queue*);
 static void asyncreset(void);
 Qinfo asyncinfo = { asynciput, asyncoput, asyncopen, asyncclose, "async", asyncreset };
 
-int asyncdebug = 1;
+int asyncdebug = 10;
 int asyncerror;
 
 static ushort crc_table[256] = {

@@ 374,7 374,6 @@ walk(Chan *ac, char *name, int domnt)
 
 	if(domnt){
 		if(waserror()){
-			print("domount error\n");
 			if(!first)
 				close(c);
 			return 0;