Aic79xx Driver Update

 o Change handling of the Rev. A packetized lun output bug
   to be more efficient by having the sequencer copy the
   single byte of valid lun data into the long lun field.

drivers/scsi/aic7xxx/aic79xx.seq

@@ -40,7 +40,7 @@
  * $FreeBSD$
  */
 
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#92 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#93 $"
 PATCH_ARG_LIST = "struct ahd_softc *ahd"
 PREFIX = "ahd_"
 
@@ -261,6 +261,15 @@ fetch_new_scb_done:
 	clr	A;
 	add	CMDS_PENDING, 1;
 	adc	CMDS_PENDING[1], A;
+	if ((ahd->bugs & AHD_PKT_LUN_BUG) != 0) {
+		/*
+		 * "Short Luns" are not placed into outgoing LQ
+		 * packets in the correct byte order.  Use a full
+		 * sized lun field instead and fill it with the
+		 * one byte of lun information we support.
+		 */
+		mov	SCB_PKT_LUN[6], SCB_LUN;
+	}
 	/*
 	 * The FIFO use count field is shared with the
 	 * tag set by the host so that our SCB dma engine

drivers/scsi/aic7xxx/aic79xx_core.c

@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#191 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#192 $
  *
  * $FreeBSD$
  */
@@ -5722,6 +5722,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
 		next_scb->sg_list = segs;
 		next_scb->sense_data = sense_data;
 		next_scb->sense_busaddr = sense_busaddr;
+		memset(hscb, 0, sizeof(*hscb));
 		next_scb->hscb = hscb;
 		hscb->hscb_busaddr = ahd_htole32(hscb_busaddr);
 
@@ -8279,8 +8280,6 @@ ahd_loadseq(struct ahd_softc *ahd)
 	download_consts[PKT_OVERRUN_BUFOFFSET] =
 		(ahd->overrun_buf - (uint8_t *)ahd->qoutfifo) / 256;
 	download_consts[SCB_TRANSFER_SIZE] = SCB_TRANSFER_SIZE_1BYTE_LUN;
-	if ((ahd->bugs & AHD_PKT_LUN_BUG) != 0)
-		download_consts[SCB_TRANSFER_SIZE] = SCB_TRANSFER_SIZE_FULL_LUN;
 	cur_patch = patches;
 	downloaded = 0;
 	skip_addr = 0;

drivers/scsi/aic7xxx/aic79xx_inline.h

@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#48 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#49 $
  *
  * $FreeBSD$
  */
