Pull in a few recent changes from FreeBSD, plus a couple of local

tweaks.

ok deraadt@.

4 files changed, 476 insertions, 474 deletions

diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.reg b/sys/dev/microcode/aic7xxx/aic7xxx.reg
index 4acf5382b77..7737385e2da 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.reg
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.reg
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.reg,v 1.8 2003/12/24 23:27:55 krw Exp $ */
+/* $OpenBSD: aic7xxx.reg,v 1.9 2004/02/08 00:38:09 krw Exp $ */
 /*
  * Aic7xxx register and scratch ram definitions.
  *
@@ -1308,7 +1308,6 @@ scratch_ram {
 	 */
 	MWI_RESIDUAL {
 		size		1
-		alias	TARG_IMMEDIATE_SCB
 	}
 	/*
 	 * SCBID of the next SCB to be started by the controller.
@@ -1463,6 +1462,7 @@ scratch_ram {
 	 */
 	LAST_MSG {
 		size		1
+		alias	TARG_IMMEDIATE_SCB
 	}
 
 	/*
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq
index 31c85be47d6..37f99179c62 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.seq
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.seq,v 1.15 2003/12/24 23:27:55 krw Exp $ */
+/* $OpenBSD: aic7xxx.seq,v 1.16 2004/02/08 00:38:09 krw Exp $ */
 /*
  * Adaptec 274x/284x/294x device driver firmware for Linux and FreeBSD.
  *
@@ -680,6 +680,7 @@ await_busfree:
 		clr	SCSIBUSL;	/* Prevent bit leakage durint SELTO */
 	}
 	and	SXFRCTL0, ~SPIOEN;
+	mvi	SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT;
 	test	SSTAT1,REQINIT|BUSFREE	jz .;
 	test	SSTAT1, BUSFREE jnz poll_for_work;
 	mvi	MISSED_BUSFREE call set_seqint;