@@ -272,10 +272,6 @@ ahd_setup_scb_common(struct ahd_softc *ahd, struct scb *scb)
 	if ((scb->flags & SCB_PACKETIZED) != 0) {
 		/* XXX what about ACA??  It is type 4, but TAG_TYPE == 0x3. */
 		scb->hscb->task_attribute= scb->hscb->control & SCB_TAG_TYPE;
-		/*
-		 * For Rev A short lun workaround.
-		 */
-		scb->hscb->pkt_long_lun[6] = scb->hscb->lun;
 	}
 
 	if (scb->hscb->cdb_len <= MAX_CDB_LEN_WITH_SENSE_ADDR

drivers/scsi/aic7xxx/aic79xx_reg.h_shipped

@@ -2,7 +2,7 @@
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#92 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#93 $
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#68 $
  */
 typedef int (ahd_reg_print_t)(u_int, u_int *, u_int);
@@ -3768,5 +3768,5 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 
 
 /* Exported Labels */
-#define	LABEL_seq_isr 	0x270
-#define	LABEL_timer_isr	0x26c
+#define	LABEL_seq_isr 	0x271
+#define	LABEL_timer_isr	0x26d

drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped

@@ -2,7 +2,7 @@
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#92 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#93 $
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#68 $
  */
 

drivers/scsi/aic7xxx/aic79xx_seq.h_shipped

@@ -2,30 +2,30 @@
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#92 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#93 $
  * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#68 $
  */
 static uint8_t seqprog[] = {
 	0xff, 0x02, 0x06, 0x78,
-	0x00, 0xea, 0x4e, 0x59,
+	0x00, 0xea, 0x50, 0x59,
 	0x01, 0xea, 0x04, 0x30,
 	0xff, 0x04, 0x0c, 0x78,
-	0x19, 0xea, 0x4e, 0x59,
+	0x19, 0xea, 0x50, 0x59,
 	0x19, 0xea, 0x04, 0x00,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x60, 0x3a, 0x1a, 0x68,
 	0x04, 0x47, 0x1b, 0x68,
 	0xff, 0x21, 0x1b, 0x70,
-	0x40, 0x4b, 0x90, 0x69,
-	0x00, 0xe2, 0x52, 0x59,
-	0x40, 0x4b, 0x90, 0x69,
-	0x20, 0x4b, 0x80, 0x69,
+	0x40, 0x4b, 0x92, 0x69,
+	0x00, 0xe2, 0x54, 0x59,
+	0x40, 0x4b, 0x92, 0x69,
+	0x20, 0x4b, 0x82, 0x69,
 	0xfc, 0x42, 0x24, 0x78,
 	0x10, 0x40, 0x24, 0x78,
-	0x00, 0xe2, 0xd2, 0x5d,
+	0x00, 0xe2, 0xd4, 0x5d,
 	0x20, 0x4d, 0x28, 0x78,
-	0x00, 0xe2, 0xd2, 0x5d,
+	0x00, 0xe2, 0xd4, 0x5d,
 	0x30, 0x3f, 0xc0, 0x09,
 	0x30, 0xe0, 0x30, 0x60,
 	0x7f, 0x4a, 0x94, 0x08,
@@ -35,7 +35,7 @@ static uint8_t seqprog[] = {
 	0x00, 0xe2, 0x56, 0x58,
 	0x00, 0xe2, 0x66, 0x58,
 	0x00, 0xe2, 0x06, 0x40,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x01, 0x52, 0x64, 0x78,
 	0x02, 0x58, 0x50, 0x31,
@@ -43,26 +43,26 @@ static uint8_t seqprog[] = {
 	0xff, 0xad, 0x4f, 0x78,
 	0x50, 0x4b, 0x4a, 0x68,
 	0xbf, 0x3a, 0x74, 0x08,
-	0x14, 0xea, 0x4e, 0x59,
+	0x14, 0xea, 0x50, 0x59,
 	0x14, 0xea, 0x04, 0x00,
 	0x08, 0xa8, 0x51, 0x03,
 	0xff, 0xae, 0x3f, 0x68,
-	0x00, 0xe2, 0x50, 0x5b,
+	0x00, 0xe2, 0x52, 0x5b,
 	0x00, 0xe2, 0x3e, 0x40,
-	0x00, 0xea, 0x42, 0x59,
+	0x00, 0xea, 0x44, 0x59,
 	0x01, 0xea, 0x00, 0x30,
 	0x80, 0xf9, 0x5e, 0x68,
-	0x00, 0xe2, 0x40, 0x59,
-	0x11, 0xea, 0x42, 0x59,
+	0x00, 0xe2, 0x42, 0x59,
+	0x11, 0xea, 0x44, 0x59,
 	0x11, 0xea, 0x00, 0x00,
-	0x80, 0xf9, 0x40, 0x79,
+	0x80, 0xf9, 0x42, 0x79,
 	0xff, 0xea, 0xd4, 0x0d,
-	0x22, 0xea, 0x42, 0x59,
+	0x22, 0xea, 0x44, 0x59,
 	0x22, 0xea, 0x00, 0x00,
 	0x10, 0x16, 0x70, 0x78,
 	0x01, 0x0b, 0xa2, 0x32,
 	0x10, 0x16, 0x2c, 0x00,
-	0x18, 0xad, 0xfe, 0x78,
+	0x18, 0xad, 0x00, 0x79,
 	0x04, 0xad, 0xca, 0x68,
 	0x80, 0xad, 0x64, 0x78,
 	0x10, 0xad, 0x98, 0x78,
@@ -71,15 +71,15 @@ static uint8_t seqprog[] = {
 	0x02, 0x8c, 0x59, 0x32,
 	0x02, 0x28, 0x19, 0x33,
 	0x02, 0xa8, 0x50, 0x36,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x40, 0x3a, 0x64, 0x68,
 	0x50, 0x4b, 0x64, 0x68,
-	0x22, 0xea, 0x42, 0x59,
+	0x22, 0xea, 0x44, 0x59,
 	0x22, 0xea, 0x00, 0x00,
 	0xe7, 0xad, 0x5a, 0x09,
 	0x02, 0x8c, 0x59, 0x32,
-	0x1a, 0xea, 0x4e, 0x59,
+	0x1a, 0xea, 0x50, 0x59,
 	0x1a, 0xea, 0x04, 0x00,
 	0xff, 0xea, 0xd4, 0x0d,
 	0xe7, 0xad, 0x5a, 0x09,
@@ -113,29 +113,30 @@ static uint8_t seqprog[] = {
 	0xff, 0xea, 0xc0, 0x09,
 	0x01, 0x4e, 0x9d, 0x1a,
 	0x00, 0x4f, 0x9f, 0x22,
+	0x01, 0xaa, 0x6d, 0x33,
 	0x01, 0xea, 0x5c, 0x33,
 	0x04, 0xa4, 0x49, 0x32,
 	0xff, 0xea, 0x4a, 0x03,
 	0xff, 0xea, 0x4e, 0x03,
 	0x01, 0x10, 0xd4, 0x31,
-	0x10, 0xa8, 0xf3, 0x68,
+	0x10, 0xa8, 0xf5, 0x68,
 	0x3d, 0xa9, 0xc5, 0x29,
 	0xfe, 0xe2, 0xc4, 0x09,
 	0x01, 0xea, 0xc6, 0x01,
 	0x02, 0xe2, 0xc8, 0x31,
 	0x02, 0xec, 0x50, 0x31,
 	0x02, 0xa0, 0xda, 0x31,
-	0xff, 0xa9, 0xf2, 0x70,
+	0xff, 0xa9, 0xf4, 0x70,
 	0x02, 0xa0, 0x48, 0x37,
-	0xff, 0x21, 0xfb, 0x70,
+	0xff, 0x21, 0xfd, 0x70,
 	0x02, 0x22, 0x51, 0x31,
 	0x02, 0xa0, 0x4c, 0x33,
 	0x02, 0xa0, 0x44, 0x36,
 	0x02, 0xa0, 0x40, 0x32,
 	0x02, 0xa0, 0x44, 0x36,
-	0x04, 0x47, 0x03, 0x69,
-	0x40, 0x16, 0x2e, 0x69,
-	0xff, 0x2d, 0x33, 0x61,
+	0x04, 0x47, 0x05, 0x69,
+	0x40, 0x16, 0x30, 0x69,
+	0xff, 0x2d, 0x35, 0x61,
 	0xff, 0x29, 0x65, 0x70,
 	0x01, 0x37, 0xc1, 0x31,
 	0x02, 0x28, 0x55, 0x32,
@@ -148,20 +149,20 @@ static uint8_t seqprog[] = {
 	0x01, 0x50, 0xa1, 0x1a,
 	0xff, 0x4e, 0x9d, 0x1a,
 	0xff, 0x4f, 0x9f, 0x22,
-	0xff, 0x8d, 0x27, 0x71,
-	0x80, 0xac, 0x26, 0x71,
-	0x20, 0x16, 0x26, 0x69,
+	0xff, 0x8d, 0x29, 0x71,
+	0x80, 0xac, 0x28, 0x71,
+	0x20, 0x16, 0x28, 0x69,
 	0x02, 0x8c, 0x51, 0x31,
-	0x00, 0xe2, 0x10, 0x41,
+	0x00, 0xe2, 0x12, 0x41,
 	0x01, 0xac, 0x08, 0x31,
 	0x09, 0xea, 0x5a, 0x01,
 	0x02, 0x8c, 0x51, 0x32,
 	0xff, 0xea, 0x1a, 0x07,
 	0x04, 0x24, 0xf9, 0x30,
-	0x1d, 0xea, 0x38, 0x41,
+	0x1d, 0xea, 0x3a, 0x41,
 	0x02, 0x2c, 0x51, 0x31,
 	0x04, 0xa0, 0xf9, 0x30,
-	0x19, 0xea, 0x38, 0x41,
+	0x19, 0xea, 0x3a, 0x41,
 	0x06, 0xea, 0x08, 0x81,
 	0x01, 0xe2, 0x5a, 0x35,
 	0x02, 0xf2, 0xf0, 0x35,
@@ -179,23 +180,23 @@ static uint8_t seqprog[] = {
 	0x02, 0x20, 0xb9, 0x30,
 	0x02, 0x20, 0x51, 0x31,
 	0x4c, 0xa9, 0xd7, 0x28,
-	0x10, 0xa8, 0x61, 0x79,
+	0x10, 0xa8, 0x63, 0x79,
 	0x01, 0x6b, 0xc0, 0x30,
 	0x02, 0x64, 0xc8, 0x00,
 	0x40, 0x3a, 0x74, 0x04,
 	0x00, 0xe2, 0x56, 0x58,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x30, 0x3f, 0xc0, 0x09,
-	0x30, 0xe0, 0x62, 0x61,
-	0x20, 0x3f, 0x78, 0x69,
-	0x10, 0x3f, 0x62, 0x79,
+	0x30, 0xe0, 0x64, 0x61,
+	0x20, 0x3f, 0x7a, 0x69,
+	0x10, 0x3f, 0x64, 0x79,
 	0x02, 0xea, 0x7e, 0x00,
-	0x00, 0xea, 0x42, 0x59,
+	0x00, 0xea, 0x44, 0x59,
 	0x01, 0xea, 0x00, 0x30,
 	0x02, 0x48, 0x51, 0x35,
 	0x01, 0xea, 0x7e, 0x00,
-	0x11, 0xea, 0x42, 0x59,
+	0x11, 0xea, 0x44, 0x59,
 	0x11, 0xea, 0x00, 0x00,
 	0x02, 0x48, 0x51, 0x35,
 	0x08, 0xea, 0x98, 0x00,
@@ -205,11 +206,11 @@ static uint8_t seqprog[] = {
 	0x0f, 0x67, 0xc0, 0x09,
 	0x00, 0x34, 0x69, 0x02,
 	0x20, 0xea, 0x96, 0x00,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x40, 0x3a, 0xac, 0x69,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x40, 0x3a, 0xae, 0x69,
 	0x02, 0x55, 0x06, 0x68,
-	0x02, 0x56, 0xac, 0x69,
-	0xff, 0x5b, 0xac, 0x61,
+	0x02, 0x56, 0xae, 0x69,
+	0xff, 0x5b, 0xae, 0x61,
 	0x02, 0x20, 0x51, 0x31,
 	0x80, 0xea, 0xb2, 0x01,
 	0x44, 0xea, 0x00, 0x00,
@@ -217,36 +218,36 @@ static uint8_t seqprog[] = {
 	0x33, 0xea, 0x00, 0x00,
 	0xff, 0xea, 0xb2, 0x09,
 	0xff, 0xe0, 0xc0, 0x19,
-	0xff, 0xe0, 0xae, 0x79,
+	0xff, 0xe0, 0xb0, 0x79,
 	0x02, 0xa4, 0x51, 0x31,
-	0x00, 0xe2, 0xa4, 0x41,
+	0x00, 0xe2, 0xa6, 0x41,
 	0x02, 0x5e, 0x50, 0x31,
 	0x02, 0xa8, 0xb8, 0x30,
 	0x02, 0x5c, 0x50, 0x31,
-	0xff, 0xa5, 0xbf, 0x71,
+	0xff, 0xa5, 0xc1, 0x71,
 	0x02, 0xa4, 0x41, 0x31,
 	0x02, 0x22, 0x51, 0x31,
 	0x02, 0xa0, 0x4c, 0x33,
 	0x02, 0xa0, 0x44, 0x32,
-	0x00, 0xe2, 0xc8, 0x41,
-	0x10, 0xa8, 0xc9, 0x69,
+	0x00, 0xe2, 0xca, 0x41,
+	0x10, 0xa8, 0xcb, 0x69,
 	0x3d, 0xa9, 0xc9, 0x29,
 	0x01, 0xe4, 0xc8, 0x01,
 	0x01, 0xea, 0xca, 0x01,
 	0xff, 0xea, 0xda, 0x01,
 	0x02, 0x20, 0x51, 0x31,
 	0x02, 0xa6, 0x41, 0x32,
-	0xff, 0x21, 0xd1, 0x61,
+	0xff, 0x21, 0xd3, 0x61,
 	0xff, 0xea, 0x46, 0x02,
 	0x02, 0x5c, 0x50, 0x31,
 	0x40, 0xea, 0x96, 0x00,
-	0x02, 0x56, 0xda, 0x6d,
-	0x01, 0x55, 0xda, 0x6d,
-	0x10, 0xa8, 0xdd, 0x79,
-	0x10, 0x40, 0xe6, 0x69,
-	0x01, 0x56, 0xe6, 0x79,
+	0x02, 0x56, 0xdc, 0x6d,
+	0x01, 0x55, 0xdc, 0x6d,
+	0x10, 0xa8, 0xdf, 0x79,
+	0x10, 0x40, 0xe8, 0x69,
+	0x01, 0x56, 0xe8, 0x79,
 	0xff, 0xad, 0x07, 0x78,
-	0x13, 0xea, 0x4e, 0x59,
+	0x13, 0xea, 0x50, 0x59,
 	0x13, 0xea, 0x04, 0x00,
 	0x00, 0xe2, 0x06, 0x40,
 	0xbf, 0x3a, 0x74, 0x08,
@@ -257,104 +258,104 @@ static uint8_t seqprog[] = {
 	0x40, 0xea, 0x66, 0x02,
 	0x08, 0x3c, 0x78, 0x00,
 	0x80, 0xea, 0x62, 0x02,
-	0x00, 0xe2, 0xb2, 0x5b,
+	0x00, 0xe2, 0xb4, 0x5b,
 	0x01, 0x36, 0xc1, 0x31,
-	0x9f, 0xe0, 0x54, 0x7c,
-	0x80, 0xe0, 0x0a, 0x72,
-	0xa0, 0xe0, 0x42, 0x72,
-	0xc0, 0xe0, 0x38, 0x72,
-	0xe0, 0xe0, 0x72, 0x72,
-	0x01, 0xea, 0x4e, 0x59,
+	0x9f, 0xe0, 0x56, 0x7c,
+	0x80, 0xe0, 0x0c, 0x72,
+	0xa0, 0xe0, 0x44, 0x72,
+	0xc0, 0xe0, 0x3a, 0x72,
+	0xe0, 0xe0, 0x74, 0x72,
+	0x01, 0xea, 0x50, 0x59,
 	0x01, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x80, 0x33, 0x11, 0x7a,
-	0x03, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x80, 0x33, 0x13, 0x7a,
+	0x03, 0xea, 0x50, 0x59,
 	0x03, 0xea, 0x04, 0x00,
-	0xee, 0x00, 0x18, 0x6a,
+	0xee, 0x00, 0x1a, 0x6a,
 	0x05, 0xea, 0xb4, 0x00,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x02, 0xa8, 0x90, 0x32,
-	0x00, 0xe2, 0x68, 0x59,
+	0x00, 0xe2, 0x6a, 0x59,
 	0xef, 0xac, 0xd5, 0x19,
-	0x00, 0xe2, 0x28, 0x52,
+	0x00, 0xe2, 0x2a, 0x52,
 	0x09, 0x80, 0xe1, 0x30,
 	0x02, 0xea, 0x36, 0x00,
 	0xa8, 0xea, 0x32, 0x00,
-	0x00, 0xe2, 0x2e, 0x42,
+	0x00, 0xe2, 0x30, 0x42,
 	0x01, 0xac, 0xd1, 0x30,
 	0x10, 0x80, 0x89, 0x31,
 	0x20, 0xea, 0x32, 0x00,
 	0xbf, 0x33, 0x67, 0x0a,
-	0x20, 0x19, 0x30, 0x6a,
-	0x02, 0x4d, 0xf6, 0x69,
+	0x20, 0x19, 0x32, 0x6a,
+	0x02, 0x4d, 0xf8, 0x69,
 	0x40, 0x33, 0x67, 0x02,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x80, 0x33, 0xaf, 0x6a,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x80, 0x33, 0xb1, 0x6a,
 	0x01, 0x44, 0x10, 0x33,
 	0x08, 0xa8, 0x51, 0x03,
-	0x00, 0xe2, 0xf6, 0x41,
+	0x00, 0xe2, 0xf8, 0x41,
 	0x10, 0xea, 0x80, 0x00,
 	0x01, 0x31, 0xc5, 0x31,
-	0x80, 0xe2, 0x5e, 0x62,
-	0x10, 0xa8, 0x83, 0x6a,
+	0x80, 0xe2, 0x60, 0x62,
+	0x10, 0xa8, 0x85, 0x6a,
 	0xc0, 0xaa, 0xc5, 0x01,
-	0x40, 0xa8, 0x4f, 0x6a,
+	0x40, 0xa8, 0x51, 0x6a,
 	0xbf, 0xe2, 0xc4, 0x09,
-	0x20, 0xa8, 0x63, 0x7a,
+	0x20, 0xa8, 0x65, 0x7a,
 	0x01, 0xe2, 0x88, 0x30,
-	0x00, 0xe2, 0xb2, 0x5b,
-	0xa0, 0x36, 0x6b, 0x62,
+	0x00, 0xe2, 0xb4, 0x5b,
+	0xa0, 0x36, 0x6d, 0x62,
 	0x23, 0xa8, 0x89, 0x08,
-	0x00, 0xe2, 0xb2, 0x5b,
-	0xa0, 0x36, 0x6b, 0x62,
-	0x00, 0xa8, 0x62, 0x42,
-	0xff, 0xe2, 0x62, 0x62,
-	0x00, 0xe2, 0x82, 0x42,
+	0x00, 0xe2, 0xb4, 0x5b,
+	0xa0, 0x36, 0x6d, 0x62,
+	0x00, 0xa8, 0x64, 0x42,
+	0xff, 0xe2, 0x64, 0x62,
+	0x00, 0xe2, 0x84, 0x42,
 	0x40, 0xea, 0x98, 0x00,
 	0x01, 0xe2, 0x88, 0x30,
-	0x00, 0xe2, 0xb2, 0x5b,
-	0xa0, 0x36, 0x41, 0x72,
+	0x00, 0xe2, 0xb4, 0x5b,
+	0xa0, 0x36, 0x43, 0x72,
 	0x40, 0xea, 0x98, 0x00,
 	0x01, 0x31, 0x89, 0x32,
 	0x08, 0xea, 0x62, 0x02,
-	0x00, 0xe2, 0xf6, 0x41,
-	0xe0, 0xea, 0xce, 0x5b,
-	0x80, 0xe0, 0xba, 0x6a,
-	0x04, 0xe0, 0x60, 0x73,
-	0x02, 0xe0, 0x90, 0x73,
-	0x00, 0xea, 0x18, 0x73,
-	0x03, 0xe0, 0xa0, 0x73,
-	0x23, 0xe0, 0x94, 0x72,
-	0x08, 0xe0, 0xb6, 0x72,
-	0x00, 0xe2, 0xb2, 0x5b,
-	0x07, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0xf8, 0x41,
+	0xe0, 0xea, 0xd0, 0x5b,
+	0x80, 0xe0, 0xbc, 0x6a,
+	0x04, 0xe0, 0x62, 0x73,
+	0x02, 0xe0, 0x92, 0x73,
+	0x00, 0xea, 0x1a, 0x73,
+	0x03, 0xe0, 0xa2, 0x73,
+	0x23, 0xe0, 0x96, 0x72,
+	0x08, 0xe0, 0xb8, 0x72,
+	0x00, 0xe2, 0xb4, 0x5b,
+	0x07, 0xea, 0x50, 0x59,
 	0x07, 0xea, 0x04, 0x00,
-	0x08, 0x42, 0xf7, 0x71,
-	0x04, 0x42, 0x91, 0x62,
+	0x08, 0x42, 0xf9, 0x71,
+	0x04, 0x42, 0x93, 0x62,
 	0x01, 0x43, 0x89, 0x30,
-	0x00, 0xe2, 0x82, 0x42,
+	0x00, 0xe2, 0x84, 0x42,
 	0x01, 0x44, 0xd4, 0x31,
-	0x00, 0xe2, 0x82, 0x42,
+	0x00, 0xe2, 0x84, 0x42,
 	0x01, 0x00, 0x60, 0x32,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x4c, 0x34, 0xc1, 0x28,
 	0x01, 0x64, 0xc0, 0x31,
-	0x00, 0x30, 0x43, 0x59,
+	0x00, 0x30, 0x45, 0x59,
 	0x01, 0x30, 0x01, 0x30,
-	0x01, 0xe0, 0xb4, 0x7a,
-	0xa0, 0xea, 0xc4, 0x5b,
-	0x01, 0xa0, 0xb4, 0x62,
-	0x01, 0x84, 0xad, 0x7a,
-	0x01, 0xa7, 0xb6, 0x7a,
-	0x00, 0xe2, 0xb6, 0x42,
-	0x03, 0xea, 0x4e, 0x59,
+	0x01, 0xe0, 0xb6, 0x7a,
+	0xa0, 0xea, 0xc6, 0x5b,
+	0x01, 0xa0, 0xb6, 0x62,
+	0x01, 0x84, 0xaf, 0x7a,
+	0x01, 0xa7, 0xb8, 0x7a,
+	0x00, 0xe2, 0xb8, 0x42,
+	0x03, 0xea, 0x50, 0x59,
 	0x03, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xb6, 0x42,
-	0x07, 0xea, 0xd6, 0x5b,
+	0x00, 0xe2, 0xb8, 0x42,
+	0x07, 0xea, 0xd8, 0x5b,
 	0x01, 0x44, 0xd4, 0x31,
-	0x00, 0xe2, 0xf6, 0x41,
+	0x00, 0xe2, 0xf8, 0x41,
 	0x3f, 0xe0, 0x6a, 0x0a,
 	0xc0, 0x34, 0xc1, 0x09,
 	0x00, 0x35, 0x51, 0x01,
@@ -365,54 +366,54 @@ static uint8_t seqprog[] = {
 	0x01, 0xea, 0xc6, 0x01,
 	0x02, 0xe2, 0xc8, 0x31,
 	0x02, 0xec, 0x40, 0x31,
-	0xff, 0xa1, 0xd6, 0x72,
+	0xff, 0xa1, 0xd8, 0x72,
 	0x02, 0xe8, 0xda, 0x31,
 	0x02, 0xa0, 0x50, 0x31,
-	0x00, 0xe2, 0xf8, 0x42,
+	0x00, 0xe2, 0xfa, 0x42,
 	0x80, 0x33, 0x67, 0x02,
 	0x01, 0x44, 0xd4, 0x31,
-	0x00, 0xe2, 0xb2, 0x5b,
+	0x00, 0xe2, 0xb4, 0x5b,
 	0x01, 0x33, 0x67, 0x02,
-	0xe0, 0x36, 0x13, 0x63,
+	0xe0, 0x36, 0x15, 0x63,
 	0x02, 0x33, 0x67, 0x02,
-	0x20, 0x46, 0x0c, 0x63,
+	0x20, 0x46, 0x0e, 0x63,
 	0xff, 0xea, 0x52, 0x09,
-	0xa8, 0xea, 0xc4, 0x5b,
-	0x04, 0xa8, 0xf3, 0x7a,
+	0xa8, 0xea, 0xc6, 0x5b,
+	0x04, 0xa8, 0xf5, 0x7a,
 	0x01, 0x34, 0xc1, 0x31,
-	0x00, 0xa9, 0xf3, 0x62,
+	0x00, 0xa9, 0xf5, 0x62,
 	0x01, 0x35, 0xc1, 0x31,
-	0x00, 0xaa, 0xfd, 0x72,
+	0x00, 0xaa, 0xff, 0x72,
 	0x01, 0xa9, 0x52, 0x11,
-	0xff, 0xa9, 0xe8, 0x6a,
-	0x00, 0xe2, 0x0c, 0x43,
+	0xff, 0xa9, 0xea, 0x6a,
+	0x00, 0xe2, 0x0e, 0x43,
 	0x10, 0x33, 0x67, 0x02,
-	0x04, 0xa8, 0x0d, 0x7b,
+	0x04, 0xa8, 0x0f, 0x7b,
 	0xfb, 0xa8, 0x51, 0x0b,
 	0xff, 0xea, 0x66, 0x0a,
-	0x01, 0x9c, 0x07, 0x6b,
+	0x01, 0x9c, 0x09, 0x6b,
 	0x02, 0xa8, 0x90, 0x32,
-	0x00, 0xe2, 0x68, 0x59,
-	0x10, 0xa8, 0xb7, 0x7a,
-	0xff, 0xea, 0xd6, 0x5b,
-	0x00, 0xe2, 0xb6, 0x42,
-	0x04, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0x6a, 0x59,
+	0x10, 0xa8, 0xb9, 0x7a,
+	0xff, 0xea, 0xd8, 0x5b,
+	0x00, 0xe2, 0xb8, 0x42,
+	0x04, 0xea, 0x50, 0x59,
 	0x04, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xb6, 0x42,
-	0x04, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0xb8, 0x42,
+	0x04, 0xea, 0x50, 0x59,
 	0x04, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x08, 0xa8, 0xaf, 0x7a,
-	0xc0, 0x33, 0x23, 0x7b,
-	0x80, 0x33, 0xaf, 0x6a,
-	0xff, 0x88, 0x23, 0x6b,
-	0x40, 0x33, 0xaf, 0x6a,
-	0x10, 0xa8, 0x29, 0x7b,
-	0x0a, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x08, 0xa8, 0xb1, 0x7a,
+	0xc0, 0x33, 0x25, 0x7b,
+	0x80, 0x33, 0xb1, 0x6a,
+	0xff, 0x88, 0x25, 0x6b,
+	0x40, 0x33, 0xb1, 0x6a,
+	0x10, 0xa8, 0x2b, 0x7b,
+	0x0a, 0xea, 0x50, 0x59,
 	0x0a, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x48, 0x5b,
-	0x00, 0xe2, 0x7c, 0x43,
-	0x50, 0x4b, 0x30, 0x6b,
+	0x00, 0xe2, 0x4a, 0x5b,
+	0x00, 0xe2, 0x7e, 0x43,
+	0x50, 0x4b, 0x32, 0x6b,
 	0xbf, 0x3a, 0x74, 0x08,
 	0x01, 0xe0, 0xf4, 0x31,
 	0xff, 0xea, 0xc0, 0x09,
@@ -422,25 +423,25 @@ static uint8_t seqprog[] = {
 	0x01, 0xfa, 0xc0, 0x35,
 	0x02, 0xa8, 0x84, 0x32,
 	0x02, 0xea, 0xb4, 0x00,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x02, 0x42, 0x51, 0x31,
 	0xff, 0xae, 0x65, 0x68,
-	0xff, 0x88, 0x55, 0x6b,
-	0x01, 0x9c, 0x51, 0x6b,
-	0x02, 0x9c, 0x59, 0x6b,
-	0x01, 0x84, 0x59, 0x7b,
+	0xff, 0x88, 0x57, 0x6b,
+	0x01, 0x9c, 0x53, 0x6b,
+	0x02, 0x9c, 0x5b, 0x6b,
+	0x01, 0x84, 0x5b, 0x7b,
 	0x02, 0x28, 0x19, 0x33,
 	0x02, 0xa8, 0x50, 0x36,
-	0xff, 0x88, 0x59, 0x73,
-	0x00, 0xe2, 0x2c, 0x5b,
+	0xff, 0x88, 0x5b, 0x73,
+	0x00, 0xe2, 0x2e, 0x5b,
 	0x02, 0xa8, 0x5c, 0x33,
 	0x02, 0x2c, 0x19, 0x33,
 	0x02, 0xa8, 0x58, 0x32,
 	0x04, 0x9c, 0x39, 0x07,
-	0xc0, 0x33, 0xaf, 0x6a,
+	0xc0, 0x33, 0xb1, 0x6a,
 	0x04, 0xa8, 0x51, 0x03,
-	0x20, 0xa8, 0x7d, 0x6b,
+	0x20, 0xa8, 0x7f, 0x6b,
 	0x02, 0xa8, 0x40, 0x31,
 	0xc0, 0x34, 0xc1, 0x09,
 	0x00, 0x35, 0x51, 0x01,
@@ -455,56 +456,56 @@ static uint8_t seqprog[] = {
 	0xf7, 0x57, 0xae, 0x08,
 	0x08, 0xea, 0x98, 0x00,
 	0x01, 0x44, 0xd4, 0x31,
-	0xee, 0x00, 0x86, 0x6b,
+	0xee, 0x00, 0x88, 0x6b,
 	0x02, 0xea, 0xb4, 0x00,
-	0x00, 0xe2, 0xae, 0x5b,
-	0x09, 0x4c, 0x88, 0x7b,
+	0x00, 0xe2, 0xb0, 0x5b,
+	0x09, 0x4c, 0x8a, 0x7b,
 	0x08, 0x4c, 0x06, 0x68,
-	0x0b, 0xea, 0x4e, 0x59,
+	0x0b, 0xea, 0x50, 0x59,
 	0x0b, 0xea, 0x04, 0x00,
 	0x01, 0x44, 0xd4, 0x31,
-	0x20, 0x33, 0xf7, 0x79,
-	0x00, 0xe2, 0x98, 0x5b,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x01, 0x84, 0x9d, 0x7b,
+	0x20, 0x33, 0xf9, 0x79,
+	0x00, 0xe2, 0x9a, 0x5b,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x01, 0x84, 0x9f, 0x7b,
 	0x01, 0x9c, 0x39, 0x07,
 	0x08, 0x60, 0x20, 0x33,
 	0x08, 0x80, 0x31, 0x37,
 	0xdf, 0x33, 0x67, 0x0a,
-	0xee, 0x00, 0xaa, 0x6b,
+	0xee, 0x00, 0xac, 0x6b,
 	0x05, 0xea, 0xb4, 0x00,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
-	0x00, 0xe2, 0x68, 0x59,
-	0x00, 0xe2, 0xb6, 0x42,
+	0x00, 0xe2, 0x6a, 0x59,
+	0x00, 0xe2, 0xb8, 0x42,
 	0x01, 0xea, 0x6c, 0x02,
 	0xc0, 0xea, 0x66, 0x06,
-	0xff, 0x42, 0xbe, 0x6b,
-	0x01, 0x41, 0xb2, 0x6b,
-	0x02, 0x41, 0xb2, 0x7b,
-	0xff, 0x42, 0xbe, 0x6b,
-	0x01, 0x41, 0xb2, 0x6b,
-	0x02, 0x41, 0xb2, 0x7b,
-	0xff, 0x42, 0xbe, 0x7b,
-	0x04, 0x4c, 0xb2, 0x6b,
+	0xff, 0x42, 0xc0, 0x6b,
+	0x01, 0x41, 0xb4, 0x6b,
+	0x02, 0x41, 0xb4, 0x7b,
+	0xff, 0x42, 0xc0, 0x6b,
+	0x01, 0x41, 0xb4, 0x6b,
+	0x02, 0x41, 0xb4, 0x7b,
+	0xff, 0x42, 0xc0, 0x7b,
+	0x04, 0x4c, 0xb4, 0x6b,
 	0xe0, 0x41, 0x6c, 0x0e,
 	0x01, 0x44, 0xd4, 0x31,
-	0xff, 0x42, 0xc6, 0x7b,
-	0x04, 0x4c, 0xc6, 0x6b,
+	0xff, 0x42, 0xc8, 0x7b,
+	0x04, 0x4c, 0xc8, 0x6b,
 	0xe0, 0x41, 0x6c, 0x0a,
-	0xe0, 0x36, 0xf7, 0x61,
+	0xe0, 0x36, 0xf9, 0x61,
 	0xff, 0xea, 0xca, 0x09,
 	0x01, 0xe2, 0xc8, 0x31,
 	0x01, 0x46, 0xda, 0x35,
 	0x01, 0x44, 0xd4, 0x35,
 	0x10, 0xea, 0x80, 0x00,
 	0x01, 0xe2, 0x62, 0x36,
-	0x04, 0xa6, 0xde, 0x7b,
+	0x04, 0xa6, 0xe0, 0x7b,
 	0xff, 0xea, 0x5a, 0x09,
 	0xff, 0xea, 0x4c, 0x0d,
-	0x01, 0xa6, 0xfc, 0x6b,
+	0x01, 0xa6, 0xfe, 0x6b,
 	0x10, 0xad, 0x64, 0x78,
-	0x80, 0xad, 0xf4, 0x6b,
+	0x80, 0xad, 0xf6, 0x6b,
 	0x08, 0xad, 0x64, 0x68,
 	0x04, 0x84, 0xf9, 0x30,
 	0x00, 0xea, 0x08, 0x81,
@@ -521,7 +522,7 @@ static uint8_t seqprog[] = {
 	0x08, 0xb0, 0xe0, 0x30,
 	0x04, 0xb0, 0xe0, 0x30,
 	0x03, 0xb0, 0xf0, 0x30,
-	0x01, 0x78, 0x0a, 0x7c,
+	0x01, 0x78, 0x0c, 0x7c,
 	0x01, 0xa7, 0x4e, 0x11,
 	0x01, 0xb0, 0x06, 0x33,
 	0x7f, 0x83, 0xe9, 0x08,
@@ -532,9 +533,9 @@ static uint8_t seqprog[] = {
 	0x00, 0x86, 0x0d, 0x23,
 	0x00, 0x87, 0x0f, 0x23,
 	0x01, 0x84, 0xc5, 0x31,
-	0x01, 0xa7, 0x20, 0x7c,
+	0x01, 0xa7, 0x22, 0x7c,
 	0x04, 0xe2, 0xc4, 0x01,
-	0x80, 0x83, 0x27, 0x7c,
+	0x80, 0x83, 0x29, 0x7c,
 	0x02, 0xe2, 0xc4, 0x01,
 	0xff, 0xea, 0x4c, 0x09,
 	0x01, 0xe2, 0x36, 0x30,
@@ -546,83 +547,83 @@ static uint8_t seqprog[] = {
 	0x0b, 0x90, 0xe1, 0x30,
 	0x01, 0x98, 0x4f, 0x09,
 	0xfd, 0x9c, 0x49, 0x09,
-	0x80, 0x9b, 0x3d, 0x7c,
+	0x80, 0x9b, 0x3f, 0x7c,
 	0x02, 0xa4, 0x48, 0x01,
-	0x01, 0xa7, 0x40, 0x7c,
+	0x01, 0xa7, 0x42, 0x7c,
 	0x04, 0xa4, 0x48, 0x01,
 	0x01, 0xa4, 0x36, 0x30,
 	0xa8, 0xea, 0x32, 0x00,
 	0xfd, 0x9c, 0x39, 0x0b,
 	0x05, 0x9b, 0x07, 0x33,
-	0x80, 0x83, 0x4d, 0x6c,
+	0x80, 0x83, 0x4f, 0x6c,
 	0x02, 0xea, 0x4c, 0x05,
 	0xff, 0xea, 0x4c, 0x0d,
-	0x00, 0xe2, 0x3c, 0x59,
-	0x02, 0xa6, 0xe0, 0x6b,
+	0x00, 0xe2, 0x3e, 0x59,
+	0x02, 0xa6, 0xe2, 0x6b,
 	0x80, 0xf9, 0xf2, 0x05,
-	0xc0, 0x33, 0x5b, 0x7c,
-	0x03, 0xea, 0x4e, 0x59,
+	0xc0, 0x33, 0x5d, 0x7c,
+	0x03, 0xea, 0x50, 0x59,
 	0x03, 0xea, 0x04, 0x00,
-	0x20, 0x33, 0x7f, 0x7c,
-	0x01, 0x84, 0x65, 0x6c,
-	0x06, 0xea, 0x4e, 0x59,
+	0x20, 0x33, 0x81, 0x7c,
+	0x01, 0x84, 0x67, 0x6c,
+	0x06, 0xea, 0x50, 0x59,
 	0x06, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x82, 0x44,
+	0x00, 0xe2, 0x84, 0x44,
 	0x01, 0x00, 0x60, 0x32,
-	0xee, 0x00, 0x6e, 0x6c,
+	0xee, 0x00, 0x70, 0x6c,
 	0x05, 0xea, 0xb4, 0x00,
-	0x33, 0xea, 0x42, 0x59,
+	0x33, 0xea, 0x44, 0x59,
 	0x33, 0xea, 0x00, 0x00,
 	0x80, 0x3d, 0x7a, 0x00,
-	0xfc, 0x42, 0x70, 0x7c,
+	0xfc, 0x42, 0x72, 0x7c,
 	0x7f, 0x3d, 0x7a, 0x08,
-	0x00, 0x30, 0x43, 0x59,
+	0x00, 0x30, 0x45, 0x59,
 	0x01, 0x30, 0x01, 0x30,
-	0x09, 0xea, 0x4e, 0x59,
+	0x09, 0xea, 0x50, 0x59,
 	0x09, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x01, 0x9c, 0x65, 0x6c,
-	0x00, 0xe2, 0x32, 0x5c,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x01, 0x9c, 0x67, 0x6c,
+	0x00, 0xe2, 0x34, 0x5c,
 	0x20, 0x33, 0x67, 0x02,
 	0x01, 0x00, 0x60, 0x32,
-	0x02, 0xa6, 0x8a, 0x7c,
-	0x00, 0xe2, 0x4e, 0x5c,
+	0x02, 0xa6, 0x8c, 0x7c,
+	0x00, 0xe2, 0x50, 0x5c,
 	0x00, 0xe2, 0x56, 0x58,
 	0x00, 0xe2, 0x66, 0x58,
 	0x00, 0xe2, 0x3a, 0x58,
-	0x00, 0x30, 0x43, 0x59,
+	0x00, 0x30, 0x45, 0x59,
 	0x01, 0x30, 0x01, 0x30,
-	0x20, 0x19, 0x8a, 0x6c,
-	0x00, 0xe2, 0xba, 0x5c,
-	0x04, 0x19, 0xa4, 0x6c,
+	0x20, 0x19, 0x8c, 0x6c,
+	0x00, 0xe2, 0xbc, 0x5c,
+	0x04, 0x19, 0xa6, 0x6c,
 	0x02, 0x19, 0x32, 0x00,
-	0x01, 0x84, 0xa5, 0x7c,
-	0x01, 0x1b, 0x9e, 0x7c,
-	0x01, 0x1a, 0xa4, 0x6c,
-	0x00, 0xe2, 0x54, 0x44,
-	0x80, 0x4b, 0xaa, 0x6c,
-	0x01, 0x4c, 0xa6, 0x7c,
-	0x03, 0x42, 0x54, 0x6c,
-	0x00, 0xe2, 0xda, 0x5b,
+	0x01, 0x84, 0xa7, 0x7c,
+	0x01, 0x1b, 0xa0, 0x7c,
+	0x01, 0x1a, 0xa6, 0x6c,
+	0x00, 0xe2, 0x56, 0x44,
+	0x80, 0x4b, 0xac, 0x6c,
+	0x01, 0x4c, 0xa8, 0x7c,
+	0x03, 0x42, 0x56, 0x6c,
+	0x00, 0xe2, 0xdc, 0x5b,
 	0x80, 0xf9, 0xf2, 0x01,
-	0x04, 0x33, 0xf7, 0x79,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x08, 0x5d, 0xc2, 0x6c,
+	0x04, 0x33, 0xf9, 0x79,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x08, 0x5d, 0xc4, 0x6c,
 	0x00, 0xe2, 0x56, 0x58,
-	0x00, 0x30, 0x43, 0x59,
+	0x00, 0x30, 0x45, 0x59,
 	0x01, 0x30, 0x01, 0x30,
-	0x02, 0x1b, 0xb2, 0x7c,
-	0x08, 0x5d, 0xc0, 0x7c,
+	0x02, 0x1b, 0xb4, 0x7c,
+	0x08, 0x5d, 0xc2, 0x7c,
 	0x03, 0x68, 0x00, 0x37,
 	0x01, 0x84, 0x09, 0x07,
-	0x80, 0x1b, 0xcc, 0x7c,
-	0x80, 0x84, 0xcd, 0x6c,
+	0x80, 0x1b, 0xce, 0x7c,
+	0x80, 0x84, 0xcf, 0x6c,
 	0xff, 0x85, 0x0b, 0x1b,
 	0xff, 0x86, 0x0d, 0x23,
 	0xff, 0x87, 0x0f, 0x23,
 	0xf8, 0x1b, 0x08, 0x0b,
 	0xff, 0xea, 0x4e, 0x09,
-	0x04, 0x1b, 0xd4, 0x7c,
+	0x04, 0x1b, 0xd6, 0x7c,
 	0x01, 0xa7, 0x4e, 0x01,
 	0xff, 0xea, 0x06, 0x0b,
 	0x03, 0x68, 0x00, 0x37,
@@ -631,161 +632,161 @@ static uint8_t seqprog[] = {
 	0xf9, 0xd9, 0xb2, 0x0d,
 	0x01, 0xd9, 0xb2, 0x05,
 	0x01, 0x52, 0x48, 0x31,
-	0x20, 0xa4, 0xfc, 0x7c,
-	0x20, 0x5b, 0xfc, 0x7c,
-	0x80, 0xf9, 0x0a, 0x7d,
+	0x20, 0xa4, 0xfe, 0x7c,
+	0x20, 0x5b, 0xfe, 0x7c,
+	0x80, 0xf9, 0x0c, 0x7d,
 	0x02, 0xea, 0xb4, 0x00,
 	0x11, 0x00, 0x00, 0x10,
-	0x04, 0x19, 0x16, 0x7d,
+	0x04, 0x19, 0x18, 0x7d,
 	0xdf, 0x19, 0x32, 0x08,
-	0x60, 0x5b, 0xf4, 0x6c,
-	0x01, 0x4c, 0xf0, 0x7c,
+	0x60, 0x5b, 0xf6, 0x6c,
+	0x01, 0x4c, 0xf2, 0x7c,
 	0x20, 0x19, 0x32, 0x00,
 	0x01, 0xd9, 0xb2, 0x05,
 	0x02, 0xea, 0xb4, 0x00,
 	0x01, 0xd9, 0xb2, 0x05,
-	0x10, 0x5b, 0x0e, 0x6d,
-	0x08, 0x5b, 0x18, 0x6d,
-	0x20, 0x5b, 0x08, 0x6d,
-	0x02, 0x5b, 0x38, 0x6d,
-	0x0e, 0xea, 0x4e, 0x59,
+	0x10, 0x5b, 0x10, 0x6d,
+	0x08, 0x5b, 0x1a, 0x6d,
+	0x20, 0x5b, 0x0a, 0x6d,
+	0x02, 0x5b, 0x3a, 0x6d,
+	0x0e, 0xea, 0x50, 0x59,
 	0x0e, 0xea, 0x04, 0x00,
-	0x80, 0xf9, 0xf8, 0x6c,
+	0x80, 0xf9, 0xfa, 0x6c,
 	0xdf, 0x5c, 0xb8, 0x08,
 	0x01, 0xd9, 0xb2, 0x05,
-	0x01, 0x9c, 0xf3, 0x6d,
-	0x00, 0xe2, 0x32, 0x5c,
-	0x00, 0xe2, 0x42, 0x5d,
+	0x01, 0x9c, 0xf5, 0x6d,
+	0x00, 0xe2, 0x34, 0x5c,
+	0x00, 0xe2, 0x44, 0x5d,
 	0x01, 0xae, 0x5d, 0x1b,
 	0x01, 0xd9, 0xb2, 0x05,
-	0x00, 0xe2, 0x2c, 0x5b,
+	0x00, 0xe2, 0x2e, 0x5b,
 	0xf3, 0xac, 0xd5, 0x19,
-	0x00, 0xe2, 0x26, 0x55,
-	0x80, 0xac, 0x27, 0x6d,
-	0x0f, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0x28, 0x55,
+	0x80, 0xac, 0x29, 0x6d,
+	0x0f, 0xea, 0x50, 0x59,
 	0x0f, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x2e, 0x45,
+	0x00, 0xe2, 0x30, 0x45,
 	0x04, 0x8c, 0xe1, 0x30,
 	0x01, 0xea, 0xf2, 0x00,
 	0x02, 0xea, 0x36, 0x00,
 	0xa8, 0xea, 0x32, 0x00,
-	0xff, 0xad, 0x35, 0x7d,
-	0x14, 0xea, 0x4e, 0x59,
+	0xff, 0xad, 0x37, 0x7d,
+	0x14, 0xea, 0x50, 0x59,
 	0x14, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xa4, 0x5d,
+	0x00, 0xe2, 0xa6, 0x5d,
 	0x01, 0xd9, 0xb2, 0x05,
 	0x09, 0x80, 0xe1, 0x30,
 	0x02, 0xea, 0x36, 0x00,
 	0xa8, 0xea, 0x32, 0x00,
-	0x00, 0xe2, 0x9c, 0x5d,
+	0x00, 0xe2, 0x9e, 0x5d,
 	0x01, 0xd9, 0xb2, 0x05,
-	0x02, 0xa6, 0x52, 0x7d,
-	0x00, 0xe2, 0x3c, 0x59,
-	0x20, 0x5b, 0x60, 0x6d,
-	0xfc, 0x42, 0x4c, 0x7d,
-	0x10, 0x40, 0x4e, 0x6d,
-	0x20, 0x4d, 0x50, 0x7d,
-	0x08, 0x5d, 0x60, 0x6d,
-	0x02, 0xa6, 0xe0, 0x6b,
-	0x00, 0xe2, 0x3c, 0x59,
-	0x20, 0x5b, 0x60, 0x6d,
-	0x01, 0x1b, 0x80, 0x6d,
-	0xfc, 0x42, 0x5c, 0x7d,
-	0x10, 0x40, 0x5e, 0x6d,
+	0x02, 0xa6, 0x54, 0x7d,
+	0x00, 0xe2, 0x3e, 0x59,
+	0x20, 0x5b, 0x62, 0x6d,
+	0xfc, 0x42, 0x4e, 0x7d,
+	0x10, 0x40, 0x50, 0x6d,
+	0x20, 0x4d, 0x52, 0x7d,
+	0x08, 0x5d, 0x62, 0x6d,
+	0x02, 0xa6, 0xe2, 0x6b,
+	0x00, 0xe2, 0x3e, 0x59,
+	0x20, 0x5b, 0x62, 0x6d,
+	0x01, 0x1b, 0x82, 0x6d,
+	0xfc, 0x42, 0x5e, 0x7d,
+	0x10, 0x40, 0x60, 0x6d,
 	0x20, 0x4d, 0x64, 0x78,
 	0x08, 0x5d, 0x64, 0x78,
 	0x02, 0x19, 0x32, 0x00,
 	0x01, 0x5b, 0x40, 0x31,
-	0x00, 0xe2, 0xba, 0x5c,
-	0x00, 0xe2, 0x98, 0x5b,
+	0x00, 0xe2, 0xbc, 0x5c,
+	0x00, 0xe2, 0x9a, 0x5b,
 	0x20, 0xea, 0xb6, 0x00,
-	0x00, 0xe2, 0xda, 0x5b,
+	0x00, 0xe2, 0xdc, 0x5b,
 	0x20, 0x5c, 0xb8, 0x00,
-	0x04, 0x19, 0x76, 0x6d,
-	0x01, 0x1a, 0x76, 0x6d,
-	0x00, 0xe2, 0x3c, 0x59,
+	0x04, 0x19, 0x78, 0x6d,
+	0x01, 0x1a, 0x78, 0x6d,
+	0x00, 0xe2, 0x3e, 0x59,
 	0x01, 0x1a, 0x64, 0x78,
 	0x80, 0xf9, 0xf2, 0x01,
-	0x20, 0xa0, 0xda, 0x7d,
+	0x20, 0xa0, 0xdc, 0x7d,
 	0xff, 0xae, 0x5d, 0x1b,
-	0x08, 0xa8, 0x3d, 0x6b,
+	0x08, 0xa8, 0x3f, 0x6b,
 	0x02, 0xea, 0xb4, 0x04,
 	0x01, 0x9c, 0x39, 0x03,
-	0x40, 0x5b, 0x90, 0x6d,
-	0x00, 0xe2, 0x3c, 0x59,
-	0x40, 0x5b, 0x90, 0x6d,
-	0x04, 0x5d, 0xf4, 0x7d,
-	0x01, 0x1a, 0xf4, 0x7d,
+	0x40, 0x5b, 0x92, 0x6d,
+	0x00, 0xe2, 0x3e, 0x59,
+	0x40, 0x5b, 0x92, 0x6d,
+	0x04, 0x5d, 0xf6, 0x7d,
+	0x01, 0x1a, 0xf6, 0x7d,
 	0x20, 0x4d, 0x64, 0x78,
-	0x40, 0x5b, 0xda, 0x7d,
-	0x04, 0x5d, 0xf4, 0x7d,
-	0x01, 0x1a, 0xf4, 0x7d,
+	0x40, 0x5b, 0xdc, 0x7d,
+	0x04, 0x5d, 0xf6, 0x7d,
+	0x01, 0x1a, 0xf6, 0x7d,
 	0x80, 0xf9, 0xf2, 0x01,
 	0xff, 0xae, 0x5d, 0x1b,
-	0x08, 0xa8, 0x3d, 0x6b,
+	0x08, 0xa8, 0x3f, 0x6b,
 	0x02, 0xea, 0xb4, 0x04,
-	0x00, 0xe2, 0x3c, 0x59,
+	0x00, 0xe2, 0x3e, 0x59,
 	0x01, 0x1b, 0x64, 0x78,
 	0x80, 0xf9, 0xf2, 0x01,
 	0x02, 0xea, 0xb4, 0x04,
-	0x00, 0xe2, 0x3c, 0x59,
-	0x01, 0x1b, 0xb8, 0x6d,
-	0x40, 0x5b, 0xc6, 0x7d,
-	0x01, 0x1b, 0xb8, 0x6d,
+	0x00, 0xe2, 0x3e, 0x59,
+	0x01, 0x1b, 0xba, 0x6d,
+	0x40, 0x5b, 0xc8, 0x7d,
+	0x01, 0x1b, 0xba, 0x6d,
 	0x02, 0x19, 0x32, 0x00,
 	0x01, 0x1a, 0x64, 0x78,
 	0x80, 0xf9, 0xf2, 0x01,
 	0xff, 0xea, 0x10, 0x03,
 	0x08, 0xa8, 0x51, 0x03,
-	0x00, 0xe2, 0x3c, 0x43,
-	0x01, 0x1a, 0xc2, 0x7d,
-	0x40, 0x5b, 0xbe, 0x7d,
-	0x01, 0x1a, 0xac, 0x6d,
+	0x00, 0xe2, 0x3e, 0x43,
+	0x01, 0x1a, 0xc4, 0x7d,
+	0x40, 0x5b, 0xc0, 0x7d,
+	0x01, 0x1a, 0xae, 0x6d,
 	0xfc, 0x42, 0x64, 0x78,
-	0x01, 0x1a, 0xc6, 0x6d,
-	0x10, 0xea, 0x4e, 0x59,
+	0x01, 0x1a, 0xc8, 0x6d,
+	0x10, 0xea, 0x50, 0x59,
 	0x10, 0xea, 0x04, 0x00,
 	0xfc, 0x42, 0x64, 0x78,
-	0x10, 0x40, 0xcc, 0x6d,
+	0x10, 0x40, 0xce, 0x6d,
 	0x20, 0x4d, 0x64, 0x78,
-	0x40, 0x5b, 0xac, 0x6d,
+	0x40, 0x5b, 0xae, 0x6d,
 	0x01, 0x1a, 0x64, 0x78,
 	0x01, 0xae, 0x5d, 0x1b,
 	0x30, 0x3f, 0xc0, 0x09,
 	0x30, 0xe0, 0x64, 0x60,
 	0x40, 0x4b, 0x64, 0x68,
 	0xff, 0xea, 0x52, 0x01,
-	0xee, 0x00, 0xe0, 0x6d,
+	0xee, 0x00, 0xe2, 0x6d,
 	0x80, 0xf9, 0xf2, 0x01,
 	0xff, 0xae, 0x5d, 0x1b,
 	0x02, 0xea, 0xb4, 0x00,
 	0x20, 0xea, 0x9a, 0x00,
-	0xf3, 0x42, 0xec, 0x6d,
-	0x12, 0xea, 0x4e, 0x59,
+	0xf3, 0x42, 0xee, 0x6d,
+	0x12, 0xea, 0x50, 0x59,
 	0x12, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf6, 0x41,
-	0x0d, 0xea, 0x4e, 0x59,
+	0x00, 0xe2, 0xf8, 0x41,
+	0x0d, 0xea, 0x50, 0x59,
 	0x0d, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf6, 0x41,
+	0x00, 0xe2, 0xf8, 0x41,
 	0x01, 0xae, 0x5d, 0x1b,
-	0x11, 0xea, 0x4e, 0x59,
+	0x11, 0xea, 0x50, 0x59,
 	0x11, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x2c, 0x5b,
+	0x00, 0xe2, 0x2e, 0x5b,
 	0x08, 0x5a, 0xb4, 0x00,
-	0x00, 0xe2, 0x1a, 0x5e,
+	0x00, 0xe2, 0x1c, 0x5e,
 	0xa8, 0xea, 0x32, 0x00,
-	0x00, 0xe2, 0x3c, 0x59,
-	0x80, 0x1a, 0x08, 0x7e,
-	0x00, 0xe2, 0x1a, 0x5e,
+	0x00, 0xe2, 0x3e, 0x59,
+	0x80, 0x1a, 0x0a, 0x7e,
+	0x00, 0xe2, 0x1c, 0x5e,
 	0x80, 0x19, 0x32, 0x00,
-	0x40, 0x5b, 0x0e, 0x6e,
-	0x08, 0x5a, 0x0e, 0x7e,
+	0x40, 0x5b, 0x10, 0x6e,
+	0x08, 0x5a, 0x10, 0x7e,
 	0x20, 0x4d, 0x64, 0x78,
 	0x02, 0x84, 0x09, 0x03,
-	0x40, 0x5b, 0xda, 0x7d,
+	0x40, 0x5b, 0xdc, 0x7d,
 	0xff, 0xae, 0x5d, 0x1b,
 	0x80, 0xf9, 0xf2, 0x01,
-	0x08, 0xa8, 0x3d, 0x6b,
+	0x08, 0xa8, 0x3f, 0x6b,
 	0x02, 0xea, 0xb4, 0x04,
 	0x01, 0x38, 0xe1, 0x30,
 	0x05, 0x39, 0xe3, 0x98,
@@ -801,12 +802,20 @@ static uint8_t seqprog[] = {
 };
 
 typedef int ahd_patch_func_t (struct ahd_softc *ahd);
+static ahd_patch_func_t ahd_patch22_func;
+
+static int
+ahd_patch22_func(struct ahd_softc *ahd)
+{
+	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) != 0);
+}
+
 static ahd_patch_func_t ahd_patch21_func;
 
 static int
 ahd_patch21_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) != 0);
+	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) == 0);
 }
 
 static ahd_patch_func_t ahd_patch20_func;
@@ -814,7 +823,7 @@ static ahd_patch_func_t ahd_patch20_func;
 static int
 ahd_patch20_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) == 0);
+	return ((ahd->features & AHD_RTI) == 0);
 }
 
 static ahd_patch_func_t ahd_patch19_func;
@@ -822,7 +831,7 @@ static ahd_patch_func_t ahd_patch19_func;
 static int
 ahd_patch19_func(struct ahd_softc *ahd)
 {
-	return ((ahd->features & AHD_RTI) == 0);
+	return ((ahd->flags & AHD_INITIATORROLE) != 0);
 }
 
 static ahd_patch_func_t ahd_patch18_func;
@@ -830,7 +839,7 @@ static ahd_patch_func_t ahd_patch18_func;
 static int
 ahd_patch18_func(struct ahd_softc *ahd)
 {
-	return ((ahd->flags & AHD_INITIATORROLE) != 0);
+	return ((ahd->flags & AHD_TARGETROLE) != 0);
 }
 
 static ahd_patch_func_t ahd_patch17_func;
@@ -838,7 +847,7 @@ static ahd_patch_func_t ahd_patch17_func;
 static int
 ahd_patch17_func(struct ahd_softc *ahd)
 {
-	return ((ahd->flags & AHD_TARGETROLE) != 0);
+	return ((ahd->bugs & AHD_AUTOFLUSH_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch16_func;
@@ -846,7 +855,7 @@ static ahd_patch_func_t ahd_patch16_func;
 static int
 ahd_patch16_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_AUTOFLUSH_BUG) != 0);
+	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) != 0);
 }
 
 static ahd_patch_func_t ahd_patch15_func;
@@ -854,7 +863,7 @@ static ahd_patch_func_t ahd_patch15_func;
 static int
 ahd_patch15_func(struct ahd_softc *ahd)
 {
-	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) != 0);
+	return ((ahd->flags & AHD_39BIT_ADDRESSING) != 0);
 }
 
 static ahd_patch_func_t ahd_patch14_func;
@@ -862,7 +871,7 @@ static ahd_patch_func_t ahd_patch14_func;
 static int
 ahd_patch14_func(struct ahd_softc *ahd)
 {
-	return ((ahd->flags & AHD_39BIT_ADDRESSING) != 0);
+	return ((ahd->flags & AHD_64BIT_ADDRESSING) != 0);
 }
 
 static ahd_patch_func_t ahd_patch13_func;
@@ -870,7 +879,7 @@ static ahd_patch_func_t ahd_patch13_func;
 static int
 ahd_patch13_func(struct ahd_softc *ahd)
 {
-	return ((ahd->flags & AHD_64BIT_ADDRESSING) != 0);
+	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) == 0);
 }
 
 static ahd_patch_func_t ahd_patch12_func;
@@ -878,7 +887,7 @@ static ahd_patch_func_t ahd_patch12_func;
 static int
 ahd_patch12_func(struct ahd_softc *ahd)
 {
-	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) == 0);
+	return ((ahd->bugs & AHD_REG_SLOW_SETTLE_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch11_func;
@@ -886,7 +895,7 @@ static ahd_patch_func_t ahd_patch11_func;
 static int
 ahd_patch11_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_REG_SLOW_SETTLE_BUG) != 0);
+	return ((ahd->bugs & AHD_EARLY_REQ_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch10_func;
@@ -894,7 +903,7 @@ static ahd_patch_func_t ahd_patch10_func;
 static int
 ahd_patch10_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_EARLY_REQ_BUG) != 0);
+	return ((ahd->bugs & AHD_BUSFREEREV_BUG) == 0);
 }
 
 static ahd_patch_func_t ahd_patch9_func;
@@ -902,7 +911,7 @@ static ahd_patch_func_t ahd_patch9_func;
 static int
 ahd_patch9_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_BUSFREEREV_BUG) == 0);
+	return ((ahd->flags & AHD_SEQUENCER_DEBUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch8_func;
@@ -910,7 +919,7 @@ static ahd_patch_func_t ahd_patch8_func;
 static int
 ahd_patch8_func(struct ahd_softc *ahd)
 {
-	return ((ahd->flags & AHD_SEQUENCER_DEBUG) != 0);
+	return ((ahd->bugs & AHD_LQO_ATNO_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch7_func;
@@ -918,7 +927,7 @@ static ahd_patch_func_t ahd_patch7_func;
 static int
 ahd_patch7_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_LQO_ATNO_BUG) != 0);
+	return ((ahd->bugs & AHD_BUSFREEREV_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch6_func;
@@ -926,7 +935,7 @@ static ahd_patch_func_t ahd_patch6_func;
 static int
 ahd_patch6_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_BUSFREEREV_BUG) != 0);
+	return ((ahd->bugs & AHD_NONPACKFIFO_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch5_func;
@@ -934,7 +943,7 @@ static ahd_patch_func_t ahd_patch5_func;
 static int
 ahd_patch5_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_NONPACKFIFO_BUG) != 0);
+	return ((ahd->bugs & AHD_SENT_SCB_UPDATE_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch4_func;
@@ -942,7 +951,7 @@ static ahd_patch_func_t ahd_patch4_func;
 static int
 ahd_patch4_func(struct ahd_softc *ahd)
 {
-	return ((ahd->bugs & AHD_SENT_SCB_UPDATE_BUG) != 0);
+	return ((ahd->bugs & AHD_PKT_LUN_BUG) != 0);
 }
 
 static ahd_patch_func_t ahd_patch3_func;
@@ -1008,109 +1017,110 @@ static struct patch {
 	{ ahd_patch0_func, 70, 1, 1 },
 	{ ahd_patch1_func, 73, 1, 2 },
 	{ ahd_patch0_func, 74, 1, 1 },
-	{ ahd_patch2_func, 161, 6, 1 },
-	{ ahd_patch1_func, 167, 2, 1 },
-	{ ahd_patch4_func, 169, 1, 1 },
-	{ ahd_patch2_func, 178, 1, 2 },
-	{ ahd_patch0_func, 179, 1, 1 },
-	{ ahd_patch5_func, 180, 2, 2 },
-	{ ahd_patch0_func, 182, 6, 3 },
-	{ ahd_patch2_func, 185, 1, 2 },
-	{ ahd_patch0_func, 186, 1, 1 },
-	{ ahd_patch2_func, 189, 1, 2 },
-	{ ahd_patch0_func, 190, 1, 1 },
-	{ ahd_patch6_func, 192, 2, 1 },
-	{ ahd_patch4_func, 200, 16, 2 },
-	{ ahd_patch0_func, 216, 1, 1 },
-	{ ahd_patch7_func, 236, 2, 1 },
-	{ ahd_patch1_func, 240, 1, 2 },
-	{ ahd_patch0_func, 241, 1, 1 },
-	{ ahd_patch6_func, 244, 2, 1 },
-	{ ahd_patch1_func, 258, 1, 2 },
-	{ ahd_patch0_func, 259, 1, 1 },
-	{ ahd_patch1_func, 262, 1, 2 },
-	{ ahd_patch0_func, 263, 1, 1 },
-	{ ahd_patch2_func, 266, 1, 2 },
-	{ ahd_patch0_func, 267, 1, 1 },
-	{ ahd_patch1_func, 322, 1, 2 },
-	{ ahd_patch0_func, 323, 1, 1 },
-	{ ahd_patch2_func, 331, 1, 2 },
-	{ ahd_patch0_func, 332, 1, 1 },
-	{ ahd_patch2_func, 335, 1, 2 },
-	{ ahd_patch0_func, 336, 1, 1 },
-	{ ahd_patch1_func, 343, 1, 2 },
-	{ ahd_patch0_func, 344, 1, 1 },
-	{ ahd_patch8_func, 363, 1, 1 },
-	{ ahd_patch8_func, 366, 1, 1 },
-	{ ahd_patch8_func, 368, 1, 1 },
-	{ ahd_patch8_func, 380, 1, 1 },
-	{ ahd_patch1_func, 390, 1, 2 },
-	{ ahd_patch0_func, 391, 1, 1 },
-	{ ahd_patch1_func, 393, 1, 2 },
-	{ ahd_patch0_func, 394, 1, 1 },
-	{ ahd_patch1_func, 402, 1, 2 },
-	{ ahd_patch0_func, 403, 1, 1 },
-	{ ahd_patch2_func, 416, 1, 2 },
-	{ ahd_patch0_func, 417, 1, 1 },
-	{ ahd_patch9_func, 447, 1, 1 },
-	{ ahd_patch1_func, 454, 1, 2 },
-	{ ahd_patch0_func, 455, 1, 1 },
-	{ ahd_patch2_func, 467, 1, 2 },
-	{ ahd_patch0_func, 468, 1, 1 },
-	{ ahd_patch10_func, 473, 6, 2 },
-	{ ahd_patch0_func, 479, 1, 1 },
-	{ ahd_patch11_func, 502, 1, 1 },
-	{ ahd_patch12_func, 511, 1, 1 },
-	{ ahd_patch13_func, 512, 1, 2 },
-	{ ahd_patch0_func, 513, 1, 1 },
-	{ ahd_patch14_func, 518, 1, 1 },
-	{ ahd_patch13_func, 519, 1, 1 },
-	{ ahd_patch15_func, 532, 1, 2 },
-	{ ahd_patch0_func, 533, 1, 1 },
-	{ ahd_patch1_func, 555, 1, 2 },
-	{ ahd_patch0_func, 556, 1, 1 },
-	{ ahd_patch1_func, 559, 1, 2 },
-	{ ahd_patch0_func, 560, 1, 1 },
-	{ ahd_patch2_func, 565, 1, 2 },
-	{ ahd_patch0_func, 566, 1, 1 },
-	{ ahd_patch2_func, 570, 1, 2 },
-	{ ahd_patch0_func, 571, 1, 1 },
-	{ ahd_patch1_func, 572, 1, 2 },
-	{ ahd_patch0_func, 573, 1, 1 },
-	{ ahd_patch2_func, 584, 1, 2 },
-	{ ahd_patch0_func, 585, 1, 1 },
-	{ ahd_patch16_func, 589, 1, 1 },
-	{ ahd_patch17_func, 594, 1, 1 },
-	{ ahd_patch18_func, 595, 2, 1 },
-	{ ahd_patch17_func, 599, 1, 2 },
-	{ ahd_patch0_func, 600, 1, 1 },
-	{ ahd_patch2_func, 603, 1, 2 },
-	{ ahd_patch0_func, 604, 1, 1 },
-	{ ahd_patch2_func, 622, 1, 2 },
-	{ ahd_patch0_func, 623, 1, 1 },
-	{ ahd_patch19_func, 624, 14, 1 },
-	{ ahd_patch1_func, 642, 1, 2 },
-	{ ahd_patch0_func, 643, 1, 1 },
-	{ ahd_patch19_func, 644, 1, 1 },
-	{ ahd_patch1_func, 656, 1, 2 },
-	{ ahd_patch0_func, 657, 1, 1 },
-	{ ahd_patch1_func, 664, 1, 2 },
-	{ ahd_patch0_func, 665, 1, 1 },
-	{ ahd_patch16_func, 688, 1, 1 },
-	{ ahd_patch16_func, 726, 1, 1 },
-	{ ahd_patch1_func, 737, 1, 2 },
-	{ ahd_patch0_func, 738, 1, 1 },
-	{ ahd_patch1_func, 755, 1, 2 },
-	{ ahd_patch0_func, 756, 1, 1 },
-	{ ahd_patch1_func, 758, 1, 2 },
-	{ ahd_patch0_func, 759, 1, 1 },
-	{ ahd_patch1_func, 762, 1, 2 },
-	{ ahd_patch0_func, 763, 1, 1 },
-	{ ahd_patch20_func, 765, 1, 2 },
-	{ ahd_patch0_func, 766, 2, 1 },
-	{ ahd_patch21_func, 769, 4, 2 },
-	{ ahd_patch0_func, 773, 1, 1 },
-	{ ahd_patch21_func, 781, 11, 1 }
+	{ ahd_patch4_func, 107, 1, 1 },
+	{ ahd_patch2_func, 162, 6, 1 },
+	{ ahd_patch1_func, 168, 2, 1 },
+	{ ahd_patch5_func, 170, 1, 1 },
+	{ ahd_patch2_func, 179, 1, 2 },
+	{ ahd_patch0_func, 180, 1, 1 },
+	{ ahd_patch6_func, 181, 2, 2 },
+	{ ahd_patch0_func, 183, 6, 3 },
+	{ ahd_patch2_func, 186, 1, 2 },
+	{ ahd_patch0_func, 187, 1, 1 },
+	{ ahd_patch2_func, 190, 1, 2 },
+	{ ahd_patch0_func, 191, 1, 1 },
+	{ ahd_patch7_func, 193, 2, 1 },
+	{ ahd_patch5_func, 201, 16, 2 },
+	{ ahd_patch0_func, 217, 1, 1 },
+	{ ahd_patch8_func, 237, 2, 1 },
+	{ ahd_patch1_func, 241, 1, 2 },
+	{ ahd_patch0_func, 242, 1, 1 },
+	{ ahd_patch7_func, 245, 2, 1 },
+	{ ahd_patch1_func, 259, 1, 2 },
+	{ ahd_patch0_func, 260, 1, 1 },
+	{ ahd_patch1_func, 263, 1, 2 },
+	{ ahd_patch0_func, 264, 1, 1 },
+	{ ahd_patch2_func, 267, 1, 2 },
+	{ ahd_patch0_func, 268, 1, 1 },
+	{ ahd_patch1_func, 323, 1, 2 },
+	{ ahd_patch0_func, 324, 1, 1 },
+	{ ahd_patch2_func, 332, 1, 2 },
+	{ ahd_patch0_func, 333, 1, 1 },
+	{ ahd_patch2_func, 336, 1, 2 },
+	{ ahd_patch0_func, 337, 1, 1 },
+	{ ahd_patch1_func, 344, 1, 2 },
+	{ ahd_patch0_func, 345, 1, 1 },
+	{ ahd_patch9_func, 364, 1, 1 },
+	{ ahd_patch9_func, 367, 1, 1 },
+	{ ahd_patch9_func, 369, 1, 1 },
+	{ ahd_patch9_func, 381, 1, 1 },
+	{ ahd_patch1_func, 391, 1, 2 },
+	{ ahd_patch0_func, 392, 1, 1 },
+	{ ahd_patch1_func, 394, 1, 2 },
+	{ ahd_patch0_func, 395, 1, 1 },
+	{ ahd_patch1_func, 403, 1, 2 },
+	{ ahd_patch0_func, 404, 1, 1 },
+	{ ahd_patch2_func, 417, 1, 2 },
+	{ ahd_patch0_func, 418, 1, 1 },
+	{ ahd_patch10_func, 448, 1, 1 },
+	{ ahd_patch1_func, 455, 1, 2 },
+	{ ahd_patch0_func, 456, 1, 1 },
+	{ ahd_patch2_func, 468, 1, 2 },
+	{ ahd_patch0_func, 469, 1, 1 },
+	{ ahd_patch11_func, 474, 6, 2 },
+	{ ahd_patch0_func, 480, 1, 1 },
+	{ ahd_patch12_func, 503, 1, 1 },
+	{ ahd_patch13_func, 512, 1, 1 },
+	{ ahd_patch14_func, 513, 1, 2 },
+	{ ahd_patch0_func, 514, 1, 1 },
+	{ ahd_patch15_func, 519, 1, 1 },
+	{ ahd_patch14_func, 520, 1, 1 },
+	{ ahd_patch16_func, 533, 1, 2 },
+	{ ahd_patch0_func, 534, 1, 1 },
+	{ ahd_patch1_func, 556, 1, 2 },
+	{ ahd_patch0_func, 557, 1, 1 },
+	{ ahd_patch1_func, 560, 1, 2 },
+	{ ahd_patch0_func, 561, 1, 1 },
+	{ ahd_patch2_func, 566, 1, 2 },
+	{ ahd_patch0_func, 567, 1, 1 },
+	{ ahd_patch2_func, 571, 1, 2 },
+	{ ahd_patch0_func, 572, 1, 1 },
+	{ ahd_patch1_func, 573, 1, 2 },
+	{ ahd_patch0_func, 574, 1, 1 },
+	{ ahd_patch2_func, 585, 1, 2 },
+	{ ahd_patch0_func, 586, 1, 1 },
+	{ ahd_patch17_func, 590, 1, 1 },
+	{ ahd_patch18_func, 595, 1, 1 },
+	{ ahd_patch19_func, 596, 2, 1 },
+	{ ahd_patch18_func, 600, 1, 2 },
+	{ ahd_patch0_func, 601, 1, 1 },
+	{ ahd_patch2_func, 604, 1, 2 },
+	{ ahd_patch0_func, 605, 1, 1 },
+	{ ahd_patch2_func, 623, 1, 2 },
+	{ ahd_patch0_func, 624, 1, 1 },
+	{ ahd_patch20_func, 625, 14, 1 },
+	{ ahd_patch1_func, 643, 1, 2 },
+	{ ahd_patch0_func, 644, 1, 1 },
+	{ ahd_patch20_func, 645, 1, 1 },
+	{ ahd_patch1_func, 657, 1, 2 },
+	{ ahd_patch0_func, 658, 1, 1 },
+	{ ahd_patch1_func, 665, 1, 2 },
+	{ ahd_patch0_func, 666, 1, 1 },
+	{ ahd_patch17_func, 689, 1, 1 },
+	{ ahd_patch17_func, 727, 1, 1 },
+	{ ahd_patch1_func, 738, 1, 2 },
+	{ ahd_patch0_func, 739, 1, 1 },
+	{ ahd_patch1_func, 756, 1, 2 },
+	{ ahd_patch0_func, 757, 1, 1 },
+	{ ahd_patch1_func, 759, 1, 2 },
+	{ ahd_patch0_func, 760, 1, 1 },
+	{ ahd_patch1_func, 763, 1, 2 },
+	{ ahd_patch0_func, 764, 1, 1 },
+	{ ahd_patch21_func, 766, 1, 2 },
+	{ ahd_patch0_func, 767, 2, 1 },
+	{ ahd_patch22_func, 770, 4, 2 },
+	{ ahd_patch0_func, 774, 1, 1 },
+	{ ahd_patch22_func, 782, 11, 1 }
 };
 
 static struct cs {
@@ -1121,14 +1131,14 @@ static struct cs {
 	{ 13, 14 },
 	{ 29, 42 },
 	{ 56, 59 },
-	{ 101, 127 },
-	{ 128, 156 },
-	{ 158, 161 },
-	{ 169, 177 },
-	{ 200, 249 },
-	{ 688, 704 },
-	{ 704, 718 },
-	{ 728, 732 }
+	{ 101, 128 },
+	{ 129, 157 },
+	{ 159, 162 },
+	{ 170, 178 },
+	{ 201, 250 },
+	{ 689, 705 },
+	{ 705, 719 },
+	{ 729, 733 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)