@@ -1099,7 +1100,7 @@ ultra2_dmahalt:
 		test	SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz dma_mid_sg;
 		if ((ahc->flags & AHC_TARGETROLE) != 0) {
 			test	SSTAT0, TARGET jz dma_last_sg;
-			if ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0) {
+			if ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0) {
 				test	DMAPARAMS, DIRECTION jz dma_mid_sg;
 			}
 		}
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_reg.h b/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
index f0eb6a8f8fe..a219c1a409f 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_reg.h,v 1.6 2003/12/24 23:27:55 krw Exp $ */
+/* $OpenBSD: aic7xxx_reg.h,v 1.7 2004/02/08 00:38:09 krw Exp $ */
 /*
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
@@ -1306,7 +1306,6 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
 #define	CMDSIZE_TABLE_TAIL		0x34
 
 #define	MWI_RESIDUAL    		0x38
-#define	TARG_IMMEDIATE_SCB		0x38
 
 #define	NEXT_QUEUED_SCB 		0x39
 
@@ -1388,6 +1387,7 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
 #define	RETURN_2        		0x52
 
 #define	LAST_MSG        		0x53
+#define	TARG_IMMEDIATE_SCB		0x53
 
 #define	SCSISEQ_TEMPLATE		0x54
 #define		ENSELO          	0x40
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
index 8ce02ad9e34..93c81d31726 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_seq.h,v 1.13 2003/12/24 23:27:55 krw Exp $ */
+/* $OpenBSD: aic7xxx_seq.h,v 1.14 2004/02/08 00:38:09 krw Exp $ */
 /*
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
@@ -9,7 +9,7 @@
 static uint8_t seqprog[] = {
 	0xb2, 0x00, 0x00, 0x08,
 	0xf7, 0x11, 0x22, 0x08,
-	0x00, 0x65, 0xec, 0x59,
+	0x00, 0x65, 0xee, 0x59,
 	0xf7, 0x01, 0x02, 0x08,
 	0xff, 0x6a, 0x24, 0x08,
 	0x40, 0x00, 0x40, 0x68,
@@ -22,15 +22,15 @@ static uint8_t seqprog[] = {
 	0x01, 0x4d, 0xc8, 0x30,
 	0x00, 0x4c, 0x12, 0x70,
 	0x01, 0x39, 0xa2, 0x30,
-	0x00, 0x6a, 0xd4, 0x5e,
+	0x00, 0x6a, 0xd6, 0x5e,
 	0x01, 0x51, 0x20, 0x31,
 	0x01, 0x57, 0xae, 0x00,
 	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x51, 0x26, 0x5e,
+	0x00, 0x51, 0x28, 0x5e,
 	0x01, 0x51, 0xc8, 0x30,
 	0x00, 0x39, 0xc8, 0x60,
 	0x00, 0xbb, 0x30, 0x70,
-	0xc1, 0x6a, 0xec, 0x5e,
+	0xc1, 0x6a, 0xee, 0x5e,
 	0x01, 0xbf, 0x72, 0x30,
 	0x01, 0x40, 0x7e, 0x31,
 	0x01, 0x90, 0x80, 0x30,
@@ -50,10 +50,10 @@ static uint8_t seqprog[] = {
 	0x08, 0x6a, 0x78, 0x00,
 	0x01, 0x50, 0xc8, 0x30,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0x10, 0x5e,
+	0x48, 0x6a, 0x12, 0x5e,
 	0x01, 0x6a, 0xdc, 0x01,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0x10, 0x5e,
+	0x48, 0x6a, 0x12, 0x5e,
 	0x01, 0x6a, 0x26, 0x01,
 	0xf0, 0x19, 0x7a, 0x08,
 	0x0f, 0x18, 0xc8, 0x08,
@@ -94,7 +94,7 @@ static uint8_t seqprog[] = {
 	0x00, 0x65, 0x20, 0x41,
 	0x02, 0x57, 0xae, 0x00,
 	0x00, 0x65, 0x9e, 0x40,
-	0x61, 0x6a, 0xec, 0x5e,
+	0x61, 0x6a, 0xee, 0x5e,
 	0x08, 0x51, 0x20, 0x71,
 	0x02, 0x0b, 0xb2, 0x78,
 	0x00, 0x65, 0xae, 0x40,
@@ -107,7 +107,7 @@ static uint8_t seqprog[] = {
 	0x80, 0x3d, 0x7a, 0x00,
 	0x20, 0x6a, 0x16, 0x00,
 	0x00, 0x65, 0xcc, 0x41,
-	0x00, 0x65, 0xc6, 0x5e,
+	0x00, 0x65, 0xc8, 0x5e,
 	0x00, 0x65, 0x12, 0x40,
 	0x20, 0x11, 0xd2, 0x68,
 	0x20, 0x6a, 0x18, 0x00,
@@ -141,27 +141,27 @@ static uint8_t seqprog[] = {
 	0x80, 0x0b, 0xc4, 0x79,
 	0x12, 0x01, 0x02, 0x00,
 	0x01, 0xab, 0xac, 0x30,
-	0xe4, 0x6a, 0x82, 0x5d,
+	0xe4, 0x6a, 0x84, 0x5d,
 	0x40, 0x6a, 0x16, 0x00,
-	0x80, 0xba, 0x98, 0x5d,
+	0x80, 0xba, 0x9a, 0x5d,
 	0x20, 0xb8, 0x18, 0x79,
-	0x20, 0x6a, 0x98, 0x5d,
-	0x00, 0xab, 0x98, 0x5d,
+	0x20, 0x6a, 0x9a, 0x5d,
+	0x00, 0xab, 0x9a, 0x5d,
 	0x01, 0xa9, 0x78, 0x30,
 	0x10, 0xb8, 0x20, 0x79,
-	0xe4, 0x6a, 0x82, 0x5d,
+	0xe4, 0x6a, 0x84, 0x5d,
 	0x00, 0x65, 0xae, 0x40,
 	0x10, 0x03, 0x3c, 0x69,
 	0x08, 0x3c, 0x5a, 0x69,
 	0x04, 0x3c, 0x92, 0x69,
 	0x02, 0x3c, 0x98, 0x69,
 	0x01, 0x3c, 0x44, 0x79,
-	0xff, 0x6a, 0x70, 0x00,
+	0xff, 0x6a, 0xa6, 0x00,
 	0x00, 0x65, 0xa4, 0x59,
-	0x00, 0x6a, 0xd4, 0x5e,
-	0xff, 0x38, 0x30, 0x71,
+	0x00, 0x6a, 0xd6, 0x5e,
+	0xff, 0x53, 0x30, 0x71,
 	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x38, 0x26, 0x5e,
+	0x00, 0x53, 0x28, 0x5e,
 	0x00, 0x65, 0xea, 0x58,
 	0x12, 0x01, 0x02, 0x00,
 	0x00, 0x65, 0x18, 0x41,
@@ -169,10 +169,10 @@ static uint8_t seqprog[] = {
 	0x00, 0x65, 0xf2, 0x58,
 	0xfd, 0x57, 0xae, 0x08,
 	0x00, 0x65, 0xae, 0x40,
-	0xe4, 0x6a, 0x82, 0x5d,
+	0xe4, 0x6a, 0x84, 0x5d,
 	0x20, 0x3c, 0x4a, 0x79,
-	0x02, 0x6a, 0x98, 0x5d,
-	0x04, 0x6a, 0x98, 0x5d,
+	0x02, 0x6a, 0x9a, 0x5d,
+	0x04, 0x6a, 0x9a, 0x5d,
 	0x01, 0x03, 0x4c, 0x69,
 	0xf7, 0x11, 0x22, 0x08,
 	0xff, 0x6a, 0x24, 0x08,
@@ -183,13 +183,13 @@ static uint8_t seqprog[] = {
 	0x80, 0x86, 0xc8, 0x08,
 	0x01, 0x4f, 0xc8, 0x30,
 	0x00, 0x50, 0x6c, 0x61,
-	0xc4, 0x6a, 0x82, 0x5d,
+	0xc4, 0x6a, 0x84, 0x5d,
 	0x40, 0x3c, 0x68, 0x79,
-	0x28, 0x6a, 0x98, 0x5d,
+	0x28, 0x6a, 0x9a, 0x5d,
 	0x00, 0x65, 0x4c, 0x41,
-	0x08, 0x6a, 0x98, 0x5d,
+	0x08, 0x6a, 0x9a, 0x5d,
 	0x00, 0x65, 0x4c, 0x41,
-	0x84, 0x6a, 0x82, 0x5d,
+	0x84, 0x6a, 0x84, 0x5d,
 	0x00, 0x65, 0xf2, 0x58,
 	0x01, 0x66, 0xc8, 0x30,
 	0x01, 0x64, 0xd8, 0x31,
@@ -209,16 +209,16 @@ static uint8_t seqprog[] = {
 	0xf7, 0x3c, 0x78, 0x08,
 	0x00, 0x65, 0x20, 0x41,
 	0x40, 0xaa, 0x7e, 0x10,
-	0x04, 0xaa, 0x82, 0x5d,
-	0x00, 0x65, 0x5e, 0x42,
-	0xc4, 0x6a, 0x82, 0x5d,
+	0x04, 0xaa, 0x84, 0x5d,
+	0x00, 0x65, 0x60, 0x42,
+	0xc4, 0x6a, 0x84, 0x5d,
 	0xc0, 0x6a, 0x7e, 0x00,
-	0x00, 0xa8, 0x98, 0x5d,
+	0x00, 0xa8, 0x9a, 0x5d,
 	0xe4, 0x6a, 0x06, 0x00,
-	0x00, 0x6a, 0x98, 0x5d,
+	0x00, 0x6a, 0x9a, 0x5d,
 	0x00, 0x65, 0x4c, 0x41,
 	0x10, 0x3c, 0xa8, 0x69,
-	0x00, 0xbb, 0x9e, 0x44,
+	0x00, 0xbb, 0xa0, 0x44,
 	0x18, 0x6a, 0xda, 0x01,
 	0x01, 0x69, 0xd8, 0x31,
 	0x1c, 0x6a, 0xd0, 0x01,
@@ -228,31 +228,32 @@ static uint8_t seqprog[] = {
 	0x01, 0x93, 0x26, 0x01,
 	0x03, 0x6a, 0x2a, 0x01,
 	0x01, 0x69, 0x32, 0x31,
-	0x1c, 0x6a, 0xf4, 0x5d,
+	0x1c, 0x6a, 0xf6, 0x5d,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0xbc, 0x5e,
+	0x00, 0x65, 0xbe, 0x5e,
 	0x01, 0x50, 0xa0, 0x18,
 	0x02, 0x6a, 0x22, 0x05,
 	0x1a, 0x01, 0x02, 0x00,
 	0x80, 0x6a, 0x74, 0x00,
 	0x40, 0x6a, 0x78, 0x00,
 	0x40, 0x6a, 0x16, 0x00,
-	0x00, 0x65, 0xec, 0x5d,
+	0x00, 0x65, 0xee, 0x5d,
 	0x01, 0x3f, 0xc8, 0x30,
-	0xbf, 0x64, 0x5e, 0x7a,
-	0x80, 0x64, 0xb2, 0x73,
-	0xa0, 0x64, 0x14, 0x74,
-	0xc0, 0x64, 0x08, 0x74,
-	0xe0, 0x64, 0x44, 0x74,
-	0x01, 0x6a, 0xec, 0x5e,
+	0xbf, 0x64, 0x60, 0x7a,
+	0x80, 0x64, 0xb4, 0x73,
+	0xa0, 0x64, 0x16, 0x74,
+	0xc0, 0x64, 0x0a, 0x74,
+	0xe0, 0x64, 0x46, 0x74,
+	0x01, 0x6a, 0xee, 0x5e,
 	0x00, 0x65, 0xcc, 0x41,
 	0xf7, 0x11, 0x22, 0x08,
 	0x01, 0x06, 0xd4, 0x30,
 	0xff, 0x6a, 0x24, 0x08,
 	0xf7, 0x01, 0x02, 0x08,
-	0x09, 0x0c, 0xe6, 0x79,
+	0xc0, 0x6a, 0x78, 0x00,
+	0x09, 0x0c, 0xe8, 0x79,
 	0x08, 0x0c, 0x04, 0x68,
-	0xb1, 0x6a, 0xec, 0x5e,
+	0xb1, 0x6a, 0xee, 0x5e,
 	0xff, 0x6a, 0x26, 0x09,
 	0x12, 0x01, 0x02, 0x00,
 	0x02, 0x6a, 0x08, 0x30,
@@ -265,33 +266,33 @@ static uint8_t seqprog[] = {
 	0x00, 0xa5, 0x4a, 0x21,
 	0x00, 0xa6, 0x4c, 0x21,
 	0x00, 0xa7, 0x4e, 0x25,
-	0x08, 0xeb, 0xf0, 0x7e,
-	0x80, 0xeb, 0x06, 0x7a,
+	0x08, 0xeb, 0xf2, 0x7e,
+	0x80, 0xeb, 0x08, 0x7a,
 	0xff, 0x6a, 0xd6, 0x09,
-	0x08, 0xeb, 0x0a, 0x6a,
+	0x08, 0xeb, 0x0c, 0x6a,
 	0xff, 0x6a, 0xd4, 0x0c,
-	0x80, 0xa3, 0xf0, 0x6e,
-	0x88, 0xeb, 0x20, 0x72,
-	0x08, 0xeb, 0xf0, 0x6e,
-	0x04, 0xea, 0x24, 0xe2,
-	0x08, 0xee, 0xf0, 0x6e,
+	0x80, 0xa3, 0xf2, 0x6e,
+	0x88, 0xeb, 0x22, 0x72,
+	0x08, 0xeb, 0xf2, 0x6e,
+	0x04, 0xea, 0x26, 0xe2,
+	0x08, 0xee, 0xf2, 0x6e,
 	0x04, 0x6a, 0xd0, 0x81,
 	0x05, 0xa4, 0xc0, 0x89,
 	0x03, 0xa5, 0xc2, 0x31,
 	0x09, 0x6a, 0xd6, 0x05,
-	0x00, 0x65, 0x08, 0x5a,
+	0x00, 0x65, 0x0a, 0x5a,
 	0x06, 0xa4, 0xd4, 0x89,
-	0x80, 0x94, 0xf0, 0x7e,
+	0x80, 0x94, 0xf2, 0x7e,
 	0x07, 0xe9, 0x10, 0x31,
-	0x01, 0x8c, 0x2c, 0x7a,
+	0x01, 0x8c, 0x2e, 0x7a,
 	0x01, 0x55, 0xaa, 0x10,
 	0x01, 0xe9, 0x46, 0x31,
-	0x00, 0xa3, 0xce, 0x5e,
-	0x00, 0x65, 0xfa, 0x59,
+	0x00, 0xa3, 0xd0, 0x5e,
+	0x00, 0x65, 0xfc, 0x59,
 	0x01, 0xa4, 0xca, 0x30,
-	0x01, 0x55, 0x38, 0x7a,
+	0x01, 0x55, 0x3a, 0x7a,
 	0x04, 0x65, 0xca, 0x00,
-	0x80, 0xa3, 0x3c, 0x7a,
+	0x80, 0xa3, 0x3e, 0x7a,
 	0x02, 0x65, 0xca, 0x00,
 	0x01, 0x65, 0xf8, 0x31,
 	0x80, 0x93, 0x26, 0x01,
@@ -299,168 +300,168 @@ static uint8_t seqprog[] = {
 	0x01, 0x8c, 0xc8, 0x30,
 	0x00, 0x88, 0xc8, 0x18,
 	0x02, 0x64, 0xc8, 0x88,
-	0xff, 0x64, 0xf0, 0x7e,
-	0xff, 0x8d, 0x52, 0x6a,
-	0xff, 0x8e, 0x52, 0x6a,
+	0xff, 0x64, 0xf2, 0x7e,
+	0xff, 0x8d, 0x54, 0x6a,
+	0xff, 0x8e, 0x54, 0x6a,
 	0x03, 0x8c, 0xd4, 0x98,
-	0x00, 0x65, 0xf0, 0x56,
+	0x00, 0x65, 0xf2, 0x56,
 	0x01, 0x64, 0x70, 0x30,
 	0xff, 0x64, 0xc8, 0x10,
 	0x01, 0x64, 0xc8, 0x18,
 	0x00, 0x8c, 0x18, 0x19,
 	0xff, 0x8d, 0x1a, 0x21,
 	0xff, 0x8e, 0x1c, 0x25,
-	0xc0, 0x3c, 0x62, 0x7a,
-	0x21, 0x6a, 0xec, 0x5e,
+	0xc0, 0x3c, 0x64, 0x7a,
+	0x21, 0x6a, 0xee, 0x5e,
 	0xa8, 0x6a, 0x76, 0x00,
 	0x79, 0x6a, 0x76, 0x00,
-	0x40, 0x3f, 0x6a, 0x6a,
+	0x40, 0x3f, 0x6c, 0x6a,
 	0x04, 0x3b, 0x76, 0x00,
 	0x04, 0x6a, 0xd4, 0x81,
-	0x20, 0x3c, 0x72, 0x7a,
-	0x51, 0x6a, 0xec, 0x5e,
-	0x00, 0x65, 0x8c, 0x42,
+	0x20, 0x3c, 0x74, 0x7a,
+	0x51, 0x6a, 0xee, 0x5e,
+	0x00, 0x65, 0x8e, 0x42,
 	0x20, 0x3c, 0x78, 0x00,
-	0x00, 0xb3, 0xce, 0x5e,
+	0x00, 0xb3, 0xd0, 0x5e,
 	0x07, 0xac, 0x10, 0x31,
 	0x05, 0xb3, 0x46, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xac, 0x6a, 0x02, 0x5e,
+	0xac, 0x6a, 0x04, 0x5e,
 	0xa3, 0x6a, 0xcc, 0x00,
-	0xb3, 0x6a, 0x06, 0x5e,
-	0x00, 0x65, 0x42, 0x5a,
+	0xb3, 0x6a, 0x08, 0x5e,
+	0x00, 0x65, 0x44, 0x5a,
 	0xfd, 0xa4, 0x48, 0x09,
 	0x01, 0x8c, 0xaa, 0x08,
 	0x03, 0x8c, 0x10, 0x30,
-	0x00, 0x65, 0xfa, 0x5d,
-	0x01, 0xa4, 0x9e, 0x7a,
+	0x00, 0x65, 0xfc, 0x5d,
+	0x01, 0xa4, 0xa0, 0x7a,
 	0x04, 0x3b, 0x76, 0x08,
 	0x01, 0x3b, 0x26, 0x31,
 	0x80, 0x02, 0x04, 0x00,
-	0x10, 0x0c, 0x94, 0x7a,
-	0x03, 0x9e, 0x96, 0x6a,
+	0x10, 0x0c, 0x96, 0x7a,
+	0x03, 0x9e, 0x98, 0x6a,
 	0x7f, 0x02, 0x04, 0x08,
-	0x91, 0x6a, 0xec, 0x5e,
+	0x91, 0x6a, 0xee, 0x5e,
 	0x00, 0x65, 0xcc, 0x41,
 	0x01, 0xa4, 0xca, 0x30,
-	0x80, 0xa3, 0xa4, 0x7a,
+	0x80, 0xa3, 0xa6, 0x7a,
 	0x02, 0x65, 0xca, 0x00,
-	0x01, 0x55, 0xa8, 0x7a,
+	0x01, 0x55, 0xaa, 0x7a,
 	0x04, 0x65, 0xca, 0x00,
 	0x01, 0x65, 0xf8, 0x31,
 	0x01, 0x3b, 0x26, 0x31,
-	0x00, 0x65, 0x0e, 0x5a,
-	0x01, 0xfc, 0xb6, 0x6a,
-	0x80, 0x0b, 0xac, 0x6a,
-	0x10, 0x0c, 0xac, 0x7a,
-	0x20, 0x93, 0xac, 0x6a,
+	0x00, 0x65, 0x10, 0x5a,
+	0x01, 0xfc, 0xb8, 0x6a,
+	0x80, 0x0b, 0xae, 0x6a,
+	0x10, 0x0c, 0xae, 0x7a,
+	0x20, 0x93, 0xae, 0x6a,
 	0x02, 0x93, 0x26, 0x01,
-	0x02, 0xfc, 0xc0, 0x7a,
-	0x40, 0x0d, 0xda, 0x6a,
+	0x02, 0xfc, 0xc2, 0x7a,
+	0x40, 0x0d, 0xdc, 0x6a,
 	0x01, 0xa4, 0x48, 0x01,
-	0x00, 0x65, 0xda, 0x42,
-	0x40, 0x0d, 0xc6, 0x6a,
-	0x00, 0x65, 0x0e, 0x5a,
-	0x00, 0x65, 0xb8, 0x42,
-	0x80, 0xfc, 0xd0, 0x7a,
-	0x80, 0xa4, 0xd0, 0x6a,
+	0x00, 0x65, 0xdc, 0x42,
+	0x40, 0x0d, 0xc8, 0x6a,
+	0x00, 0x65, 0x10, 0x5a,
+	0x00, 0x65, 0xba, 0x42,
+	0x80, 0xfc, 0xd2, 0x7a,
+	0x80, 0xa4, 0xd2, 0x6a,
 	0xff, 0xa5, 0x4a, 0x19,
 	0xff, 0xa6, 0x4c, 0x21,
 	0xff, 0xa7, 0x4e, 0x21,
 	0xf8, 0xfc, 0x48, 0x09,
 	0xff, 0x6a, 0xaa, 0x08,
-	0x04, 0xfc, 0xd8, 0x7a,
+	0x04, 0xfc, 0xda, 0x7a,
 	0x01, 0x55, 0xaa, 0x00,
 	0xff, 0x6a, 0x46, 0x09,
-	0x04, 0x3b, 0xf2, 0x6a,
+	0x04, 0x3b, 0xf4, 0x6a,
 	0x02, 0x93, 0x26, 0x01,
-	0x01, 0x94, 0xdc, 0x7a,
-	0x01, 0x94, 0xdc, 0x7a,
-	0x01, 0x94, 0xdc, 0x7a,
-	0x01, 0x94, 0xdc, 0x7a,
-	0x01, 0x94, 0xdc, 0x7a,
-	0x01, 0xa4, 0xf0, 0x7a,
-	0x01, 0xfc, 0xea, 0x7a,
-	0x01, 0x94, 0xf2, 0x6a,
-	0x00, 0x65, 0x8c, 0x42,
-	0x01, 0x94, 0xf0, 0x7a,
-	0x10, 0x94, 0xf2, 0x6a,
+	0x01, 0x94, 0xde, 0x7a,
+	0x01, 0x94, 0xde, 0x7a,
+	0x01, 0x94, 0xde, 0x7a,
+	0x01, 0x94, 0xde, 0x7a,
+	0x01, 0x94, 0xde, 0x7a,
+	0x01, 0xa4, 0xf2, 0x7a,
+	0x01, 0xfc, 0xec, 0x7a,
+	0x01, 0x94, 0xf4, 0x6a,
+	0x00, 0x65, 0x8e, 0x42,
+	0x01, 0x94, 0xf2, 0x7a,
+	0x10, 0x94, 0xf4, 0x6a,
 	0xd7, 0x93, 0x26, 0x09,
-	0x28, 0x93, 0xf6, 0x6a,
+	0x28, 0x93, 0xf8, 0x6a,
 	0x01, 0x85, 0x0a, 0x01,
-	0x02, 0xfc, 0xfe, 0x6a,
+	0x02, 0xfc, 0x00, 0x6b,
 	0x01, 0x14, 0x46, 0x31,
 	0xff, 0x6a, 0x10, 0x09,
 	0xfe, 0x85, 0x0a, 0x09,
-	0xff, 0x38, 0x0c, 0x6b,
-	0x80, 0xa3, 0x0c, 0x7b,
-	0x80, 0x0b, 0x0a, 0x7b,
-	0x04, 0x3b, 0x0c, 0x7b,
+	0xff, 0x38, 0x0e, 0x6b,
+	0x80, 0xa3, 0x0e, 0x7b,
+	0x80, 0x0b, 0x0c, 0x7b,
+	0x04, 0x3b, 0x0e, 0x7b,
 	0xbf, 0x3b, 0x76, 0x08,
 	0x01, 0x3b, 0x26, 0x31,
-	0x00, 0x65, 0x0e, 0x5a,
-	0x01, 0x0b, 0x1a, 0x6b,
-	0x10, 0x0c, 0x0e, 0x7b,
-	0x04, 0x93, 0x18, 0x6b,
-	0x01, 0x94, 0x16, 0x7b,
-	0x10, 0x94, 0x18, 0x6b,
+	0x00, 0x65, 0x10, 0x5a,
+	0x01, 0x0b, 0x1c, 0x6b,
+	0x10, 0x0c, 0x10, 0x7b,
+	0x04, 0x93, 0x1a, 0x6b,
+	0x01, 0x94, 0x18, 0x7b,
+	0x10, 0x94, 0x1a, 0x6b,
 	0xc7, 0x93, 0x26, 0x09,
 	0x01, 0x99, 0xd4, 0x30,
-	0x38, 0x93, 0x1c, 0x6b,
-	0xff, 0x08, 0x6e, 0x6b,
-	0xff, 0x09, 0x6e, 0x6b,
-	0xff, 0x0a, 0x6e, 0x6b,
-	0xff, 0x38, 0x38, 0x7b,
+	0x38, 0x93, 0x1e, 0x6b,
+	0xff, 0x08, 0x70, 0x6b,
+	0xff, 0x09, 0x70, 0x6b,
+	0xff, 0x0a, 0x70, 0x6b,
+	0xff, 0x38, 0x3a, 0x7b,
 	0x04, 0x14, 0x10, 0x31,
 	0x01, 0x38, 0x18, 0x31,
 	0x02, 0x6a, 0x1a, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x14, 0x6a, 0x08, 0x5e,
-	0x00, 0x38, 0xf4, 0x5d,
+	0x14, 0x6a, 0x0a, 0x5e,
+	0x00, 0x38, 0xf6, 0x5d,
 	0xff, 0x6a, 0x70, 0x08,
-	0x00, 0x65, 0x64, 0x43,
-	0x80, 0xa3, 0x3e, 0x7b,
+	0x00, 0x65, 0x66, 0x43,
+	0x80, 0xa3, 0x40, 0x7b,
 	0x01, 0xa4, 0x48, 0x01,
-	0x00, 0x65, 0x6e, 0x43,
-	0x08, 0xeb, 0x44, 0x7b,
-	0x00, 0x65, 0x0e, 0x5a,
-	0x08, 0xeb, 0x40, 0x6b,
+	0x00, 0x65, 0x70, 0x43,
+	0x08, 0xeb, 0x46, 0x7b,
+	0x00, 0x65, 0x10, 0x5a,
+	0x08, 0xeb, 0x42, 0x6b,
 	0x07, 0xe9, 0x10, 0x31,
 	0x01, 0xe9, 0xca, 0x30,
 	0x01, 0x65, 0x46, 0x31,
-	0x00, 0x6a, 0xce, 0x5e,
+	0x00, 0x6a, 0xd0, 0x5e,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xa4, 0x6a, 0x08, 0x5e,
-	0x08, 0x6a, 0xf4, 0x5d,
+	0xa4, 0x6a, 0x0a, 0x5e,
+	0x08, 0x6a, 0xf6, 0x5d,
 	0x0d, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0xbc, 0x5e,
+	0x00, 0x65, 0xbe, 0x5e,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x00, 0x65, 0x9e, 0x5e,
+	0x00, 0x65, 0xa0, 0x5e,
 	0x01, 0x99, 0x46, 0x31,
-	0x00, 0xa3, 0xce, 0x5e,
+	0x00, 0xa3, 0xd0, 0x5e,
 	0x01, 0x88, 0x10, 0x31,
-	0x00, 0x65, 0x42, 0x5a,
-	0x00, 0x65, 0xfa, 0x59,
+	0x00, 0x65, 0x44, 0x5a,
+	0x00, 0x65, 0xfc, 0x59,
 	0x03, 0x8c, 0x10, 0x30,
-	0x00, 0x65, 0xfa, 0x5d,
-	0x01, 0x8c, 0x6c, 0x7b,
+	0x00, 0x65, 0xfc, 0x5d,
+	0x01, 0x8c, 0x6e, 0x7b,
 	0x01, 0x55, 0xaa, 0x10,
-	0x80, 0x0b, 0x8c, 0x6a,
-	0x80, 0x0b, 0x76, 0x6b,
-	0x01, 0x0c, 0x70, 0x7b,
-	0x10, 0x0c, 0x8c, 0x7a,
-	0x03, 0x9e, 0x8c, 0x6a,
-	0x00, 0x65, 0x04, 0x5a,
-	0x00, 0x6a, 0xce, 0x5e,
-	0x01, 0xa4, 0x96, 0x6b,
-	0xff, 0x38, 0x8c, 0x7b,
+	0x80, 0x0b, 0x8e, 0x6a,
+	0x80, 0x0b, 0x78, 0x6b,
+	0x01, 0x0c, 0x72, 0x7b,
+	0x10, 0x0c, 0x8e, 0x7a,
+	0x03, 0x9e, 0x8e, 0x6a,
+	0x00, 0x65, 0x06, 0x5a,
+	0x00, 0x6a, 0xd0, 0x5e,
+	0x01, 0xa4, 0x98, 0x6b,
+	0xff, 0x38, 0x8e, 0x7b,
 	0x01, 0x38, 0xc8, 0x30,
 	0x00, 0x08, 0x40, 0x19,
 	0xff, 0x6a, 0xc8, 0x08,
 	0x00, 0x09, 0x42, 0x21,
 	0x00, 0x0a, 0x44, 0x21,
 	0xff, 0x6a, 0x70, 0x08,
-	0x00, 0x65, 0x8e, 0x43,
+	0x00, 0x65, 0x90, 0x43,
 	0x03, 0x08, 0x40, 0x31,
 	0x03, 0x08, 0x40, 0x31,
 	0x01, 0x08, 0x40, 0x31,
@@ -472,16 +473,16 @@ static uint8_t seqprog[] = {
 	0x04, 0x3c, 0xcc, 0x79,
 	0xfb, 0x3c, 0x78, 0x08,
 	0x04, 0x93, 0x20, 0x79,
-	0x01, 0x0c, 0xa2, 0x6b,
+	0x01, 0x0c, 0xa4, 0x6b,
 	0x01, 0x55, 0x20, 0x79,
 	0x80, 0x04, 0x20, 0x79,
-	0xe4, 0x6a, 0x82, 0x5d,
-	0x23, 0x6a, 0x98, 0x5d,
-	0x01, 0x6a, 0x98, 0x5d,
+	0xe4, 0x6a, 0x84, 0x5d,
+	0x23, 0x6a, 0x9a, 0x5d,
+	0x01, 0x6a, 0x9a, 0x5d,
 	0x00, 0x65, 0x20, 0x41,
 	0x00, 0x65, 0xcc, 0x41,
-	0x80, 0x3c, 0xb6, 0x7b,
-	0x21, 0x6a, 0xec, 0x5e,
+	0x80, 0x3c, 0xb8, 0x7b,
+	0x21, 0x6a, 0xee, 0x5e,
 	0x01, 0xbc, 0x18, 0x31,
 	0x02, 0x6a, 0x1a, 0x31,
 	0x02, 0x6a, 0xf8, 0x01,
@@ -491,16 +492,16 @@ static uint8_t seqprog[] = {
 	0xff, 0x6a, 0x12, 0x08,
 	0xff, 0x6a, 0x14, 0x08,
 	0xf3, 0xbc, 0xd4, 0x18,
-	0xa0, 0x6a, 0xdc, 0x53,
+	0xa0, 0x6a, 0xde, 0x53,
 	0x04, 0xa0, 0x10, 0x31,
 	0xac, 0x6a, 0x26, 0x01,
 	0x04, 0xa0, 0x10, 0x31,
 	0x03, 0x08, 0x18, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xa0, 0x6a, 0x08, 0x5e,
-	0x00, 0xbc, 0xf4, 0x5d,
+	0xa0, 0x6a, 0x0a, 0x5e,
+	0x00, 0xbc, 0xf6, 0x5d,
 	0x3d, 0x6a, 0x26, 0x01,
-	0x00, 0x65, 0xf4, 0x43,
+	0x00, 0x65, 0xf6, 0x43,
 	0xff, 0x6a, 0x10, 0x09,
 	0xa4, 0x6a, 0x26, 0x01,
 	0x0c, 0xa0, 0x32, 0x31,
@@ -510,128 +511,128 @@ static uint8_t seqprog[] = {
 	0x36, 0x6a, 0x26, 0x01,
 	0x02, 0x93, 0x26, 0x01,
 	0x35, 0x6a, 0x26, 0x01,
-	0x00, 0x65, 0xb0, 0x5e,
-	0x00, 0x65, 0xb0, 0x5e,
+	0x00, 0x65, 0xb2, 0x5e,
+	0x00, 0x65, 0xb2, 0x5e,
 	0x02, 0x93, 0x26, 0x01,
 	0xbf, 0x3c, 0x78, 0x08,
-	0x04, 0x0b, 0xfa, 0x6b,
-	0x10, 0x0c, 0xf6, 0x7b,
-	0x01, 0x03, 0xfa, 0x6b,
-	0x20, 0x93, 0xfc, 0x6b,
-	0x04, 0x0b, 0x02, 0x6c,
+	0x04, 0x0b, 0xfc, 0x6b,
+	0x10, 0x0c, 0xf8, 0x7b,
+	0x01, 0x03, 0xfc, 0x6b,
+	0x20, 0x93, 0xfe, 0x6b,
+	0x04, 0x0b, 0x04, 0x6c,
 	0x40, 0x3c, 0x78, 0x00,
 	0xc7, 0x93, 0x26, 0x09,
-	0x38, 0x93, 0x04, 0x6c,
+	0x38, 0x93, 0x06, 0x6c,
 	0x00, 0x65, 0xcc, 0x41,
-	0x80, 0x3c, 0x6a, 0x6c,
+	0x80, 0x3c, 0x6c, 0x6c,
 	0x01, 0x06, 0x50, 0x31,
 	0x80, 0xb8, 0x70, 0x01,
 	0x00, 0x65, 0xcc, 0x41,
 	0x10, 0x3f, 0x06, 0x00,
 	0x10, 0x6a, 0x06, 0x00,
 	0x01, 0x3a, 0xca, 0x30,
-	0x80, 0x65, 0x30, 0x64,
-	0x10, 0xb8, 0x54, 0x6c,
+	0x80, 0x65, 0x32, 0x64,
+	0x10, 0xb8, 0x56, 0x6c,
 	0xc0, 0xba, 0xca, 0x00,
-	0x40, 0xb8, 0x20, 0x6c,
+	0x40, 0xb8, 0x22, 0x6c,
 	0xbf, 0x65, 0xca, 0x08,
-	0x20, 0xb8, 0x34, 0x7c,
+	0x20, 0xb8, 0x36, 0x7c,
 	0x01, 0x65, 0x0c, 0x30,
-	0x00, 0x65, 0xec, 0x5d,
-	0xa0, 0x3f, 0x3c, 0x64,
+	0x00, 0x65, 0xee, 0x5d,
+	0xa0, 0x3f, 0x3e, 0x64,
 	0x23, 0xb8, 0x0c, 0x08,
-	0x00, 0x65, 0xec, 0x5d,
-	0xa0, 0x3f, 0x3c, 0x64,
-	0x00, 0xbb, 0x34, 0x44,
-	0xff, 0x65, 0x34, 0x64,
-	0x00, 0x65, 0x54, 0x44,
+	0x00, 0x65, 0xee, 0x5d,
+	0xa0, 0x3f, 0x3e, 0x64,
+	0x00, 0xbb, 0x36, 0x44,
+	0xff, 0x65, 0x36, 0x64,
+	0x00, 0x65, 0x56, 0x44,
 	0x40, 0x6a, 0x18, 0x00,
 	0x01, 0x65, 0x0c, 0x30,
-	0x00, 0x65, 0xec, 0x5d,
-	0xa0, 0x3f, 0x10, 0x74,
+	0x00, 0x65, 0xee, 0x5d,
+	0xa0, 0x3f, 0x12, 0x74,
 	0x40, 0x6a, 0x18, 0x00,
 	0x01, 0x3a, 0xa6, 0x30,
 	0x08, 0x6a, 0x74, 0x00,
 	0x00, 0x65, 0xcc, 0x41,
-	0x64, 0x6a, 0x7c, 0x5d,
-	0x80, 0x64, 0xec, 0x6c,
-	0x04, 0x64, 0xae, 0x74,
-	0x02, 0x64, 0xbe, 0x74,
-	0x00, 0x6a, 0x74, 0x74,
-	0x03, 0x64, 0xdc, 0x74,
-	0x23, 0x64, 0x5c, 0x74,
-	0x08, 0x64, 0x70, 0x74,
-	0x61, 0x6a, 0xec, 0x5e,
-	0x00, 0x65, 0xec, 0x5d,
+	0x64, 0x6a, 0x7e, 0x5d,
+	0x80, 0x64, 0xee, 0x6c,
+	0x04, 0x64, 0xb0, 0x74,
+	0x02, 0x64, 0xc0, 0x74,
+	0x00, 0x6a, 0x76, 0x74,
+	0x03, 0x64, 0xde, 0x74,
+	0x23, 0x64, 0x5e, 0x74,
+	0x08, 0x64, 0x72, 0x74,
+	0x61, 0x6a, 0xee, 0x5e,
+	0x00, 0x65, 0xee, 0x5d,
 	0x08, 0x51, 0xce, 0x71,
-	0x00, 0x65, 0x54, 0x44,
-	0x80, 0x04, 0x6e, 0x7c,
-	0x51, 0x6a, 0x72, 0x5d,
-	0x01, 0x51, 0x6e, 0x64,
-	0x01, 0xa4, 0x66, 0x7c,
-	0x01, 0x55, 0x70, 0x7c,
-	0x41, 0x6a, 0xec, 0x5e,
-	0x00, 0x65, 0x70, 0x44,
-	0x21, 0x6a, 0xec, 0x5e,
-	0x00, 0x65, 0x70, 0x44,
-	0x07, 0x6a, 0x68, 0x5d,
+	0x00, 0x65, 0x56, 0x44,
+	0x80, 0x04, 0x70, 0x7c,
+	0x51, 0x6a, 0x74, 0x5d,
+	0x01, 0x51, 0x70, 0x64,
+	0x01, 0xa4, 0x68, 0x7c,
+	0x01, 0x55, 0x72, 0x7c,
+	0x41, 0x6a, 0xee, 0x5e,
+	0x00, 0x65, 0x72, 0x44,
+	0x21, 0x6a, 0xee, 0x5e,
+	0x00, 0x65, 0x72, 0x44,
+	0x07, 0x6a, 0x6a, 0x5d,
 	0x01, 0x06, 0xd4, 0x30,
 	0x00, 0x65, 0xcc, 0x41,
-	0x80, 0xb8, 0x6a, 0x7c,
-	0xc0, 0x3c, 0x7e, 0x7c,
-	0x80, 0x3c, 0x6a, 0x6c,
-	0xff, 0xa8, 0x7e, 0x6c,
-	0x40, 0x3c, 0x6a, 0x6c,
-	0x10, 0xb8, 0x82, 0x7c,
-	0xa1, 0x6a, 0xec, 0x5e,
-	0x01, 0xb4, 0x88, 0x6c,
-	0x02, 0xb4, 0x8a, 0x6c,
-	0x01, 0xa4, 0x8a, 0x7c,
-	0xff, 0xa8, 0x9a, 0x7c,
+	0x80, 0xb8, 0x6c, 0x7c,
+	0xc0, 0x3c, 0x80, 0x7c,
+	0x80, 0x3c, 0x6c, 0x6c,
+	0xff, 0xa8, 0x80, 0x6c,
+	0x40, 0x3c, 0x6c, 0x6c,
+	0x10, 0xb8, 0x84, 0x7c,
+	0xa1, 0x6a, 0xee, 0x5e,
+	0x01, 0xb4, 0x8a, 0x6c,
+	0x02, 0xb4, 0x8c, 0x6c,
+	0x01, 0xa4, 0x8c, 0x7c,
+	0xff, 0xa8, 0x9c, 0x7c,
 	0x04, 0xb4, 0x68, 0x01,
 	0x01, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0x26, 0x5e,
-	0xff, 0xa8, 0x9a, 0x7c,
-	0x71, 0x6a, 0xec, 0x5e,
-	0x40, 0x51, 0x9a, 0x64,
-	0x00, 0x65, 0xc6, 0x5e,
+	0x00, 0xbb, 0x28, 0x5e,
+	0xff, 0xa8, 0x9c, 0x7c,
+	0x71, 0x6a, 0xee, 0x5e,
+	0x40, 0x51, 0x9c, 0x64,
+	0x00, 0x65, 0xc8, 0x5e,
 	0x00, 0x65, 0xde, 0x41,
-	0x00, 0xbb, 0x9e, 0x5c,
+	0x00, 0xbb, 0xa0, 0x5c,
 	0x00, 0x65, 0xde, 0x41,
-	0x00, 0x65, 0xc6, 0x5e,
+	0x00, 0x65, 0xc8, 0x5e,
 	0x01, 0x65, 0xa2, 0x30,
 	0x01, 0xf8, 0xc8, 0x30,
 	0x01, 0x4e, 0xc8, 0x30,
-	0x00, 0x6a, 0xca, 0xdd,
-	0x00, 0x51, 0xdc, 0x5d,
+	0x00, 0x6a, 0xcc, 0xdd,
+	0x00, 0x51, 0xde, 0x5d,
 	0x01, 0x4e, 0x9c, 0x18,
 	0x02, 0x6a, 0x22, 0x05,
-	0xc0, 0x3c, 0x6a, 0x6c,
+	0xc0, 0x3c, 0x6c, 0x6c,
 	0x04, 0xb8, 0x70, 0x01,
-	0x00, 0x65, 0xe8, 0x5e,
+	0x00, 0x65, 0xea, 0x5e,
 	0x20, 0xb8, 0xde, 0x69,
 	0x01, 0xbb, 0xa2, 0x30,
 	0x01, 0xba, 0x7c, 0x30,
-	0x00, 0xb9, 0xe2, 0x5c,
+	0x00, 0xb9, 0xe4, 0x5c,
 	0x00, 0x65, 0xde, 0x41,
 	0x01, 0x06, 0xd4, 0x30,
 	0x20, 0x3c, 0xcc, 0x79,
-	0x20, 0x3c, 0x70, 0x7c,
-	0x01, 0xa4, 0xcc, 0x7c,
+	0x20, 0x3c, 0x72, 0x7c,
+	0x01, 0xa4, 0xce, 0x7c,
 	0x01, 0xb4, 0x68, 0x01,
 	0x00, 0x65, 0xcc, 0x41,
-	0x00, 0x65, 0x70, 0x44,
+	0x00, 0x65, 0x72, 0x44,
 	0x04, 0x14, 0x58, 0x31,
 	0x01, 0x06, 0xd4, 0x30,
 	0x08, 0xa0, 0x60, 0x31,
 	0xac, 0x6a, 0xcc, 0x00,
-	0x14, 0x6a, 0x08, 0x5e,
+	0x14, 0x6a, 0x0a, 0x5e,
 	0x01, 0x06, 0xd4, 0x30,
-	0xa0, 0x6a, 0x00, 0x5e,
+	0xa0, 0x6a, 0x02, 0x5e,
 	0x00, 0x65, 0xcc, 0x41,
 	0xdf, 0x3c, 0x78, 0x08,
 	0x12, 0x01, 0x02, 0x00,
-	0x00, 0x65, 0x70, 0x44,
+	0x00, 0x65, 0x72, 0x44,
 	0x4c, 0x65, 0xcc, 0x28,
 	0x01, 0x3e, 0x20, 0x31,
 	0xd0, 0x66, 0xcc, 0x18,
@@ -642,102 +643,102 @@ static uint8_t seqprog[] = {
 	0xd0, 0x65, 0xca, 0x18,
 	0x01, 0x3e, 0x20, 0x31,
 	0x30, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xfa, 0x4c,
+	0x00, 0x65, 0xfc, 0x4c,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0x20, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0x02, 0x55,
+	0x00, 0x65, 0x04, 0x55,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0x20, 0x65, 0xca, 0x18,
 	0xe0, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0x0c, 0x4d,
+	0x00, 0x65, 0x0e, 0x4d,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xd0, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0x14, 0x55,
+	0x00, 0x65, 0x16, 0x55,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0x01, 0x6c, 0xa2, 0x30,
-	0xff, 0x51, 0x26, 0x75,
-	0x00, 0x51, 0xa2, 0x5d,
+	0xff, 0x51, 0x28, 0x75,
+	0x00, 0x51, 0xa4, 0x5d,
 	0x01, 0x51, 0x20, 0x31,
-	0x00, 0x65, 0x48, 0x45,
+	0x00, 0x65, 0x4a, 0x45,
 	0x01, 0xba, 0xc8, 0x30,
-	0x00, 0x3e, 0x48, 0x75,
-	0x00, 0x65, 0xc4, 0x5e,
+	0x00, 0x3e, 0x4a, 0x75,
+	0x00, 0x65, 0xc6, 0x5e,
 	0x80, 0x3c, 0x78, 0x00,
 	0x01, 0x06, 0xd4, 0x30,
-	0x00, 0x65, 0xec, 0x5d,
+	0x00, 0x65, 0xee, 0x5d,
 	0x01, 0x3c, 0x78, 0x00,
-	0xe0, 0x3f, 0x64, 0x65,
+	0xe0, 0x3f, 0x66, 0x65,
 	0x02, 0x3c, 0x78, 0x00,
-	0x20, 0x12, 0x64, 0x65,
-	0x51, 0x6a, 0x72, 0x5d,
-	0x00, 0x51, 0xa2, 0x5d,
-	0x51, 0x6a, 0x72, 0x5d,
+	0x20, 0x12, 0x66, 0x65,
+	0x51, 0x6a, 0x74, 0x5d,
+	0x00, 0x51, 0xa4, 0x5d,
+	0x51, 0x6a, 0x74, 0x5d,
 	0x01, 0x51, 0x20, 0x31,
 	0x04, 0x3c, 0x78, 0x00,
 	0x01, 0xb9, 0xc8, 0x30,
-	0x00, 0x3d, 0x62, 0x65,
+	0x00, 0x3d, 0x64, 0x65,
 	0x08, 0x3c, 0x78, 0x00,
 	0x01, 0xba, 0xc8, 0x30,
-	0x00, 0x3e, 0x62, 0x65,
+	0x00, 0x3e, 0x64, 0x65,
 	0x10, 0x3c, 0x78, 0x00,
-	0x04, 0xb8, 0x62, 0x7d,
+	0x04, 0xb8, 0x64, 0x7d,
 	0xfb, 0xb8, 0x70, 0x09,
-	0x20, 0xb8, 0x58, 0x6d,
+	0x20, 0xb8, 0x5a, 0x6d,
 	0x01, 0x90, 0xc8, 0x30,
 	0xff, 0x6a, 0xa2, 0x00,
-	0x00, 0x3d, 0xe2, 0x5c,
+	0x00, 0x3d, 0xe4, 0x5c,
 	0x01, 0x64, 0x20, 0x31,
 	0xff, 0x6a, 0x78, 0x08,
 	0x00, 0x65, 0xea, 0x58,
-	0x10, 0xb8, 0x70, 0x7c,
-	0xff, 0x6a, 0x68, 0x5d,
-	0x00, 0x65, 0x70, 0x44,
-	0x00, 0x65, 0xc4, 0x5e,
-	0x31, 0x6a, 0xec, 0x5e,
-	0x00, 0x65, 0x70, 0x44,
+	0x10, 0xb8, 0x72, 0x7c,
+	0xff, 0x6a, 0x6a, 0x5d,
+	0x00, 0x65, 0x72, 0x44,
+	0x00, 0x65, 0xc6, 0x5e,
+	0x31, 0x6a, 0xee, 0x5e,
+	0x00, 0x65, 0x72, 0x44,
 	0x10, 0x3f, 0x06, 0x00,
 	0x10, 0x6a, 0x06, 0x00,
 	0x01, 0x65, 0x74, 0x34,
-	0x81, 0x6a, 0xec, 0x5e,
-	0x00, 0x65, 0x74, 0x45,
+	0x81, 0x6a, 0xee, 0x5e,
+	0x00, 0x65, 0x76, 0x45,
 	0x01, 0x06, 0xd4, 0x30,
-	0x01, 0x0c, 0x74, 0x7d,
-	0x04, 0x0c, 0x6e, 0x6d,
+	0x01, 0x0c, 0x76, 0x7d,
+	0x04, 0x0c, 0x70, 0x6d,
 	0xe0, 0x03, 0x7e, 0x08,
 	0xe0, 0x3f, 0xcc, 0x61,
 	0x01, 0x65, 0xcc, 0x30,
 	0x01, 0x12, 0xda, 0x34,
 	0x01, 0x06, 0xd4, 0x34,
-	0x01, 0x03, 0x82, 0x6d,
+	0x01, 0x03, 0x84, 0x6d,
 	0x40, 0x03, 0xcc, 0x08,
 	0x01, 0x65, 0x06, 0x30,
 	0x40, 0x65, 0xc8, 0x08,
-	0x00, 0x66, 0x90, 0x75,
-	0x40, 0x65, 0x90, 0x7d,
-	0x00, 0x65, 0x90, 0x5d,
+	0x00, 0x66, 0x92, 0x75,
+	0x40, 0x65, 0x92, 0x7d,
+	0x00, 0x65, 0x92, 0x5d,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x0c,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x9a, 0x7d,
+	0x02, 0x0b, 0x9c, 0x7d,
 	0x01, 0x65, 0x0c, 0x30,
-	0x02, 0x0b, 0x9e, 0x7d,
+	0x02, 0x0b, 0xa0, 0x7d,
 	0xf7, 0x01, 0x02, 0x0c,
 	0x01, 0x65, 0xc8, 0x30,
-	0xff, 0x41, 0xc2, 0x75,
+	0xff, 0x41, 0xc4, 0x75,
 	0x01, 0x41, 0x20, 0x31,
 	0xff, 0x6a, 0xa4, 0x00,
-	0x00, 0x65, 0xb2, 0x45,
-	0xff, 0xbf, 0xc2, 0x75,
+	0x00, 0x65, 0xb4, 0x45,
+	0xff, 0xbf, 0xc4, 0x75,
 	0x01, 0x90, 0xa4, 0x30,
 	0x01, 0xbf, 0x20, 0x31,
-	0x00, 0xbb, 0xac, 0x65,
-	0xff, 0x52, 0xc0, 0x75,
+	0x00, 0xbb, 0xae, 0x65,
+	0xff, 0x52, 0xc2, 0x75,
 	0x01, 0xbf, 0xcc, 0x30,
 	0x01, 0x90, 0xca, 0x30,
 	0x01, 0x52, 0x20, 0x31,
@@ -745,28 +746,28 @@ static uint8_t seqprog[] = {
 	0x01, 0x65, 0x20, 0x35,
 	0x01, 0xbf, 0x82, 0x34,
 	0x01, 0x64, 0xa2, 0x30,
-	0x00, 0x6a, 0xd4, 0x5e,
+	0x00, 0x6a, 0xd6, 0x5e,
 	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x51, 0x26, 0x46,
+	0x00, 0x51, 0x28, 0x46,
 	0x01, 0x65, 0xa4, 0x30,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0x1a, 0x5e,
+	0x48, 0x6a, 0x1c, 0x5e,
 	0x01, 0x6a, 0xd0, 0x01,
 	0x01, 0x6a, 0xdc, 0x05,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0x1a, 0x5e,
-	0x01, 0x6a, 0xf4, 0x5d,
+	0x48, 0x6a, 0x1c, 0x5e,
+	0x01, 0x6a, 0xf6, 0x5d,
 	0x01, 0x6a, 0x26, 0x05,
 	0x01, 0x65, 0xd8, 0x31,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0xe0, 0x7d,
+	0x80, 0xee, 0xe2, 0x7d,
 	0xff, 0x6a, 0xdc, 0x0d,
 	0x01, 0x65, 0x32, 0x31,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0xbc, 0x46,
-	0x81, 0x6a, 0xec, 0x5e,
-	0x01, 0x0c, 0xec, 0x7d,
-	0x04, 0x0c, 0xea, 0x6d,
+	0x00, 0x65, 0xbe, 0x46,
+	0x81, 0x6a, 0xee, 0x5e,
+	0x01, 0x0c, 0xee, 0x7d,
+	0x04, 0x0c, 0xec, 0x6d,
 	0xe0, 0x03, 0x06, 0x08,
 	0xe0, 0x03, 0x7e, 0x0c,
 	0x01, 0x65, 0x18, 0x31,
@@ -785,7 +786,7 @@ static uint8_t seqprog[] = {
 	0x01, 0x6c, 0xda, 0x34,
 	0x3d, 0x64, 0xa4, 0x28,
 	0x55, 0x64, 0xc8, 0x28,
-	0x00, 0x65, 0x1a, 0x46,
+	0x00, 0x65, 0x1c, 0x46,
 	0x2e, 0x64, 0xa4, 0x28,
 	0x66, 0x64, 0xc8, 0x28,
 	0x00, 0x6c, 0xda, 0x18,
@@ -796,63 +797,63 @@ static uint8_t seqprog[] = {
 	0x00, 0x6c, 0xda, 0x24,
 	0x01, 0x65, 0xc8, 0x30,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x44, 0x6a, 0x16, 0x5e,
+	0x44, 0x6a, 0x18, 0x5e,
 	0x01, 0x90, 0xe2, 0x31,
-	0x04, 0x3b, 0x3a, 0x7e,
+	0x04, 0x3b, 0x3c, 0x7e,
 	0x30, 0x6a, 0xd0, 0x01,
 	0x20, 0x6a, 0xd0, 0x01,
 	0x1d, 0x6a, 0xdc, 0x01,
-	0xdc, 0xee, 0x36, 0x66,
-	0x00, 0x65, 0x52, 0x46,
+	0xdc, 0xee, 0x38, 0x66,
+	0x00, 0x65, 0x54, 0x46,
 	0x20, 0x6a, 0xd0, 0x01,
 	0x01, 0x6a, 0xdc, 0x01,
 	0x20, 0xa0, 0xd8, 0x31,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0x42, 0x7e,
+	0x80, 0xee, 0x44, 0x7e,
 	0x11, 0x6a, 0xdc, 0x01,
-	0x50, 0xee, 0x46, 0x66,
+	0x50, 0xee, 0x48, 0x66,
 	0x20, 0x6a, 0xd0, 0x01,
 	0x09, 0x6a, 0xdc, 0x01,
-	0x88, 0xee, 0x4c, 0x66,
+	0x88, 0xee, 0x4e, 0x66,
 	0x19, 0x6a, 0xdc, 0x01,
-	0xd8, 0xee, 0x50, 0x66,
+	0xd8, 0xee, 0x52, 0x66,
 	0xff, 0x6a, 0xdc, 0x09,
-	0x18, 0xee, 0x54, 0x6e,
+	0x18, 0xee, 0x56, 0x6e,
 	0xff, 0x6a, 0xd4, 0x0c,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x44, 0x6a, 0x16, 0x5e,
-	0x20, 0x6a, 0xf4, 0x5d,
+	0x44, 0x6a, 0x18, 0x5e,
+	0x20, 0x6a, 0xf6, 0x5d,
 	0x01, 0x3b, 0x26, 0x31,
-	0x04, 0x3b, 0x6e, 0x6e,
+	0x04, 0x3b, 0x70, 0x6e,
 	0xa0, 0x6a, 0xca, 0x00,
 	0x20, 0x65, 0xc8, 0x18,
-	0x00, 0x65, 0xac, 0x5e,
-	0x00, 0x65, 0x66, 0x66,
+	0x00, 0x65, 0xae, 0x5e,
+	0x00, 0x65, 0x68, 0x66,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0xbc, 0x46,
+	0x00, 0x65, 0xbe, 0x46,
 	0xa0, 0x6a, 0xcc, 0x00,
 	0xff, 0x6a, 0xc8, 0x08,
-	0x20, 0x94, 0x72, 0x6e,
-	0x10, 0x94, 0x74, 0x6e,
-	0x08, 0x94, 0x8e, 0x6e,
-	0x08, 0x94, 0x8e, 0x6e,
-	0x08, 0x94, 0x8e, 0x6e,
+	0x20, 0x94, 0x74, 0x6e,
+	0x10, 0x94, 0x76, 0x6e,
+	0x08, 0x94, 0x90, 0x6e,
+	0x08, 0x94, 0x90, 0x6e,
+	0x08, 0x94, 0x90, 0x6e,
 	0xff, 0x8c, 0xc8, 0x10,
 	0xc1, 0x64, 0xc8, 0x18,
 	0xf8, 0x64, 0xc8, 0x08,
 	0x01, 0x99, 0xda, 0x30,
-	0x00, 0x66, 0x82, 0x66,
-	0xc0, 0x66, 0xbe, 0x76,
+	0x00, 0x66, 0x84, 0x66,
+	0xc0, 0x66, 0xc0, 0x76,
 	0x60, 0x66, 0xc8, 0x18,
 	0x3d, 0x64, 0xc8, 0x28,
-	0x00, 0x65, 0x72, 0x46,
+	0x00, 0x65, 0x74, 0x46,
 	0xf7, 0x93, 0x26, 0x09,
-	0x08, 0x93, 0x90, 0x6e,
+	0x08, 0x93, 0x92, 0x6e,
 	0x00, 0x62, 0xc4, 0x18,
-	0x00, 0x65, 0xbc, 0x5e,
-	0x00, 0x65, 0x9c, 0x5e,
-	0x00, 0x65, 0x9c, 0x5e,
-	0x00, 0x65, 0x9c, 0x5e,
+	0x00, 0x65, 0xbe, 0x5e,
+	0x00, 0x65, 0x9e, 0x5e,
+	0x00, 0x65, 0x9e, 0x5e,
+	0x00, 0x65, 0x9e, 0x5e,
 	0x01, 0x99, 0xda, 0x30,
 	0x01, 0x99, 0xda, 0x30,
 	0x01, 0x99, 0xda, 0x30,
@@ -869,11 +870,11 @@ static uint8_t seqprog[] = {
 	0x01, 0x6c, 0x32, 0x31,
 	0x01, 0x6c, 0x32, 0x31,
 	0x01, 0x6c, 0x32, 0x35,
-	0x08, 0x94, 0xbc, 0x7e,
+	0x08, 0x94, 0xbe, 0x7e,
 	0xf7, 0x93, 0x26, 0x09,
-	0x08, 0x93, 0xc0, 0x6e,
+	0x08, 0x93, 0xc2, 0x6e,
 	0xff, 0x6a, 0xd4, 0x0c,
-	0x04, 0xb8, 0xe8, 0x6e,
+	0x04, 0xb8, 0xea, 0x6e,
 	0x01, 0x42, 0x7e, 0x31,
 	0xff, 0x6a, 0x76, 0x01,
 	0x01, 0x90, 0x84, 0x34,
@@ -881,14 +882,14 @@ static uint8_t seqprog[] = {
 	0x01, 0x85, 0x0a, 0x01,
 	0x7f, 0x65, 0x10, 0x09,
 	0xfe, 0x85, 0x0a, 0x0d,
-	0xff, 0x42, 0xe4, 0x66,
-	0xff, 0x41, 0xdc, 0x66,
-	0xd1, 0x6a, 0xec, 0x5e,
+	0xff, 0x42, 0xe6, 0x66,
+	0xff, 0x41, 0xde, 0x66,
+	0xd1, 0x6a, 0xee, 0x5e,
 	0xff, 0x6a, 0xca, 0x04,
 	0x01, 0x41, 0x20, 0x31,
 	0x01, 0xbf, 0x82, 0x30,
 	0x01, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0x26, 0x46,
+	0x00, 0xbb, 0x28, 0x46,
 	0x01, 0x42, 0x20, 0x31,
 	0x01, 0xbf, 0x84, 0x34,
 	0x01, 0x41, 0x7e, 0x31,
@@ -952,7 +953,7 @@ static ahc_patch_func_t ahc_patch17_func;
 static int
 ahc_patch17_func(struct ahc_softc *ahc)
 {
-	return ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0);
+	return ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0);
 }
 
 static ahc_patch_func_t ahc_patch16_func;
@@ -1153,152 +1154,152 @@ static struct patch {
 	{ ahc_patch0_func, 196, 1, 1 },
 	{ ahc_patch9_func, 212, 6, 2 },
 	{ ahc_patch0_func, 218, 6, 1 },
-	{ ahc_patch8_func, 226, 20, 2 },
+	{ ahc_patch8_func, 226, 21, 2 },
 	{ ahc_patch1_func, 241, 1, 1 },
-	{ ahc_patch1_func, 248, 1, 2 },
-	{ ahc_patch0_func, 249, 2, 2 },
-	{ ahc_patch11_func, 250, 1, 1 },
-	{ ahc_patch9_func, 258, 31, 3 },
-	{ ahc_patch1_func, 274, 14, 2 },
-	{ ahc_patch13_func, 279, 1, 1 },
-	{ ahc_patch14_func, 289, 14, 1 },
-	{ ahc_patch1_func, 305, 1, 2 },
-	{ ahc_patch0_func, 306, 1, 1 },
-	{ ahc_patch9_func, 309, 1, 1 },
-	{ ahc_patch13_func, 314, 1, 1 },
-	{ ahc_patch9_func, 315, 2, 2 },
-	{ ahc_patch0_func, 317, 4, 1 },
-	{ ahc_patch14_func, 321, 1, 1 },
-	{ ahc_patch15_func, 324, 2, 3 },
-	{ ahc_patch9_func, 324, 1, 2 },
-	{ ahc_patch0_func, 325, 1, 1 },
-	{ ahc_patch6_func, 330, 1, 2 },
-	{ ahc_patch0_func, 331, 1, 1 },
-	{ ahc_patch1_func, 335, 50, 11 },
-	{ ahc_patch6_func, 344, 2, 4 },
-	{ ahc_patch7_func, 344, 1, 1 },
-	{ ahc_patch8_func, 345, 1, 1 },
-	{ ahc_patch0_func, 346, 1, 1 },
-	{ ahc_patch16_func, 347, 1, 1 },
-	{ ahc_patch6_func, 366, 6, 3 },
-	{ ahc_patch16_func, 366, 5, 1 },
-	{ ahc_patch0_func, 372, 5, 1 },
-	{ ahc_patch13_func, 380, 5, 1 },
-	{ ahc_patch0_func, 385, 54, 17 },
-	{ ahc_patch14_func, 385, 1, 1 },
-	{ ahc_patch7_func, 387, 2, 2 },
-	{ ahc_patch17_func, 388, 1, 1 },
-	{ ahc_patch9_func, 391, 1, 1 },
-	{ ahc_patch18_func, 398, 1, 1 },
-	{ ahc_patch14_func, 403, 9, 3 },
-	{ ahc_patch9_func, 404, 3, 2 },
-	{ ahc_patch0_func, 407, 3, 1 },
-	{ ahc_patch9_func, 415, 6, 2 },
-	{ ahc_patch0_func, 421, 9, 2 },
-	{ ahc_patch13_func, 421, 1, 1 },
-	{ ahc_patch13_func, 430, 2, 1 },
-	{ ahc_patch14_func, 432, 1, 1 },
-	{ ahc_patch9_func, 434, 1, 2 },
-	{ ahc_patch0_func, 435, 1, 1 },
-	{ ahc_patch7_func, 438, 1, 1 },
+	{ ahc_patch1_func, 249, 1, 2 },
+	{ ahc_patch0_func, 250, 2, 2 },
+	{ ahc_patch11_func, 251, 1, 1 },
+	{ ahc_patch9_func, 259, 31, 3 },
+	{ ahc_patch1_func, 275, 14, 2 },
+	{ ahc_patch13_func, 280, 1, 1 },
+	{ ahc_patch14_func, 290, 14, 1 },
+	{ ahc_patch1_func, 306, 1, 2 },
+	{ ahc_patch0_func, 307, 1, 1 },
+	{ ahc_patch9_func, 310, 1, 1 },
+	{ ahc_patch13_func, 315, 1, 1 },
+	{ ahc_patch9_func, 316, 2, 2 },
+	{ ahc_patch0_func, 318, 4, 1 },
+	{ ahc_patch14_func, 322, 1, 1 },
+	{ ahc_patch15_func, 325, 2, 3 },
+	{ ahc_patch9_func, 325, 1, 2 },
+	{ ahc_patch0_func, 326, 1, 1 },
+	{ ahc_patch6_func, 331, 1, 2 },
+	{ ahc_patch0_func, 332, 1, 1 },
+	{ ahc_patch1_func, 336, 50, 11 },
+	{ ahc_patch6_func, 345, 2, 4 },
+	{ ahc_patch7_func, 345, 1, 1 },
+	{ ahc_patch8_func, 346, 1, 1 },
+	{ ahc_patch0_func, 347, 1, 1 },
+	{ ahc_patch16_func, 348, 1, 1 },
+	{ ahc_patch6_func, 367, 6, 3 },
+	{ ahc_patch16_func, 367, 5, 1 },
+	{ ahc_patch0_func, 373, 5, 1 },
+	{ ahc_patch13_func, 381, 5, 1 },
+	{ ahc_patch0_func, 386, 54, 17 },
+	{ ahc_patch14_func, 386, 1, 1 },
+	{ ahc_patch7_func, 388, 2, 2 },
+	{ ahc_patch17_func, 389, 1, 1 },
+	{ ahc_patch9_func, 392, 1, 1 },
+	{ ahc_patch18_func, 399, 1, 1 },
+	{ ahc_patch14_func, 404, 9, 3 },
+	{ ahc_patch9_func, 405, 3, 2 },
+	{ ahc_patch0_func, 408, 3, 1 },
+	{ ahc_patch9_func, 416, 6, 2 },
+	{ ahc_patch0_func, 422, 9, 2 },
+	{ ahc_patch13_func, 422, 1, 1 },
+	{ ahc_patch13_func, 431, 2, 1 },
+	{ ahc_patch14_func, 433, 1, 1 },
+	{ ahc_patch9_func, 435, 1, 2 },
+	{ ahc_patch0_func, 436, 1, 1 },
 	{ ahc_patch7_func, 439, 1, 1 },
-	{ ahc_patch8_func, 440, 3, 3 },
-	{ ahc_patch6_func, 441, 1, 2 },
-	{ ahc_patch0_func, 442, 1, 1 },
-	{ ahc_patch9_func, 443, 1, 1 },
-	{ ahc_patch15_func, 444, 1, 2 },
-	{ ahc_patch13_func, 444, 1, 1 },
-	{ ahc_patch14_func, 446, 9, 4 },
-	{ ahc_patch9_func, 446, 1, 1 },
-	{ ahc_patch9_func, 453, 2, 1 },
-	{ ahc_patch0_func, 455, 4, 3 },
-	{ ahc_patch9_func, 455, 1, 2 },
-	{ ahc_patch0_func, 456, 3, 1 },
-	{ ahc_patch1_func, 460, 2, 1 },
-	{ ahc_patch7_func, 462, 10, 2 },
-	{ ahc_patch0_func, 472, 1, 1 },
-	{ ahc_patch8_func, 473, 118, 22 },
-	{ ahc_patch1_func, 475, 3, 2 },
-	{ ahc_patch0_func, 478, 5, 3 },
-	{ ahc_patch9_func, 478, 2, 2 },
-	{ ahc_patch0_func, 480, 3, 1 },
-	{ ahc_patch1_func, 485, 2, 2 },
-	{ ahc_patch0_func, 487, 6, 3 },
-	{ ahc_patch9_func, 487, 2, 2 },
-	{ ahc_patch0_func, 489, 3, 1 },
-	{ ahc_patch1_func, 495, 2, 2 },
-	{ ahc_patch0_func, 497, 9, 7 },
-	{ ahc_patch9_func, 497, 5, 6 },
-	{ ahc_patch19_func, 497, 1, 2 },
-	{ ahc_patch0_func, 498, 1, 1 },
-	{ ahc_patch19_func, 500, 1, 2 },
-	{ ahc_patch0_func, 501, 1, 1 },
-	{ ahc_patch0_func, 502, 4, 1 },
-	{ ahc_patch6_func, 507, 3, 2 },
-	{ ahc_patch0_func, 510, 1, 1 },
-	{ ahc_patch6_func, 520, 1, 2 },
-	{ ahc_patch0_func, 521, 1, 1 },
-	{ ahc_patch20_func, 558, 7, 1 },
-	{ ahc_patch3_func, 593, 1, 2 },
-	{ ahc_patch0_func, 594, 1, 1 },
-	{ ahc_patch21_func, 597, 1, 1 },
-	{ ahc_patch8_func, 599, 106, 33 },
-	{ ahc_patch4_func, 601, 1, 1 },
-	{ ahc_patch1_func, 607, 2, 2 },
-	{ ahc_patch0_func, 609, 1, 1 },
-	{ ahc_patch1_func, 612, 1, 2 },
-	{ ahc_patch0_func, 613, 1, 1 },
-	{ ahc_patch9_func, 614, 3, 3 },
-	{ ahc_patch15_func, 615, 1, 1 },
-	{ ahc_patch0_func, 617, 4, 1 },
-	{ ahc_patch19_func, 626, 2, 2 },
-	{ ahc_patch0_func, 628, 1, 1 },
-	{ ahc_patch19_func, 632, 10, 3 },
-	{ ahc_patch5_func, 634, 8, 1 },
-	{ ahc_patch0_func, 642, 9, 2 },
-	{ ahc_patch5_func, 643, 8, 1 },
-	{ ahc_patch4_func, 653, 1, 2 },
-	{ ahc_patch0_func, 654, 1, 1 },
-	{ ahc_patch19_func, 655, 1, 2 },
-	{ ahc_patch0_func, 656, 3, 2 },
-	{ ahc_patch4_func, 658, 1, 1 },
-	{ ahc_patch5_func, 659, 1, 1 },
-	{ ahc_patch5_func, 662, 1, 1 },
-	{ ahc_patch5_func, 664, 1, 1 },
-	{ ahc_patch4_func, 666, 2, 2 },
-	{ ahc_patch0_func, 668, 2, 1 },
-	{ ahc_patch5_func, 670, 1, 1 },
-	{ ahc_patch5_func, 673, 1, 1 },
-	{ ahc_patch5_func, 676, 1, 1 },
-	{ ahc_patch19_func, 680, 1, 1 },
-	{ ahc_patch19_func, 683, 1, 1 },
-	{ ahc_patch4_func, 689, 1, 1 },
-	{ ahc_patch6_func, 692, 1, 2 },
-	{ ahc_patch0_func, 693, 1, 1 },
-	{ ahc_patch7_func, 705, 16, 1 },
-	{ ahc_patch4_func, 721, 20, 1 },
-	{ ahc_patch9_func, 742, 4, 2 },
-	{ ahc_patch0_func, 746, 4, 1 },
-	{ ahc_patch9_func, 750, 4, 2 },
-	{ ahc_patch0_func, 754, 3, 1 },
-	{ ahc_patch6_func, 760, 1, 1 },
-	{ ahc_patch22_func, 762, 14, 1 },
-	{ ahc_patch7_func, 776, 3, 1 },
-	{ ahc_patch9_func, 788, 24, 8 },
-	{ ahc_patch19_func, 792, 1, 2 },
-	{ ahc_patch0_func, 793, 1, 1 },
-	{ ahc_patch15_func, 798, 4, 2 },
-	{ ahc_patch0_func, 802, 7, 3 },
-	{ ahc_patch23_func, 802, 5, 2 },
-	{ ahc_patch0_func, 807, 2, 1 },
-	{ ahc_patch0_func, 812, 42, 3 },
-	{ ahc_patch18_func, 824, 18, 2 },
-	{ ahc_patch0_func, 842, 1, 1 },
-	{ ahc_patch4_func, 866, 1, 1 },
-	{ ahc_patch4_func, 867, 3, 2 },
-	{ ahc_patch0_func, 870, 1, 1 },
-	{ ahc_patch13_func, 871, 3, 1 },
-	{ ahc_patch4_func, 874, 12, 1 }
+	{ ahc_patch7_func, 440, 1, 1 },
+	{ ahc_patch8_func, 441, 3, 3 },
+	{ ahc_patch6_func, 442, 1, 2 },
+	{ ahc_patch0_func, 443, 1, 1 },
+	{ ahc_patch9_func, 444, 1, 1 },
+	{ ahc_patch15_func, 445, 1, 2 },
+	{ ahc_patch13_func, 445, 1, 1 },
+	{ ahc_patch14_func, 447, 9, 4 },
+	{ ahc_patch9_func, 447, 1, 1 },
+	{ ahc_patch9_func, 454, 2, 1 },
+	{ ahc_patch0_func, 456, 4, 3 },
+	{ ahc_patch9_func, 456, 1, 2 },
+	{ ahc_patch0_func, 457, 3, 1 },
+	{ ahc_patch1_func, 461, 2, 1 },
+	{ ahc_patch7_func, 463, 10, 2 },
+	{ ahc_patch0_func, 473, 1, 1 },
+	{ ahc_patch8_func, 474, 118, 22 },
+	{ ahc_patch1_func, 476, 3, 2 },
+	{ ahc_patch0_func, 479, 5, 3 },
+	{ ahc_patch9_func, 479, 2, 2 },
+	{ ahc_patch0_func, 481, 3, 1 },
+	{ ahc_patch1_func, 486, 2, 2 },
+	{ ahc_patch0_func, 488, 6, 3 },
+	{ ahc_patch9_func, 488, 2, 2 },
+	{ ahc_patch0_func, 490, 3, 1 },
+	{ ahc_patch1_func, 496, 2, 2 },
+	{ ahc_patch0_func, 498, 9, 7 },
+	{ ahc_patch9_func, 498, 5, 6 },
+	{ ahc_patch19_func, 498, 1, 2 },
+	{ ahc_patch0_func, 499, 1, 1 },
+	{ ahc_patch19_func, 501, 1, 2 },
+	{ ahc_patch0_func, 502, 1, 1 },
+	{ ahc_patch0_func, 503, 4, 1 },
+	{ ahc_patch6_func, 508, 3, 2 },
+	{ ahc_patch0_func, 511, 1, 1 },
+	{ ahc_patch6_func, 521, 1, 2 },
+	{ ahc_patch0_func, 522, 1, 1 },
+	{ ahc_patch20_func, 559, 7, 1 },
+	{ ahc_patch3_func, 594, 1, 2 },
+	{ ahc_patch0_func, 595, 1, 1 },
+	{ ahc_patch21_func, 598, 1, 1 },
+	{ ahc_patch8_func, 600, 106, 33 },
+	{ ahc_patch4_func, 602, 1, 1 },
+	{ ahc_patch1_func, 608, 2, 2 },
+	{ ahc_patch0_func, 610, 1, 1 },
+	{ ahc_patch1_func, 613, 1, 2 },
+	{ ahc_patch0_func, 614, 1, 1 },
+	{ ahc_patch9_func, 615, 3, 3 },
+	{ ahc_patch15_func, 616, 1, 1 },
+	{ ahc_patch0_func, 618, 4, 1 },
+	{ ahc_patch19_func, 627, 2, 2 },
+	{ ahc_patch0_func, 629, 1, 1 },
+	{ ahc_patch19_func, 633, 10, 3 },
+	{ ahc_patch5_func, 635, 8, 1 },
+	{ ahc_patch0_func, 643, 9, 2 },
+	{ ahc_patch5_func, 644, 8, 1 },
+	{ ahc_patch4_func, 654, 1, 2 },
+	{ ahc_patch0_func, 655, 1, 1 },
+	{ ahc_patch19_func, 656, 1, 2 },
+	{ ahc_patch0_func, 657, 3, 2 },
+	{ ahc_patch4_func, 659, 1, 1 },
+	{ ahc_patch5_func, 660, 1, 1 },
+	{ ahc_patch5_func, 663, 1, 1 },
+	{ ahc_patch5_func, 665, 1, 1 },
+	{ ahc_patch4_func, 667, 2, 2 },
+	{ ahc_patch0_func, 669, 2, 1 },
+	{ ahc_patch5_func, 671, 1, 1 },
+	{ ahc_patch5_func, 674, 1, 1 },
+	{ ahc_patch5_func, 677, 1, 1 },
+	{ ahc_patch19_func, 681, 1, 1 },
+	{ ahc_patch19_func, 684, 1, 1 },
+	{ ahc_patch4_func, 690, 1, 1 },
+	{ ahc_patch6_func, 693, 1, 2 },
+	{ ahc_patch0_func, 694, 1, 1 },
+	{ ahc_patch7_func, 706, 16, 1 },
+	{ ahc_patch4_func, 722, 20, 1 },
+	{ ahc_patch9_func, 743, 4, 2 },
+	{ ahc_patch0_func, 747, 4, 1 },
+	{ ahc_patch9_func, 751, 4, 2 },
+	{ ahc_patch0_func, 755, 3, 1 },
+	{ ahc_patch6_func, 761, 1, 1 },
+	{ ahc_patch22_func, 763, 14, 1 },
+	{ ahc_patch7_func, 777, 3, 1 },
+	{ ahc_patch9_func, 789, 24, 8 },
+	{ ahc_patch19_func, 793, 1, 2 },
+	{ ahc_patch0_func, 794, 1, 1 },
+	{ ahc_patch15_func, 799, 4, 2 },
+	{ ahc_patch0_func, 803, 7, 3 },
+	{ ahc_patch23_func, 803, 5, 2 },
+	{ ahc_patch0_func, 808, 2, 1 },
+	{ ahc_patch0_func, 813, 42, 3 },
+	{ ahc_patch18_func, 825, 18, 2 },
+	{ ahc_patch0_func, 843, 1, 1 },
+	{ ahc_patch4_func, 867, 1, 1 },
+	{ ahc_patch4_func, 868, 3, 2 },
+	{ ahc_patch0_func, 871, 1, 1 },
+	{ ahc_patch13_func, 872, 3, 1 },
+	{ ahc_patch4_func, 875, 12, 1 }
 };
 
 static struct cs {
@@ -1307,11 +1308,11 @@ static struct cs {
 } critical_sections[] = {
 	{ 11, 18 },
 	{ 21, 30 },
-	{ 721, 737 },
-	{ 867, 870 },
-	{ 874, 880 },
-	{ 882, 884 },
-	{ 884, 886 }
+	{ 722, 738 },
+	{ 868, 871 },
+	{ 875, 881 },
+	{ 883, 885 },
+	{ 885, 887 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)