Sync ahc with NetBSD, which was in turn updated from FreeBSD by Pascal

Renauld of Network Storage Solutions, Inc. Many fixes, wider device
support. In particular, the notorious 'Target 0' problem seems to be
fixed.

Does *not* include any updates to isa or eisa code beyond what was
necessary to compile.

Known issues:

1) Tagged Queuing is probably not optimal.

2) PPR negotiation may not be fully functional.

3) No support yet for freezing devices or channels.

4) The mechanism for preventing 'A' and 'B' channel confusion during probe
can fail if scsibus > 254 found.

5) Requeuing I/O's not working. A workaround will be committed almost
immediately. At the moment timeouts, SCSI message rejects, aborting
SCB's and trying to freeze a device may cause incomplete i/o's to be
reported as complete.

6) Verbosity and probe messages need work.

7) Last disk on bus seems to go through an extra re-negotiation.

8) >16 devices on an adapter will trigger the usual problems of total
openings exceeding available SCB's under heavy load.

Tested by deraadt@, beck@, miod@, naddy@, drahn@, marc@ amoung
others.

ok deraadt@.

1 files changed, 688 insertions, 668 deletions

diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
index 6d90775b2d1..8ce02ad9e34 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
@@ -1,15 +1,15 @@
-/* $OpenBSD: aic7xxx_seq.h,v 1.12 2003/08/28 02:32:47 krw Exp $ */
+/* $OpenBSD: aic7xxx_seq.h,v 1.13 2003/12/24 23:27:55 krw Exp $ */
 /*
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $Id: aic7xxx_seq.h,v 1.12 2003/08/28 02:32:47 krw Exp $
- * $Id: aic7xxx_seq.h,v 1.12 2003/08/28 02:32:47 krw Exp $
+ * $NetBSD: aic7xxx.seq,v 1.15 2003/05/03 18:11:31 wiz Exp $
+ * $NetBSD: aic7xxx.reg,v 1.2 2003/04/19 19:26:10 fvdl Exp $
  */
-static const u_int8_t seqprog[] = {
+static uint8_t seqprog[] = {
 	0xb2, 0x00, 0x00, 0x08,
 	0xf7, 0x11, 0x22, 0x08,
-	0x00, 0x65, 0xe0, 0x59,
+	0x00, 0x65, 0xec, 0x59,
 	0xf7, 0x01, 0x02, 0x08,
 	0xff, 0x6a, 0x24, 0x08,
 	0x40, 0x00, 0x40, 0x68,
@@ -22,15 +22,15 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x4d, 0xc8, 0x30,
 	0x00, 0x4c, 0x12, 0x70,
 	0x01, 0x39, 0xa2, 0x30,
-	0x00, 0x6a, 0xaa, 0x5e,
+	0x00, 0x6a, 0xd4, 0x5e,
 	0x01, 0x51, 0x20, 0x31,
 	0x01, 0x57, 0xae, 0x00,
 	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x51, 0xfc, 0x5d,
+	0x00, 0x51, 0x26, 0x5e,
 	0x01, 0x51, 0xc8, 0x30,
-	0x00, 0x39, 0xda, 0x60,
+	0x00, 0x39, 0xc8, 0x60,
 	0x00, 0xbb, 0x30, 0x70,
-	0xc1, 0x6a, 0xc2, 0x5e,
+	0xc1, 0x6a, 0xec, 0x5e,
 	0x01, 0xbf, 0x72, 0x30,
 	0x01, 0x40, 0x7e, 0x31,
 	0x01, 0x90, 0x80, 0x30,
@@ -38,22 +38,22 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x4d, 0x9a, 0x18,
 	0xfe, 0x57, 0xae, 0x08,
 	0x01, 0x40, 0x20, 0x31,
-	0x00, 0x65, 0xde, 0x58,
+	0x00, 0x65, 0xcc, 0x58,
 	0x60, 0x0b, 0x40, 0x78,
 	0x08, 0x6a, 0x18, 0x00,
 	0x08, 0x11, 0x22, 0x00,
 	0x60, 0x0b, 0x00, 0x78,
-	0x40, 0x0b, 0x0e, 0x69,
-	0x80, 0x0b, 0xc6, 0x78,
+	0x40, 0x0b, 0xfa, 0x68,
+	0x80, 0x0b, 0xb6, 0x78,
 	0x20, 0x6a, 0x16, 0x00,
 	0xa4, 0x6a, 0x06, 0x00,
-	0x08, 0x3c, 0x78, 0x00,
+	0x08, 0x6a, 0x78, 0x00,
 	0x01, 0x50, 0xc8, 0x30,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xe6, 0x5d,
+	0x48, 0x6a, 0x10, 0x5e,
 	0x01, 0x6a, 0xdc, 0x01,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xe6, 0x5d,
+	0x48, 0x6a, 0x10, 0x5e,
 	0x01, 0x6a, 0x26, 0x01,
 	0xf0, 0x19, 0x7a, 0x08,
 	0x0f, 0x18, 0xc8, 0x08,
@@ -64,228 +64,234 @@ static const u_int8_t seqprog[] = {
 	0x80, 0x3d, 0x7a, 0x00,
 	0x01, 0x3d, 0xd8, 0x31,
 	0x01, 0x3d, 0x32, 0x31,
-	0x10, 0x03, 0x58, 0x79,
-	0x00, 0x65, 0x06, 0x59,
-	0x80, 0x66, 0xa2, 0x78,
+	0x10, 0x03, 0x4e, 0x79,
+	0x00, 0x65, 0xf2, 0x58,
+	0x80, 0x66, 0xae, 0x78,
 	0x01, 0x66, 0xd8, 0x31,
 	0x01, 0x66, 0x32, 0x31,
-	0x40, 0x66, 0x80, 0x68,
+	0x1f, 0x66, 0x7c, 0x08,
+	0x40, 0x66, 0x82, 0x68,
 	0x01, 0x3c, 0x78, 0x00,
-	0x10, 0x03, 0xaa, 0x78,
-	0x00, 0x65, 0x06, 0x59,
+	0x10, 0x03, 0x9e, 0x78,
+	0x00, 0x65, 0xf2, 0x58,
 	0xe0, 0x66, 0xc8, 0x18,
 	0x00, 0x65, 0xaa, 0x50,
 	0xdd, 0x66, 0xc8, 0x18,
 	0x00, 0x65, 0xaa, 0x48,
 	0x01, 0x66, 0xd8, 0x31,
 	0x01, 0x66, 0x32, 0x31,
-	0x10, 0x03, 0x58, 0x79,
-	0x00, 0x65, 0x06, 0x59,
+	0x10, 0x03, 0x4e, 0x79,
+	0x00, 0x65, 0xf2, 0x58,
 	0x01, 0x66, 0xd8, 0x31,
 	0x01, 0x66, 0x32, 0x31,
 	0x01, 0x66, 0xac, 0x30,
 	0x40, 0x3c, 0x78, 0x00,
-	0x10, 0x03, 0xa0, 0x78,
-	0x00, 0x65, 0x06, 0x59,
-	0x00, 0x65, 0xaa, 0x40,
-	0x61, 0x6a, 0xc2, 0x5e,
-	0x08, 0x51, 0x30, 0x71,
-	0x02, 0x0b, 0xa6, 0x78,
-	0x00, 0x65, 0xa2, 0x40,
-	0x80, 0x86, 0xc8, 0x08,
-	0x01, 0x4f, 0xc8, 0x30,
-	0x00, 0x50, 0xbc, 0x60,
-	0xc4, 0x6a, 0x58, 0x5d,
-	0x40, 0x3c, 0xb8, 0x78,
-	0x28, 0x6a, 0x6e, 0x5d,
-	0x00, 0x65, 0x56, 0x41,
-	0x08, 0x6a, 0x6e, 0x5d,
-	0x00, 0x65, 0x56, 0x41,
 	0xff, 0x6a, 0xd8, 0x01,
 	0xff, 0x6a, 0x32, 0x01,
-	0x90, 0x3c, 0x78, 0x00,
-	0x10, 0x03, 0x4c, 0x69,
-	0x00, 0x65, 0x30, 0x41,
-	0x08, 0x19, 0xd2, 0x69,
+	0x10, 0x3c, 0x78, 0x00,
+	0x02, 0x57, 0x40, 0x69,
+	0x10, 0x03, 0x3e, 0x69,
+	0x00, 0x65, 0x20, 0x41,
+	0x02, 0x57, 0xae, 0x00,
+	0x00, 0x65, 0x9e, 0x40,
+	0x61, 0x6a, 0xec, 0x5e,
+	0x08, 0x51, 0x20, 0x71,
+	0x02, 0x0b, 0xb2, 0x78,
+	0x00, 0x65, 0xae, 0x40,
 	0x1a, 0x01, 0x02, 0x00,
 	0xf0, 0x19, 0x7a, 0x08,
 	0x0f, 0x0f, 0xc8, 0x08,
 	0x0f, 0x05, 0xc8, 0x08,
 	0x00, 0x3d, 0x7a, 0x00,
-	0x08, 0x1f, 0xd6, 0x78,
+	0x08, 0x1f, 0xc4, 0x78,
 	0x80, 0x3d, 0x7a, 0x00,
 	0x20, 0x6a, 0x16, 0x00,
-	0x00, 0x65, 0xc0, 0x41,
-	0x00, 0x65, 0x9c, 0x5e,
+	0x00, 0x65, 0xcc, 0x41,
+	0x00, 0x65, 0xc6, 0x5e,
 	0x00, 0x65, 0x12, 0x40,
-	0x20, 0x11, 0xe4, 0x68,
+	0x20, 0x11, 0xd2, 0x68,
 	0x20, 0x6a, 0x18, 0x00,
 	0x20, 0x11, 0x22, 0x00,
 	0xf7, 0x1f, 0xca, 0x08,
-	0x80, 0xb9, 0xea, 0x78,
+	0x80, 0xb9, 0xd8, 0x78,
 	0x08, 0x65, 0xca, 0x00,
 	0x01, 0x65, 0x3e, 0x30,
 	0x01, 0xb9, 0x1e, 0x30,
 	0x7f, 0xb9, 0x0a, 0x08,
 	0x01, 0xb9, 0x0a, 0x30,
 	0x01, 0x54, 0xca, 0x30,
-	0x80, 0xb8, 0xf8, 0x78,
+	0x80, 0xb8, 0xe6, 0x78,
 	0x80, 0x65, 0xca, 0x00,
 	0x01, 0x65, 0x00, 0x34,
 	0x01, 0x54, 0x00, 0x34,
-	0x1a, 0x01, 0x02, 0x00,
-	0x08, 0xb8, 0x02, 0x79,
+	0x08, 0xb8, 0xee, 0x78,
 	0x20, 0x01, 0x02, 0x00,
 	0x02, 0xbd, 0x08, 0x34,
 	0x01, 0xbd, 0x08, 0x34,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x08, 0x79,
+	0x02, 0x0b, 0xf4, 0x78,
 	0xf7, 0x01, 0x02, 0x08,
 	0x01, 0x06, 0xcc, 0x34,
 	0xb2, 0x00, 0x00, 0x08,
-	0x40, 0x6a, 0x16, 0x00,
 	0x01, 0x40, 0x20, 0x31,
 	0x01, 0xbf, 0x80, 0x30,
 	0x01, 0xb9, 0x7a, 0x30,
 	0x01, 0xba, 0x7c, 0x30,
-	0x00, 0x65, 0xfc, 0x58,
-	0x80, 0x0b, 0xbc, 0x79,
-	0xe4, 0x6a, 0x58, 0x5d,
-	0x80, 0xba, 0x6e, 0x5d,
-	0x20, 0xb8, 0x28, 0x79,
-	0x20, 0x6a, 0x6e, 0x5d,
-	0x00, 0xa3, 0x6e, 0x5d,
-	0x01, 0xa0, 0x78, 0x30,
-	0x10, 0xb8, 0x30, 0x79,
-	0xe4, 0x6a, 0x58, 0x5d,
-	0x00, 0x65, 0xa2, 0x40,
-	0x10, 0x03, 0x48, 0x69,
-	0x08, 0x3c, 0x64, 0x69,
-	0x04, 0x3c, 0x8a, 0x69,
-	0x02, 0x3c, 0x90, 0x69,
-	0x01, 0x3c, 0x4e, 0x79,
-	0x01, 0x6a, 0xa2, 0x30,
-	0x00, 0x65, 0x9c, 0x59,
-	0x04, 0x51, 0x3e, 0x61,
-	0x00, 0x6a, 0xaa, 0x5e,
+	0x00, 0x65, 0xea, 0x58,
+	0x80, 0x0b, 0xc4, 0x79,
+	0x12, 0x01, 0x02, 0x00,
+	0x01, 0xab, 0xac, 0x30,
+	0xe4, 0x6a, 0x82, 0x5d,
+	0x40, 0x6a, 0x16, 0x00,
+	0x80, 0xba, 0x98, 0x5d,
+	0x20, 0xb8, 0x18, 0x79,
+	0x20, 0x6a, 0x98, 0x5d,
+	0x00, 0xab, 0x98, 0x5d,
+	0x01, 0xa9, 0x78, 0x30,
+	0x10, 0xb8, 0x20, 0x79,
+	0xe4, 0x6a, 0x82, 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,
+	0x00, 0x65, 0xa4, 0x59,
+	0x00, 0x6a, 0xd4, 0x5e,
+	0xff, 0x38, 0x30, 0x71,
 	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0xfc, 0x5d,
-	0x00, 0x65, 0x28, 0x41,
+	0x00, 0x38, 0x26, 0x5e,
+	0x00, 0x65, 0xea, 0x58,
+	0x12, 0x01, 0x02, 0x00,
+	0x00, 0x65, 0x18, 0x41,
 	0xa4, 0x6a, 0x06, 0x00,
-	0x00, 0x65, 0x06, 0x59,
-	0x00, 0x65, 0xa2, 0x40,
-	0xe4, 0x6a, 0x58, 0x5d,
-	0x20, 0x3c, 0x54, 0x79,
-	0x02, 0x6a, 0x6e, 0x5d,
-	0x04, 0x6a, 0x6e, 0x5d,
-	0x01, 0x03, 0x56, 0x69,
+	0x00, 0x65, 0xf2, 0x58,
+	0xfd, 0x57, 0xae, 0x08,
+	0x00, 0x65, 0xae, 0x40,
+	0xe4, 0x6a, 0x82, 0x5d,
+	0x20, 0x3c, 0x4a, 0x79,
+	0x02, 0x6a, 0x98, 0x5d,
+	0x04, 0x6a, 0x98, 0x5d,
+	0x01, 0x03, 0x4c, 0x69,
 	0xf7, 0x11, 0x22, 0x08,
 	0xff, 0x6a, 0x24, 0x08,
 	0xff, 0x6a, 0x06, 0x08,
 	0x01, 0x6a, 0x7e, 0x00,
-	0x00, 0x65, 0x9c, 0x59,
+	0x00, 0x65, 0xa4, 0x59,
 	0x00, 0x65, 0x04, 0x40,
-	0x84, 0x6a, 0x58, 0x5d,
-	0x00, 0x65, 0x06, 0x59,
+	0x80, 0x86, 0xc8, 0x08,
+	0x01, 0x4f, 0xc8, 0x30,
+	0x00, 0x50, 0x6c, 0x61,
+	0xc4, 0x6a, 0x82, 0x5d,
+	0x40, 0x3c, 0x68, 0x79,
+	0x28, 0x6a, 0x98, 0x5d,
+	0x00, 0x65, 0x4c, 0x41,
+	0x08, 0x6a, 0x98, 0x5d,
+	0x00, 0x65, 0x4c, 0x41,
+	0x84, 0x6a, 0x82, 0x5d,
+	0x00, 0x65, 0xf2, 0x58,
 	0x01, 0x66, 0xc8, 0x30,
 	0x01, 0x64, 0xd8, 0x31,
 	0x01, 0x64, 0x32, 0x31,
 	0x5b, 0x64, 0xc8, 0x28,
 	0x30, 0x64, 0xca, 0x18,
 	0x01, 0x6c, 0xc8, 0x30,
-	0xff, 0x64, 0x86, 0x79,
+	0xff, 0x64, 0x8e, 0x79,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x78, 0x79,
-	0x01, 0x64, 0x7e, 0x61,
+	0x02, 0x0b, 0x80, 0x79,
+	0x01, 0x64, 0x86, 0x61,
 	0xf7, 0x01, 0x02, 0x08,
 	0x01, 0x06, 0xd8, 0x31,
 	0x01, 0x06, 0x32, 0x31,
 	0xff, 0x64, 0xc8, 0x18,
-	0xff, 0x64, 0x78, 0x69,
+	0xff, 0x64, 0x80, 0x69,
 	0xf7, 0x3c, 0x78, 0x08,
-	0x00, 0x65, 0x30, 0x41,
-	0x40, 0xa1, 0x7e, 0x10,
-	0x04, 0xa1, 0x58, 0x5d,
-	0x00, 0x65, 0x52, 0x42,
-	0xc4, 0x6a, 0x58, 0x5d,
+	0x00, 0x65, 0x20, 0x41,
+	0x40, 0xaa, 0x7e, 0x10,
+	0x04, 0xaa, 0x82, 0x5d,
+	0x00, 0x65, 0x5e, 0x42,
+	0xc4, 0x6a, 0x82, 0x5d,
 	0xc0, 0x6a, 0x7e, 0x00,
-	0x00, 0xa2, 0x6e, 0x5d,
+	0x00, 0xa8, 0x98, 0x5d,
 	0xe4, 0x6a, 0x06, 0x00,
-	0x00, 0x6a, 0x6e, 0x5d,
-	0x00, 0x65, 0x56, 0x41,
-	0x10, 0x3c, 0xa0, 0x69,
-	0x00, 0xbb, 0x76, 0x44,
+	0x00, 0x6a, 0x98, 0x5d,
+	0x00, 0x65, 0x4c, 0x41,
+	0x10, 0x3c, 0xa8, 0x69,
+	0x00, 0xbb, 0x9e, 0x44,
 	0x18, 0x6a, 0xda, 0x01,
 	0x01, 0x69, 0xd8, 0x31,
 	0x1c, 0x6a, 0xd0, 0x01,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0xa8, 0x79,
+	0x80, 0xee, 0xb0, 0x79,
 	0xff, 0x6a, 0xdc, 0x09,
 	0x01, 0x93, 0x26, 0x01,
 	0x03, 0x6a, 0x2a, 0x01,
 	0x01, 0x69, 0x32, 0x31,
-	0x1c, 0x6a, 0xca, 0x5d,
+	0x1c, 0x6a, 0xf4, 0x5d,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x92, 0x5e,
+	0x00, 0x65, 0xbc, 0x5e,
 	0x01, 0x50, 0xa0, 0x18,
 	0x02, 0x6a, 0x22, 0x05,
+	0x1a, 0x01, 0x02, 0x00,
 	0x80, 0x6a, 0x74, 0x00,
-	0x80, 0x3c, 0x78, 0x00,
-	0x00, 0x65, 0xc2, 0x5d,
+	0x40, 0x6a, 0x78, 0x00,
+	0x40, 0x6a, 0x16, 0x00,
+	0x00, 0x65, 0xec, 0x5d,
 	0x01, 0x3f, 0xc8, 0x30,
-	0xbf, 0x64, 0x52, 0x7a,
-	0x80, 0x64, 0x9c, 0x73,
-	0xa0, 0x64, 0xfa, 0x73,
-	0xc0, 0x64, 0xee, 0x73,
-	0xe0, 0x64, 0x2a, 0x74,
-	0x01, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0xc0, 0x41,
+	0xbf, 0x64, 0x5e, 0x7a,
+	0x80, 0x64, 0xb2, 0x73,
+	0xa0, 0x64, 0x14, 0x74,
+	0xc0, 0x64, 0x08, 0x74,
+	0xe0, 0x64, 0x44, 0x74,
+	0x01, 0x6a, 0xec, 0x5e,
+	0x00, 0x65, 0xcc, 0x41,
 	0xf7, 0x11, 0x22, 0x08,
 	0x01, 0x06, 0xd4, 0x30,
 	0xff, 0x6a, 0x24, 0x08,
 	0xf7, 0x01, 0x02, 0x08,
-	0x09, 0x0c, 0xda, 0x79,
+	0x09, 0x0c, 0xe6, 0x79,
 	0x08, 0x0c, 0x04, 0x68,
-	0xb1, 0x6a, 0xc2, 0x5e,
+	0xb1, 0x6a, 0xec, 0x5e,
 	0xff, 0x6a, 0x26, 0x09,
 	0x12, 0x01, 0x02, 0x00,
 	0x02, 0x6a, 0x08, 0x30,
 	0xff, 0x6a, 0x08, 0x08,
 	0xdf, 0x01, 0x02, 0x08,
 	0x01, 0x6a, 0x7e, 0x00,
-	0xff, 0x6a, 0x78, 0x0c,
+	0xc0, 0x6a, 0x78, 0x04,
 	0xff, 0x6a, 0xc8, 0x08,
 	0x08, 0xa4, 0x48, 0x19,
 	0x00, 0xa5, 0x4a, 0x21,
 	0x00, 0xa6, 0x4c, 0x21,
 	0x00, 0xa7, 0x4e, 0x25,
-	0x08, 0xeb, 0xc6, 0x7e,
-	0x80, 0xeb, 0xfa, 0x79,
+	0x08, 0xeb, 0xf0, 0x7e,
+	0x80, 0xeb, 0x06, 0x7a,
 	0xff, 0x6a, 0xd6, 0x09,
-	0x08, 0xeb, 0xfe, 0x69,
+	0x08, 0xeb, 0x0a, 0x6a,
 	0xff, 0x6a, 0xd4, 0x0c,
-	0x80, 0xa3, 0xc6, 0x6e,
-	0x88, 0xeb, 0x14, 0x72,
-	0x08, 0xeb, 0xc6, 0x6e,
-	0x04, 0xea, 0x18, 0xe2,
-	0x08, 0xee, 0xc6, 0x6e,
+	0x80, 0xa3, 0xf0, 0x6e,
+	0x88, 0xeb, 0x20, 0x72,
+	0x08, 0xeb, 0xf0, 0x6e,
+	0x04, 0xea, 0x24, 0xe2,
+	0x08, 0xee, 0xf0, 0x6e,
 	0x04, 0x6a, 0xd0, 0x81,
 	0x05, 0xa4, 0xc0, 0x89,
 	0x03, 0xa5, 0xc2, 0x31,
 	0x09, 0x6a, 0xd6, 0x05,
-	0x00, 0x65, 0xfc, 0x59,
+	0x00, 0x65, 0x08, 0x5a,
 	0x06, 0xa4, 0xd4, 0x89,
-	0x80, 0x94, 0xc6, 0x7e,
+	0x80, 0x94, 0xf0, 0x7e,
 	0x07, 0xe9, 0x10, 0x31,
-	0x01, 0x8c, 0x20, 0x7a,
+	0x01, 0x8c, 0x2c, 0x7a,
 	0x01, 0x55, 0xaa, 0x10,
 	0x01, 0xe9, 0x46, 0x31,
-	0x00, 0xa3, 0xa4, 0x5e,
-	0x00, 0x65, 0xee, 0x59,
+	0x00, 0xa3, 0xce, 0x5e,
+	0x00, 0x65, 0xfa, 0x59,
 	0x01, 0xa4, 0xca, 0x30,
-	0x01, 0x55, 0x2c, 0x7a,
+	0x01, 0x55, 0x38, 0x7a,
 	0x04, 0x65, 0xca, 0x00,
-	0x80, 0xa3, 0x30, 0x7a,
+	0x80, 0xa3, 0x3c, 0x7a,
 	0x02, 0x65, 0xca, 0x00,
 	0x01, 0x65, 0xf8, 0x31,
 	0x80, 0x93, 0x26, 0x01,
@@ -293,168 +299,168 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x8c, 0xc8, 0x30,
 	0x00, 0x88, 0xc8, 0x18,
 	0x02, 0x64, 0xc8, 0x88,
-	0xff, 0x64, 0xc6, 0x7e,
-	0xff, 0x8d, 0x46, 0x6a,
-	0xff, 0x8e, 0x46, 0x6a,
+	0xff, 0x64, 0xf0, 0x7e,
+	0xff, 0x8d, 0x52, 0x6a,
+	0xff, 0x8e, 0x52, 0x6a,
 	0x03, 0x8c, 0xd4, 0x98,
-	0x00, 0x65, 0xc6, 0x56,
+	0x00, 0x65, 0xf0, 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,
-	0x80, 0x3c, 0x56, 0x6a,
-	0x21, 0x6a, 0xc2, 0x46,
+	0xc0, 0x3c, 0x62, 0x7a,
+	0x21, 0x6a, 0xec, 0x5e,
 	0xa8, 0x6a, 0x76, 0x00,
 	0x79, 0x6a, 0x76, 0x00,
-	0x40, 0x3f, 0x5e, 0x6a,
+	0x40, 0x3f, 0x6a, 0x6a,
 	0x04, 0x3b, 0x76, 0x00,
 	0x04, 0x6a, 0xd4, 0x81,
-	0x20, 0x3c, 0x66, 0x7a,
-	0x51, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0x80, 0x42,
+	0x20, 0x3c, 0x72, 0x7a,
+	0x51, 0x6a, 0xec, 0x5e,
+	0x00, 0x65, 0x8c, 0x42,
 	0x20, 0x3c, 0x78, 0x00,
-	0x00, 0xb3, 0xa4, 0x5e,
+	0x00, 0xb3, 0xce, 0x5e,
 	0x07, 0xac, 0x10, 0x31,
 	0x05, 0xb3, 0x46, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xac, 0x6a, 0xd8, 0x5d,
+	0xac, 0x6a, 0x02, 0x5e,
 	0xa3, 0x6a, 0xcc, 0x00,
-	0xb3, 0x6a, 0xdc, 0x5d,
-	0x00, 0x65, 0x36, 0x5a,
+	0xb3, 0x6a, 0x06, 0x5e,
+	0x00, 0x65, 0x42, 0x5a,
 	0xfd, 0xa4, 0x48, 0x09,
 	0x01, 0x8c, 0xaa, 0x08,
 	0x03, 0x8c, 0x10, 0x30,
-	0x00, 0x65, 0xd0, 0x5d,
-	0x01, 0xa4, 0x92, 0x7a,
+	0x00, 0x65, 0xfa, 0x5d,
+	0x01, 0xa4, 0x9e, 0x7a,
 	0x04, 0x3b, 0x76, 0x08,
 	0x01, 0x3b, 0x26, 0x31,
 	0x80, 0x02, 0x04, 0x00,
-	0x10, 0x0c, 0x88, 0x7a,
-	0x03, 0x9e, 0x8a, 0x6a,
+	0x10, 0x0c, 0x94, 0x7a,
+	0x03, 0x9e, 0x96, 0x6a,
 	0x7f, 0x02, 0x04, 0x08,
-	0x91, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0xc0, 0x41,
+	0x91, 0x6a, 0xec, 0x5e,
+	0x00, 0x65, 0xcc, 0x41,
 	0x01, 0xa4, 0xca, 0x30,
-	0x80, 0xa3, 0x98, 0x7a,
+	0x80, 0xa3, 0xa4, 0x7a,
 	0x02, 0x65, 0xca, 0x00,
-	0x01, 0x55, 0x9c, 0x7a,
+	0x01, 0x55, 0xa8, 0x7a,
 	0x04, 0x65, 0xca, 0x00,
 	0x01, 0x65, 0xf8, 0x31,
 	0x01, 0x3b, 0x26, 0x31,
-	0x00, 0x65, 0x02, 0x5a,
-	0x01, 0xfc, 0xaa, 0x6a,
-	0x80, 0x0b, 0xa0, 0x6a,
-	0x10, 0x0c, 0xa0, 0x7a,
-	0x20, 0x93, 0xa0, 0x6a,
+	0x00, 0x65, 0x0e, 0x5a,
+	0x01, 0xfc, 0xb6, 0x6a,
+	0x80, 0x0b, 0xac, 0x6a,
+	0x10, 0x0c, 0xac, 0x7a,
+	0x20, 0x93, 0xac, 0x6a,
 	0x02, 0x93, 0x26, 0x01,
-	0x02, 0xfc, 0xb4, 0x7a,
-	0x40, 0x0d, 0xce, 0x6a,
+	0x02, 0xfc, 0xc0, 0x7a,
+	0x40, 0x0d, 0xda, 0x6a,
 	0x01, 0xa4, 0x48, 0x01,
-	0x00, 0x65, 0xce, 0x42,
-	0x40, 0x0d, 0xba, 0x6a,
-	0x00, 0x65, 0x02, 0x5a,
-	0x00, 0x65, 0xac, 0x42,
-	0x80, 0xfc, 0xc4, 0x7a,
-	0x80, 0xa4, 0xc4, 0x6a,
+	0x00, 0x65, 0xda, 0x42,
+	0x40, 0x0d, 0xc6, 0x6a,
+	0x00, 0x65, 0x0e, 0x5a,
+	0x00, 0x65, 0xb8, 0x42,
+	0x80, 0xfc, 0xd0, 0x7a,
+	0x80, 0xa4, 0xd0, 0x6a,
 	0xff, 0xa5, 0x4a, 0x19,
 	0xff, 0xa6, 0x4c, 0x21,
 	0xff, 0xa7, 0x4e, 0x21,
 	0xf8, 0xfc, 0x48, 0x09,
 	0xff, 0x6a, 0xaa, 0x08,
-	0x04, 0xfc, 0xcc, 0x7a,
+	0x04, 0xfc, 0xd8, 0x7a,
 	0x01, 0x55, 0xaa, 0x00,
 	0xff, 0x6a, 0x46, 0x09,
-	0x04, 0x3b, 0xe6, 0x6a,
+	0x04, 0x3b, 0xf2, 0x6a,
 	0x02, 0x93, 0x26, 0x01,
-	0x01, 0x94, 0xd0, 0x7a,
-	0x01, 0x94, 0xd0, 0x7a,
-	0x01, 0x94, 0xd0, 0x7a,
-	0x01, 0x94, 0xd0, 0x7a,
-	0x01, 0x94, 0xd0, 0x7a,
-	0x01, 0xa4, 0xe4, 0x7a,
-	0x01, 0xfc, 0xde, 0x7a,
-	0x01, 0x94, 0xe6, 0x6a,
-	0x00, 0x65, 0x80, 0x42,
-	0x01, 0x94, 0xe4, 0x7a,
-	0x10, 0x94, 0xe6, 0x6a,
+	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,
 	0xd7, 0x93, 0x26, 0x09,
-	0x28, 0x93, 0xea, 0x6a,
+	0x28, 0x93, 0xf6, 0x6a,
 	0x01, 0x85, 0x0a, 0x01,
-	0x02, 0xfc, 0xf2, 0x6a,
+	0x02, 0xfc, 0xfe, 0x6a,
 	0x01, 0x14, 0x46, 0x31,
 	0xff, 0x6a, 0x10, 0x09,
 	0xfe, 0x85, 0x0a, 0x09,
-	0xff, 0x38, 0x00, 0x6b,
-	0x80, 0xa3, 0x00, 0x7b,
-	0x80, 0x0b, 0xfe, 0x7a,
-	0x04, 0x3b, 0x00, 0x7b,
+	0xff, 0x38, 0x0c, 0x6b,
+	0x80, 0xa3, 0x0c, 0x7b,
+	0x80, 0x0b, 0x0a, 0x7b,
+	0x04, 0x3b, 0x0c, 0x7b,
 	0xbf, 0x3b, 0x76, 0x08,
 	0x01, 0x3b, 0x26, 0x31,
-	0x00, 0x65, 0x02, 0x5a,
-	0x01, 0x0b, 0x0e, 0x6b,
-	0x10, 0x0c, 0x02, 0x7b,
-	0x04, 0x93, 0x0c, 0x6b,
-	0x01, 0x94, 0x0a, 0x7b,
-	0x10, 0x94, 0x0c, 0x6b,
+	0x00, 0x65, 0x0e, 0x5a,
+	0x01, 0x0b, 0x1a, 0x6b,
+	0x10, 0x0c, 0x0e, 0x7b,
+	0x04, 0x93, 0x18, 0x6b,
+	0x01, 0x94, 0x16, 0x7b,
+	0x10, 0x94, 0x18, 0x6b,
 	0xc7, 0x93, 0x26, 0x09,
 	0x01, 0x99, 0xd4, 0x30,
-	0x38, 0x93, 0x10, 0x6b,
-	0xff, 0x08, 0x62, 0x6b,
-	0xff, 0x09, 0x62, 0x6b,
-	0xff, 0x0a, 0x62, 0x6b,
-	0xff, 0x38, 0x2c, 0x7b,
+	0x38, 0x93, 0x1c, 0x6b,
+	0xff, 0x08, 0x6e, 0x6b,
+	0xff, 0x09, 0x6e, 0x6b,
+	0xff, 0x0a, 0x6e, 0x6b,
+	0xff, 0x38, 0x38, 0x7b,
 	0x04, 0x14, 0x10, 0x31,
 	0x01, 0x38, 0x18, 0x31,
 	0x02, 0x6a, 0x1a, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x14, 0x6a, 0xde, 0x5d,
-	0x00, 0x38, 0xca, 0x5d,
+	0x14, 0x6a, 0x08, 0x5e,
+	0x00, 0x38, 0xf4, 0x5d,
 	0xff, 0x6a, 0x70, 0x08,
-	0x00, 0x65, 0x58, 0x43,
-	0x80, 0xa3, 0x32, 0x7b,
+	0x00, 0x65, 0x64, 0x43,
+	0x80, 0xa3, 0x3e, 0x7b,
 	0x01, 0xa4, 0x48, 0x01,
-	0x00, 0x65, 0x62, 0x43,
-	0x08, 0xeb, 0x38, 0x7b,
-	0x00, 0x65, 0x02, 0x5a,
-	0x08, 0xeb, 0x34, 0x6b,
+	0x00, 0x65, 0x6e, 0x43,
+	0x08, 0xeb, 0x44, 0x7b,
+	0x00, 0x65, 0x0e, 0x5a,
+	0x08, 0xeb, 0x40, 0x6b,
 	0x07, 0xe9, 0x10, 0x31,
 	0x01, 0xe9, 0xca, 0x30,
 	0x01, 0x65, 0x46, 0x31,
-	0x00, 0x6a, 0xa4, 0x5e,
+	0x00, 0x6a, 0xce, 0x5e,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xa4, 0x6a, 0xde, 0x5d,
-	0x08, 0x6a, 0xca, 0x5d,
+	0xa4, 0x6a, 0x08, 0x5e,
+	0x08, 0x6a, 0xf4, 0x5d,
 	0x0d, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x92, 0x5e,
+	0x00, 0x65, 0xbc, 0x5e,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x00, 0x65, 0x74, 0x5e,
+	0x00, 0x65, 0x9e, 0x5e,
 	0x01, 0x99, 0x46, 0x31,
-	0x00, 0xa3, 0xa4, 0x5e,
+	0x00, 0xa3, 0xce, 0x5e,
 	0x01, 0x88, 0x10, 0x31,
-	0x00, 0x65, 0x36, 0x5a,
-	0x00, 0x65, 0xee, 0x59,
+	0x00, 0x65, 0x42, 0x5a,
+	0x00, 0x65, 0xfa, 0x59,
 	0x03, 0x8c, 0x10, 0x30,
-	0x00, 0x65, 0xd0, 0x5d,
-	0x01, 0x8c, 0x60, 0x7b,
+	0x00, 0x65, 0xfa, 0x5d,
+	0x01, 0x8c, 0x6c, 0x7b,
 	0x01, 0x55, 0xaa, 0x10,
-	0x80, 0x0b, 0x80, 0x6a,
-	0x80, 0x0b, 0x6a, 0x6b,
-	0x01, 0x0c, 0x64, 0x7b,
-	0x10, 0x0c, 0x80, 0x7a,
-	0x03, 0x9e, 0x80, 0x6a,
-	0x00, 0x65, 0xf8, 0x59,
-	0x00, 0x6a, 0xa4, 0x5e,
-	0x01, 0xa4, 0x8a, 0x6b,
-	0xff, 0x38, 0x80, 0x7b,
+	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,
 	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, 0x82, 0x43,
+	0x00, 0x65, 0x8e, 0x43,
 	0x03, 0x08, 0x40, 0x31,
 	0x03, 0x08, 0x40, 0x31,
 	0x01, 0x08, 0x40, 0x31,
@@ -463,14 +469,19 @@ static const u_int8_t seqprog[] = {
 	0xfd, 0xb4, 0x68, 0x09,
 	0x12, 0x01, 0x02, 0x00,
 	0x12, 0x01, 0x02, 0x00,
-	0x04, 0x3c, 0xc0, 0x79,
+	0x04, 0x3c, 0xcc, 0x79,
 	0xfb, 0x3c, 0x78, 0x08,
-	0x04, 0x93, 0x30, 0x79,
-	0x01, 0x0c, 0x96, 0x6b,
-	0x00, 0x65, 0x30, 0x41,
-	0x00, 0x65, 0xc0, 0x41,
-	0x80, 0x3c, 0xa0, 0x6b,
-	0x21, 0x6a, 0xc2, 0x46,
+	0x04, 0x93, 0x20, 0x79,
+	0x01, 0x0c, 0xa2, 0x6b,
+	0x01, 0x55, 0x20, 0x79,
+	0x80, 0x04, 0x20, 0x79,
+	0xe4, 0x6a, 0x82, 0x5d,
+	0x23, 0x6a, 0x98, 0x5d,
+	0x01, 0x6a, 0x98, 0x5d,
+	0x00, 0x65, 0x20, 0x41,
+	0x00, 0x65, 0xcc, 0x41,
+	0x80, 0x3c, 0xb6, 0x7b,
+	0x21, 0x6a, 0xec, 0x5e,
 	0x01, 0xbc, 0x18, 0x31,
 	0x02, 0x6a, 0x1a, 0x31,
 	0x02, 0x6a, 0xf8, 0x01,
@@ -480,16 +491,16 @@ static const u_int8_t seqprog[] = {
 	0xff, 0x6a, 0x12, 0x08,
 	0xff, 0x6a, 0x14, 0x08,
 	0xf3, 0xbc, 0xd4, 0x18,
-	0xa0, 0x6a, 0xc6, 0x53,
+	0xa0, 0x6a, 0xdc, 0x53,
 	0x04, 0xa0, 0x10, 0x31,
 	0xac, 0x6a, 0x26, 0x01,
 	0x04, 0xa0, 0x10, 0x31,
 	0x03, 0x08, 0x18, 0x31,
 	0x88, 0x6a, 0xcc, 0x00,
-	0xa0, 0x6a, 0xde, 0x5d,
-	0x00, 0xbc, 0xca, 0x5d,
+	0xa0, 0x6a, 0x08, 0x5e,
+	0x00, 0xbc, 0xf4, 0x5d,
 	0x3d, 0x6a, 0x26, 0x01,
-	0x00, 0x65, 0xde, 0x43,
+	0x00, 0x65, 0xf4, 0x43,
 	0xff, 0x6a, 0x10, 0x09,
 	0xa4, 0x6a, 0x26, 0x01,
 	0x0c, 0xa0, 0x32, 0x31,
@@ -499,118 +510,128 @@ static const u_int8_t seqprog[] = {
 	0x36, 0x6a, 0x26, 0x01,
 	0x02, 0x93, 0x26, 0x01,
 	0x35, 0x6a, 0x26, 0x01,
-	0x00, 0x65, 0x86, 0x5e,
-	0x00, 0x65, 0x86, 0x5e,
+	0x00, 0x65, 0xb0, 0x5e,
+	0x00, 0x65, 0xb0, 0x5e,
 	0x02, 0x93, 0x26, 0x01,
-	0x04, 0x0b, 0xe2, 0x6b,
-	0x10, 0x0c, 0xde, 0x7b,
-	0x01, 0x03, 0xe2, 0x6b,
-	0x20, 0x93, 0xde, 0x6b,
+	0xbf, 0x3c, 0x78, 0x08,
+	0x04, 0x0b, 0xfa, 0x6b,
+	0x10, 0x0c, 0xf6, 0x7b,
+	0x01, 0x03, 0xfa, 0x6b,
+	0x20, 0x93, 0xfc, 0x6b,
+	0x04, 0x0b, 0x02, 0x6c,
+	0x40, 0x3c, 0x78, 0x00,
 	0xc7, 0x93, 0x26, 0x09,
-	0x38, 0x93, 0xe8, 0x6b,
-	0x10, 0x01, 0x02, 0x00,
-	0x00, 0x65, 0xc0, 0x41,
-	0x80, 0x3c, 0xf2, 0x6b,
-	0x21, 0x6a, 0xc2, 0x46,
+	0x38, 0x93, 0x04, 0x6c,
+	0x00, 0x65, 0xcc, 0x41,
+	0x80, 0x3c, 0x6a, 0x6c,
 	0x01, 0x06, 0x50, 0x31,
-	0x00, 0x65, 0xc0, 0x41,
+	0x80, 0xb8, 0x70, 0x01,
+	0x00, 0x65, 0xcc, 0x41,
 	0x10, 0x3f, 0x06, 0x00,
 	0x10, 0x6a, 0x06, 0x00,
 	0x01, 0x3a, 0xca, 0x30,
-	0x80, 0x65, 0x16, 0x64,
-	0x10, 0xb8, 0x3a, 0x6c,
+	0x80, 0x65, 0x30, 0x64,
+	0x10, 0xb8, 0x54, 0x6c,
 	0xc0, 0xba, 0xca, 0x00,
-	0x40, 0xb8, 0x06, 0x6c,
+	0x40, 0xb8, 0x20, 0x6c,
 	0xbf, 0x65, 0xca, 0x08,
-	0x20, 0xb8, 0x1a, 0x7c,
+	0x20, 0xb8, 0x34, 0x7c,
 	0x01, 0x65, 0x0c, 0x30,
-	0x00, 0x65, 0xc2, 0x5d,
-	0xa0, 0x3f, 0x22, 0x64,
+	0x00, 0x65, 0xec, 0x5d,
+	0xa0, 0x3f, 0x3c, 0x64,
 	0x23, 0xb8, 0x0c, 0x08,
-	0x00, 0x65, 0xc2, 0x5d,
-	0xa0, 0x3f, 0x22, 0x64,
-	0x00, 0xbb, 0x1a, 0x44,
-	0xff, 0x65, 0x1a, 0x64,
-	0x00, 0x65, 0x3a, 0x44,
+	0x00, 0x65, 0xec, 0x5d,
+	0xa0, 0x3f, 0x3c, 0x64,
+	0x00, 0xbb, 0x34, 0x44,
+	0xff, 0x65, 0x34, 0x64,
+	0x00, 0x65, 0x54, 0x44,
 	0x40, 0x6a, 0x18, 0x00,
 	0x01, 0x65, 0x0c, 0x30,
-	0x00, 0x65, 0xc2, 0x5d,
-	0xa0, 0x3f, 0xf6, 0x73,
+	0x00, 0x65, 0xec, 0x5d,
+	0xa0, 0x3f, 0x10, 0x74,
 	0x40, 0x6a, 0x18, 0x00,
 	0x01, 0x3a, 0xa6, 0x30,
 	0x08, 0x6a, 0x74, 0x00,
-	0x00, 0x65, 0xc0, 0x41,
-	0x64, 0x6a, 0x52, 0x5d,
-	0x80, 0x64, 0xc2, 0x6c,
-	0x04, 0x64, 0x86, 0x74,
-	0x02, 0x64, 0x96, 0x74,
-	0x00, 0x6a, 0x56, 0x74,
-	0x03, 0x64, 0xb4, 0x74,
-	0x23, 0x64, 0x42, 0x74,
-	0x08, 0x64, 0x52, 0x74,
-	0x61, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0xc2, 0x5d,
-	0x08, 0x51, 0xc2, 0x71,
-	0x00, 0x65, 0x3a, 0x44,
-	0x80, 0x04, 0x50, 0x7c,
-	0x51, 0x6a, 0x48, 0x5d,
-	0x01, 0x51, 0x50, 0x64,
-	0x01, 0xa4, 0x4c, 0x7c,
-	0x01, 0x55, 0x52, 0x7c,
-	0x41, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0x52, 0x44,
-	0x07, 0x6a, 0x3e, 0x5d,
+	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,
+	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,
 	0x01, 0x06, 0xd4, 0x30,
-	0x00, 0x65, 0xc0, 0x41,
-	0x10, 0xb8, 0x5a, 0x7c,
-	0xa1, 0x6a, 0xc2, 0x5e,
-	0x01, 0xb4, 0x60, 0x6c,
-	0x02, 0xb4, 0x62, 0x6c,
-	0x01, 0xa4, 0x62, 0x7c,
-	0xff, 0xa8, 0x72, 0x7c,
+	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,
 	0x04, 0xb4, 0x68, 0x01,
 	0x01, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0xfc, 0x5d,
-	0xff, 0xa8, 0x72, 0x7c,
-	0x71, 0x6a, 0xc2, 0x5e,
-	0x40, 0x51, 0x72, 0x64,
-	0x00, 0x65, 0x9c, 0x5e,
-	0x00, 0x65, 0xd2, 0x41,
-	0x00, 0xbb, 0x76, 0x5c,
-	0x00, 0x65, 0xd2, 0x41,
-	0x00, 0x65, 0x9c, 0x5e,
+	0x00, 0xbb, 0x26, 0x5e,
+	0xff, 0xa8, 0x9a, 0x7c,
+	0x71, 0x6a, 0xec, 0x5e,
+	0x40, 0x51, 0x9a, 0x64,
+	0x00, 0x65, 0xc6, 0x5e,
+	0x00, 0x65, 0xde, 0x41,
+	0x00, 0xbb, 0x9e, 0x5c,
+	0x00, 0x65, 0xde, 0x41,
+	0x00, 0x65, 0xc6, 0x5e,
 	0x01, 0x65, 0xa2, 0x30,
 	0x01, 0xf8, 0xc8, 0x30,
 	0x01, 0x4e, 0xc8, 0x30,
-	0x00, 0x6a, 0xa0, 0xdd,
-	0x00, 0x51, 0xb2, 0x5d,
+	0x00, 0x6a, 0xca, 0xdd,
+	0x00, 0x51, 0xdc, 0x5d,
 	0x01, 0x4e, 0x9c, 0x18,
 	0x02, 0x6a, 0x22, 0x05,
-	0x10, 0x03, 0x52, 0x6c,
+	0xc0, 0x3c, 0x6a, 0x6c,
 	0x04, 0xb8, 0x70, 0x01,
-	0x00, 0x65, 0xbe, 0x5e,
-	0x20, 0xb8, 0xd2, 0x69,
+	0x00, 0x65, 0xe8, 0x5e,
+	0x20, 0xb8, 0xde, 0x69,
 	0x01, 0xbb, 0xa2, 0x30,
 	0x01, 0xba, 0x7c, 0x30,
-	0x00, 0xb9, 0xb8, 0x5c,
-	0x00, 0x65, 0xd2, 0x41,
+	0x00, 0xb9, 0xe2, 0x5c,
+	0x00, 0x65, 0xde, 0x41,
 	0x01, 0x06, 0xd4, 0x30,
-	0x20, 0x3c, 0xc0, 0x79,
-	0x20, 0x3c, 0x52, 0x7c,
-	0x01, 0xa4, 0xa4, 0x7c,
+	0x20, 0x3c, 0xcc, 0x79,
+	0x20, 0x3c, 0x70, 0x7c,
+	0x01, 0xa4, 0xcc, 0x7c,
 	0x01, 0xb4, 0x68, 0x01,
-	0x00, 0x65, 0xc0, 0x41,
-	0x00, 0x65, 0x52, 0x44,
+	0x00, 0x65, 0xcc, 0x41,
+	0x00, 0x65, 0x70, 0x44,
 	0x04, 0x14, 0x58, 0x31,
 	0x01, 0x06, 0xd4, 0x30,
 	0x08, 0xa0, 0x60, 0x31,
 	0xac, 0x6a, 0xcc, 0x00,
-	0x14, 0x6a, 0xde, 0x5d,
+	0x14, 0x6a, 0x08, 0x5e,
 	0x01, 0x06, 0xd4, 0x30,
-	0xa0, 0x6a, 0xd6, 0x5d,
-	0x00, 0x65, 0xc0, 0x41,
+	0xa0, 0x6a, 0x00, 0x5e,
+	0x00, 0x65, 0xcc, 0x41,
 	0xdf, 0x3c, 0x78, 0x08,
-	0x00, 0x65, 0x52, 0x44,
+	0x12, 0x01, 0x02, 0x00,
+	0x00, 0x65, 0x70, 0x44,
 	0x4c, 0x65, 0xcc, 0x28,
 	0x01, 0x3e, 0x20, 0x31,
 	0xd0, 0x66, 0xcc, 0x18,
@@ -621,102 +642,102 @@ static const u_int8_t seqprog[] = {
 	0xd0, 0x65, 0xca, 0x18,
 	0x01, 0x3e, 0x20, 0x31,
 	0x30, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xd0, 0x4c,
+	0x00, 0x65, 0xfa, 0x4c,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0x20, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xd8, 0x54,
+	0x00, 0x65, 0x02, 0x55,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0x20, 0x65, 0xca, 0x18,
 	0xe0, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xe2, 0x4c,
+	0x00, 0x65, 0x0c, 0x4d,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xd0, 0x65, 0xd4, 0x18,
-	0x00, 0x65, 0xea, 0x54,
+	0x00, 0x65, 0x14, 0x55,
 	0xe1, 0x6a, 0x22, 0x01,
 	0xff, 0x6a, 0xd4, 0x08,
 	0x01, 0x6c, 0xa2, 0x30,
-	0xff, 0x51, 0xfc, 0x74,
-	0x00, 0x51, 0x78, 0x5d,
+	0xff, 0x51, 0x26, 0x75,
+	0x00, 0x51, 0xa2, 0x5d,
 	0x01, 0x51, 0x20, 0x31,
-	0x00, 0x65, 0x1e, 0x45,
+	0x00, 0x65, 0x48, 0x45,
 	0x01, 0xba, 0xc8, 0x30,
-	0x00, 0x3e, 0x1e, 0x75,
-	0x00, 0x65, 0x9a, 0x5e,
+	0x00, 0x3e, 0x48, 0x75,
+	0x00, 0x65, 0xc4, 0x5e,
 	0x80, 0x3c, 0x78, 0x00,
 	0x01, 0x06, 0xd4, 0x30,
-	0x00, 0x65, 0xc2, 0x5d,
+	0x00, 0x65, 0xec, 0x5d,
 	0x01, 0x3c, 0x78, 0x00,
-	0xe0, 0x3f, 0x3a, 0x65,
+	0xe0, 0x3f, 0x64, 0x65,
 	0x02, 0x3c, 0x78, 0x00,
-	0x20, 0x12, 0x3a, 0x65,
-	0x51, 0x6a, 0x48, 0x5d,
-	0x00, 0x51, 0x78, 0x5d,
-	0x51, 0x6a, 0x48, 0x5d,
+	0x20, 0x12, 0x64, 0x65,
+	0x51, 0x6a, 0x72, 0x5d,
+	0x00, 0x51, 0xa2, 0x5d,
+	0x51, 0x6a, 0x72, 0x5d,
 	0x01, 0x51, 0x20, 0x31,
 	0x04, 0x3c, 0x78, 0x00,
 	0x01, 0xb9, 0xc8, 0x30,
-	0x00, 0x3d, 0x38, 0x65,
+	0x00, 0x3d, 0x62, 0x65,
 	0x08, 0x3c, 0x78, 0x00,
 	0x01, 0xba, 0xc8, 0x30,
-	0x00, 0x3e, 0x38, 0x65,
+	0x00, 0x3e, 0x62, 0x65,
 	0x10, 0x3c, 0x78, 0x00,
-	0x04, 0xb8, 0x38, 0x7d,
+	0x04, 0xb8, 0x62, 0x7d,
 	0xfb, 0xb8, 0x70, 0x09,
-	0x20, 0xb8, 0x2e, 0x6d,
+	0x20, 0xb8, 0x58, 0x6d,
 	0x01, 0x90, 0xc8, 0x30,
 	0xff, 0x6a, 0xa2, 0x00,
-	0x00, 0x3d, 0xb8, 0x5c,
+	0x00, 0x3d, 0xe2, 0x5c,
 	0x01, 0x64, 0x20, 0x31,
-	0x80, 0x6a, 0x78, 0x00,
-	0x00, 0x65, 0xfe, 0x58,
-	0x10, 0xb8, 0x52, 0x7c,
-	0xff, 0x6a, 0x3e, 0x5d,
-	0x00, 0x65, 0x52, 0x44,
-	0x00, 0x65, 0x9a, 0x5e,
-	0x31, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0x52, 0x44,
+	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, 0x3f, 0x06, 0x00,
 	0x10, 0x6a, 0x06, 0x00,
 	0x01, 0x65, 0x74, 0x34,
-	0x81, 0x6a, 0xc2, 0x5e,
-	0x00, 0x65, 0x4a, 0x45,
+	0x81, 0x6a, 0xec, 0x5e,
+	0x00, 0x65, 0x74, 0x45,
 	0x01, 0x06, 0xd4, 0x30,
-	0x01, 0x0c, 0x4a, 0x7d,
-	0x04, 0x0c, 0x44, 0x6d,
+	0x01, 0x0c, 0x74, 0x7d,
+	0x04, 0x0c, 0x6e, 0x6d,
 	0xe0, 0x03, 0x7e, 0x08,
-	0xe0, 0x3f, 0xc0, 0x61,
+	0xe0, 0x3f, 0xcc, 0x61,
 	0x01, 0x65, 0xcc, 0x30,
 	0x01, 0x12, 0xda, 0x34,
 	0x01, 0x06, 0xd4, 0x34,
-	0x01, 0x03, 0x58, 0x6d,
+	0x01, 0x03, 0x82, 0x6d,
 	0x40, 0x03, 0xcc, 0x08,
 	0x01, 0x65, 0x06, 0x30,
 	0x40, 0x65, 0xc8, 0x08,
-	0x00, 0x66, 0x66, 0x75,
-	0x40, 0x65, 0x66, 0x7d,
-	0x00, 0x65, 0x66, 0x5d,
+	0x00, 0x66, 0x90, 0x75,
+	0x40, 0x65, 0x90, 0x7d,
+	0x00, 0x65, 0x90, 0x5d,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x08,
 	0xff, 0x6a, 0xd4, 0x0c,
 	0x08, 0x01, 0x02, 0x00,
-	0x02, 0x0b, 0x70, 0x7d,
+	0x02, 0x0b, 0x9a, 0x7d,
 	0x01, 0x65, 0x0c, 0x30,
-	0x02, 0x0b, 0x74, 0x7d,
+	0x02, 0x0b, 0x9e, 0x7d,
 	0xf7, 0x01, 0x02, 0x0c,
 	0x01, 0x65, 0xc8, 0x30,
-	0xff, 0x41, 0x98, 0x75,
+	0xff, 0x41, 0xc2, 0x75,
 	0x01, 0x41, 0x20, 0x31,
 	0xff, 0x6a, 0xa4, 0x00,
-	0x00, 0x65, 0x88, 0x45,
-	0xff, 0xbf, 0x98, 0x75,
+	0x00, 0x65, 0xb2, 0x45,
+	0xff, 0xbf, 0xc2, 0x75,
 	0x01, 0x90, 0xa4, 0x30,
 	0x01, 0xbf, 0x20, 0x31,
-	0x00, 0xbb, 0x82, 0x65,
-	0xff, 0x52, 0x96, 0x75,
+	0x00, 0xbb, 0xac, 0x65,
+	0xff, 0x52, 0xc0, 0x75,
 	0x01, 0xbf, 0xcc, 0x30,
 	0x01, 0x90, 0xca, 0x30,
 	0x01, 0x52, 0x20, 0x31,
@@ -724,28 +745,28 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x65, 0x20, 0x35,
 	0x01, 0xbf, 0x82, 0x34,
 	0x01, 0x64, 0xa2, 0x30,
-	0x00, 0x6a, 0xaa, 0x5e,
+	0x00, 0x6a, 0xd4, 0x5e,
 	0x0d, 0x6a, 0x76, 0x00,
-	0x00, 0x51, 0xfc, 0x45,
+	0x00, 0x51, 0x26, 0x46,
 	0x01, 0x65, 0xa4, 0x30,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xf0, 0x5d,
+	0x48, 0x6a, 0x1a, 0x5e,
 	0x01, 0x6a, 0xd0, 0x01,
 	0x01, 0x6a, 0xdc, 0x05,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x48, 0x6a, 0xf0, 0x5d,
-	0x01, 0x6a, 0xca, 0x5d,
+	0x48, 0x6a, 0x1a, 0x5e,
+	0x01, 0x6a, 0xf4, 0x5d,
 	0x01, 0x6a, 0x26, 0x05,
 	0x01, 0x65, 0xd8, 0x31,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0xb6, 0x7d,
+	0x80, 0xee, 0xe0, 0x7d,
 	0xff, 0x6a, 0xdc, 0x0d,
 	0x01, 0x65, 0x32, 0x31,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x92, 0x46,
-	0x81, 0x6a, 0xc2, 0x5e,
-	0x01, 0x0c, 0xc2, 0x7d,
-	0x04, 0x0c, 0xc0, 0x6d,
+	0x00, 0x65, 0xbc, 0x46,
+	0x81, 0x6a, 0xec, 0x5e,
+	0x01, 0x0c, 0xec, 0x7d,
+	0x04, 0x0c, 0xea, 0x6d,
 	0xe0, 0x03, 0x06, 0x08,
 	0xe0, 0x03, 0x7e, 0x0c,
 	0x01, 0x65, 0x18, 0x31,
@@ -764,7 +785,7 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x6c, 0xda, 0x34,
 	0x3d, 0x64, 0xa4, 0x28,
 	0x55, 0x64, 0xc8, 0x28,
-	0x00, 0x65, 0xf0, 0x45,
+	0x00, 0x65, 0x1a, 0x46,
 	0x2e, 0x64, 0xa4, 0x28,
 	0x66, 0x64, 0xc8, 0x28,
 	0x00, 0x6c, 0xda, 0x18,
@@ -775,63 +796,63 @@ static const u_int8_t seqprog[] = {
 	0x00, 0x6c, 0xda, 0x24,
 	0x01, 0x65, 0xc8, 0x30,
 	0xe0, 0x6a, 0xcc, 0x00,
-	0x44, 0x6a, 0xec, 0x5d,
+	0x44, 0x6a, 0x16, 0x5e,
 	0x01, 0x90, 0xe2, 0x31,
-	0x04, 0x3b, 0x10, 0x7e,
+	0x04, 0x3b, 0x3a, 0x7e,
 	0x30, 0x6a, 0xd0, 0x01,
 	0x20, 0x6a, 0xd0, 0x01,
 	0x1d, 0x6a, 0xdc, 0x01,
-	0xdc, 0xee, 0x0c, 0x66,
-	0x00, 0x65, 0x28, 0x46,
+	0xdc, 0xee, 0x36, 0x66,
+	0x00, 0x65, 0x52, 0x46,
 	0x20, 0x6a, 0xd0, 0x01,
 	0x01, 0x6a, 0xdc, 0x01,
 	0x20, 0xa0, 0xd8, 0x31,
 	0x09, 0xee, 0xdc, 0x01,
-	0x80, 0xee, 0x18, 0x7e,
+	0x80, 0xee, 0x42, 0x7e,
 	0x11, 0x6a, 0xdc, 0x01,
-	0x50, 0xee, 0x1c, 0x66,
+	0x50, 0xee, 0x46, 0x66,
 	0x20, 0x6a, 0xd0, 0x01,
 	0x09, 0x6a, 0xdc, 0x01,
-	0x88, 0xee, 0x22, 0x66,
+	0x88, 0xee, 0x4c, 0x66,
 	0x19, 0x6a, 0xdc, 0x01,
-	0xd8, 0xee, 0x26, 0x66,
+	0xd8, 0xee, 0x50, 0x66,
 	0xff, 0x6a, 0xdc, 0x09,
-	0x18, 0xee, 0x2a, 0x6e,
+	0x18, 0xee, 0x54, 0x6e,
 	0xff, 0x6a, 0xd4, 0x0c,
 	0x88, 0x6a, 0xcc, 0x00,
-	0x44, 0x6a, 0xec, 0x5d,
-	0x20, 0x6a, 0xca, 0x5d,
+	0x44, 0x6a, 0x16, 0x5e,
+	0x20, 0x6a, 0xf4, 0x5d,
 	0x01, 0x3b, 0x26, 0x31,
-	0x04, 0x3b, 0x44, 0x6e,
+	0x04, 0x3b, 0x6e, 0x6e,
 	0xa0, 0x6a, 0xca, 0x00,
 	0x20, 0x65, 0xc8, 0x18,
-	0x00, 0x65, 0x82, 0x5e,
-	0x00, 0x65, 0x3c, 0x66,
+	0x00, 0x65, 0xac, 0x5e,
+	0x00, 0x65, 0x66, 0x66,
 	0x0a, 0x93, 0x26, 0x01,
-	0x00, 0x65, 0x92, 0x46,
+	0x00, 0x65, 0xbc, 0x46,
 	0xa0, 0x6a, 0xcc, 0x00,
 	0xff, 0x6a, 0xc8, 0x08,
-	0x20, 0x94, 0x48, 0x6e,
-	0x10, 0x94, 0x4a, 0x6e,
-	0x08, 0x94, 0x64, 0x6e,
-	0x08, 0x94, 0x64, 0x6e,
-	0x08, 0x94, 0x64, 0x6e,
+	0x20, 0x94, 0x72, 0x6e,
+	0x10, 0x94, 0x74, 0x6e,
+	0x08, 0x94, 0x8e, 0x6e,
+	0x08, 0x94, 0x8e, 0x6e,
+	0x08, 0x94, 0x8e, 0x6e,
 	0xff, 0x8c, 0xc8, 0x10,
 	0xc1, 0x64, 0xc8, 0x18,
 	0xf8, 0x64, 0xc8, 0x08,
 	0x01, 0x99, 0xda, 0x30,
-	0x00, 0x66, 0x58, 0x66,
-	0xc0, 0x66, 0x94, 0x76,
+	0x00, 0x66, 0x82, 0x66,
+	0xc0, 0x66, 0xbe, 0x76,
 	0x60, 0x66, 0xc8, 0x18,
 	0x3d, 0x64, 0xc8, 0x28,
-	0x00, 0x65, 0x48, 0x46,
+	0x00, 0x65, 0x72, 0x46,
 	0xf7, 0x93, 0x26, 0x09,
-	0x08, 0x93, 0x66, 0x6e,
+	0x08, 0x93, 0x90, 0x6e,
 	0x00, 0x62, 0xc4, 0x18,
-	0x00, 0x65, 0x92, 0x5e,
-	0x00, 0x65, 0x72, 0x5e,
-	0x00, 0x65, 0x72, 0x5e,
-	0x00, 0x65, 0x72, 0x5e,
+	0x00, 0x65, 0xbc, 0x5e,
+	0x00, 0x65, 0x9c, 0x5e,
+	0x00, 0x65, 0x9c, 0x5e,
+	0x00, 0x65, 0x9c, 0x5e,
 	0x01, 0x99, 0xda, 0x30,
 	0x01, 0x99, 0xda, 0x30,
 	0x01, 0x99, 0xda, 0x30,
@@ -848,11 +869,11 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x6c, 0x32, 0x31,
 	0x01, 0x6c, 0x32, 0x31,
 	0x01, 0x6c, 0x32, 0x35,
-	0x08, 0x94, 0x92, 0x7e,
+	0x08, 0x94, 0xbc, 0x7e,
 	0xf7, 0x93, 0x26, 0x09,
-	0x08, 0x93, 0x96, 0x6e,
+	0x08, 0x93, 0xc0, 0x6e,
 	0xff, 0x6a, 0xd4, 0x0c,
-	0x04, 0xb8, 0xbe, 0x6e,
+	0x04, 0xb8, 0xe8, 0x6e,
 	0x01, 0x42, 0x7e, 0x31,
 	0xff, 0x6a, 0x76, 0x01,
 	0x01, 0x90, 0x84, 0x34,
@@ -860,14 +881,14 @@ static const u_int8_t seqprog[] = {
 	0x01, 0x85, 0x0a, 0x01,
 	0x7f, 0x65, 0x10, 0x09,
 	0xfe, 0x85, 0x0a, 0x0d,
-	0xff, 0x42, 0xba, 0x66,
-	0xff, 0x41, 0xb2, 0x66,
-	0xd1, 0x6a, 0xc2, 0x5e,
+	0xff, 0x42, 0xe4, 0x66,
+	0xff, 0x41, 0xdc, 0x66,
+	0xd1, 0x6a, 0xec, 0x5e,
 	0xff, 0x6a, 0xca, 0x04,
 	0x01, 0x41, 0x20, 0x31,
 	0x01, 0xbf, 0x82, 0x30,
 	0x01, 0x6a, 0x76, 0x00,
-	0x00, 0xbb, 0xfc, 0x45,
+	0x00, 0xbb, 0x26, 0x46,
 	0x01, 0x42, 0x20, 0x31,
 	0x01, 0xbf, 0x84, 0x34,
 	0x01, 0x41, 0x7e, 0x31,
@@ -877,421 +898,420 @@ static const u_int8_t seqprog[] = {
 	0xff, 0x6a, 0xd4, 0x0c
 };
 
-static int aic_patch23_func(struct ahc_softc *ahc);
+typedef int ahc_patch_func_t (struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch23_func;
 
 static int
-aic_patch23_func(struct ahc_softc *ahc)
+ahc_patch23_func(struct ahc_softc *ahc)
 {
 	return ((ahc->bugs & AHC_SCBCHAN_UPLOAD_BUG) != 0);
 }
 
-static int aic_patch22_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch22_func;
 
 static int
-aic_patch22_func(struct ahc_softc *ahc)
+ahc_patch22_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_CMD_CHAN) == 0);
 }
 
-static int aic_patch21_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch21_func;
 
 static int
-aic_patch21_func(struct ahc_softc *ahc)
+ahc_patch21_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_QUEUE_REGS) == 0);
 }
 
-static int aic_patch20_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch20_func;
 
 static int
-aic_patch20_func(struct ahc_softc *ahc)
+ahc_patch20_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_WIDE) != 0);
 }
 
-static int aic_patch19_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch19_func;
 
 static int
-aic_patch19_func(struct ahc_softc *ahc)
+ahc_patch19_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_SCB_BTT) != 0);
 }
 
-static int aic_patch18_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch18_func;
 
 static int
-aic_patch18_func(struct ahc_softc *ahc)
+ahc_patch18_func(struct ahc_softc *ahc)
 {
 	return ((ahc->bugs & AHC_PCI_2_1_RETRY_BUG) != 0);
 }
 
-static int aic_patch17_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch17_func;
 
 static int
-aic_patch17_func(struct ahc_softc *ahc)
+ahc_patch17_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0);
 }
 
-static int aic_patch16_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch16_func;
 
 static int
-aic_patch16_func(struct ahc_softc *ahc)
+ahc_patch16_func(struct ahc_softc *ahc)
 {
 	return ((ahc->bugs & AHC_AUTOFLUSH_BUG) != 0);
 }
 
-static int aic_patch15_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch15_func;
 
 static int
-aic_patch15_func(struct ahc_softc *ahc)
+ahc_patch15_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_ULTRA2) == 0);
 }
 
-static int aic_patch14_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch14_func;
 
 static int
-aic_patch14_func(struct ahc_softc *ahc)
+ahc_patch14_func(struct ahc_softc *ahc)
 {
 	return ((ahc->bugs & AHC_PCI_MWI_BUG) != 0 && ahc->pci_cachesize != 0);
 }
 
-static int aic_patch13_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch13_func;
 
 static int
-aic_patch13_func(struct ahc_softc *ahc)
+ahc_patch13_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_39BIT_ADDRESSING) != 0);
 }
 
-static int aic_patch12_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch12_func;
 
 static int
-aic_patch12_func(struct ahc_softc *ahc)
+ahc_patch12_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_ULTRA) != 0);
+	return ((ahc->features & AHC_HS_MAILBOX) != 0);
 }
 
-static int aic_patch11_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch11_func;
 
 static int
-aic_patch11_func(struct ahc_softc *ahc)
+ahc_patch11_func(struct ahc_softc *ahc)
 {
-	return ((ahc->features & AHC_HS_MAILBOX) != 0);
+	return ((ahc->features & AHC_ULTRA) != 0);
 }
 
-static int aic_patch10_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch10_func;
 
 static int
-aic_patch10_func(struct ahc_softc *ahc)
+ahc_patch10_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_MULTI_TID) != 0);
 }
 
-static int aic_patch9_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch9_func;
 
 static int
-aic_patch9_func(struct ahc_softc *ahc)
+ahc_patch9_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_CMD_CHAN) != 0);
 }
 
-static int aic_patch8_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch8_func;
 
 static int
-aic_patch8_func(struct ahc_softc *ahc)
+ahc_patch8_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_INITIATORROLE) != 0);
 }
 
-static int aic_patch7_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch7_func;
 
 static int
-aic_patch7_func(struct ahc_softc *ahc)
+ahc_patch7_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_TARGETROLE) != 0);
 }
 
-static int aic_patch6_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch6_func;
 
 static int
-aic_patch6_func(struct ahc_softc *ahc)
+ahc_patch6_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_DT) == 0);
 }
 
-static int aic_patch5_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch5_func;
 
 static int
-aic_patch5_func(struct ahc_softc *ahc)
+ahc_patch5_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0);
 }
 
-static int aic_patch4_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch4_func;
 
 static int
-aic_patch4_func(struct ahc_softc *ahc)
+ahc_patch4_func(struct ahc_softc *ahc)
 {
 	return ((ahc->flags & AHC_PAGESCBS) != 0);
 }
 
-static int aic_patch3_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch3_func;
 
 static int
-aic_patch3_func(struct ahc_softc *ahc)
+ahc_patch3_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_QUEUE_REGS) != 0);
 }
 
-static int aic_patch2_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch2_func;
 
 static int
-aic_patch2_func(struct ahc_softc *ahc)
+ahc_patch2_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_TWIN) != 0);
 }
 
-static int aic_patch1_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch1_func;
 
 static int
-aic_patch1_func(struct ahc_softc *ahc)
+ahc_patch1_func(struct ahc_softc *ahc)
 {
 	return ((ahc->features & AHC_ULTRA2) != 0);
 }
 
-static int aic_patch0_func(struct ahc_softc *ahc);
+static ahc_patch_func_t ahc_patch0_func;
 
 static int
-aic_patch0_func(struct ahc_softc *ahc)
+ahc_patch0_func(struct ahc_softc *ahc)
 {
 	return (0);
 }
 
-typedef int patch_func_t (struct ahc_softc *ahc);
 static struct patch {
-	patch_func_t	*patch_func;
-	uint32_t	begin	   :10,
-			skip_instr :10,
-			skip_patch :12;
-} const patches[] = {
-	{ aic_patch1_func, 4, 1, 1 },
-	{ aic_patch2_func, 6, 2, 1 },
-	{ aic_patch2_func, 9, 1, 1 },
-	{ aic_patch3_func, 11, 1, 2 },
-	{ aic_patch0_func, 12, 2, 1 },
-	{ aic_patch4_func, 15, 1, 2 },
-	{ aic_patch0_func, 16, 1, 1 },
-	{ aic_patch5_func, 22, 2, 1 },
-	{ aic_patch3_func, 27, 1, 2 },
-	{ aic_patch0_func, 28, 1, 1 },
-	{ aic_patch6_func, 34, 1, 1 },
-	{ aic_patch7_func, 37, 62, 21 },
-	{ aic_patch8_func, 37, 1, 1 },
-	{ aic_patch9_func, 42, 3, 2 },
-	{ aic_patch0_func, 45, 3, 1 },
-	{ aic_patch10_func, 49, 1, 2 },
-	{ aic_patch0_func, 50, 2, 3 },
-	{ aic_patch1_func, 50, 1, 2 },
-	{ aic_patch0_func, 51, 1, 1 },
-	{ aic_patch2_func, 53, 2, 1 },
-	{ aic_patch9_func, 55, 1, 2 },
-	{ aic_patch0_func, 56, 1, 1 },
-	{ aic_patch9_func, 60, 1, 2 },
-	{ aic_patch0_func, 61, 1, 1 },
-	{ aic_patch9_func, 70, 1, 2 },
-	{ aic_patch0_func, 71, 1, 1 },
-	{ aic_patch9_func, 74, 1, 2 },
-	{ aic_patch0_func, 75, 1, 1 },
-	{ aic_patch11_func, 85, 1, 2 },
-	{ aic_patch0_func, 86, 1, 1 },
-	{ aic_patch9_func, 94, 1, 2 },
-	{ aic_patch0_func, 95, 1, 1 },
-	{ aic_patch8_func, 99, 10, 4 },
-	{ aic_patch1_func, 102, 1, 2 },
-	{ aic_patch0_func, 103, 1, 1 },
-	{ aic_patch2_func, 105, 2, 1 },
-	{ aic_patch2_func, 114, 4, 1 },
-	{ aic_patch1_func, 118, 1, 2 },
-	{ aic_patch0_func, 119, 2, 3 },
-	{ aic_patch2_func, 119, 1, 2 },
-	{ aic_patch0_func, 120, 1, 1 },
-	{ aic_patch7_func, 121, 4, 2 },
-	{ aic_patch0_func, 125, 1, 1 },
-	{ aic_patch12_func, 127, 2, 1 },
-	{ aic_patch1_func, 129, 1, 2 },
-	{ aic_patch0_func, 130, 1, 1 },
-	{ aic_patch7_func, 131, 4, 1 },
-	{ aic_patch7_func, 142, 80, 9 },
-	{ aic_patch4_func, 160, 1, 1 },
-	{ aic_patch1_func, 173, 1, 1 },
-	{ aic_patch9_func, 181, 1, 2 },
-	{ aic_patch0_func, 182, 1, 1 },
-	{ aic_patch9_func, 191, 1, 2 },
-	{ aic_patch0_func, 192, 1, 1 },
-	{ aic_patch9_func, 208, 6, 2 },
-	{ aic_patch0_func, 214, 6, 1 },
-	{ aic_patch8_func, 222, 18, 2 },
-	{ aic_patch1_func, 235, 1, 1 },
-	{ aic_patch1_func, 242, 1, 2 },
-	{ aic_patch0_func, 243, 2, 2 },
-	{ aic_patch12_func, 244, 1, 1 },
-	{ aic_patch9_func, 252, 31, 3 },
-	{ aic_patch1_func, 268, 14, 2 },
-	{ aic_patch13_func, 273, 1, 1 },
-	{ aic_patch14_func, 283, 14, 1 },
-	{ aic_patch1_func, 299, 1, 2 },
-	{ aic_patch0_func, 300, 1, 1 },
-	{ aic_patch9_func, 303, 1, 1 },
-	{ aic_patch13_func, 308, 1, 1 },
-	{ aic_patch9_func, 309, 2, 2 },
-	{ aic_patch0_func, 311, 4, 1 },
-	{ aic_patch14_func, 315, 1, 1 },
-	{ aic_patch15_func, 318, 2, 3 },
-	{ aic_patch9_func, 318, 1, 2 },
-	{ aic_patch0_func, 319, 1, 1 },
-	{ aic_patch6_func, 324, 1, 2 },
-	{ aic_patch0_func, 325, 1, 1 },
-	{ aic_patch1_func, 329, 50, 11 },
-	{ aic_patch6_func, 338, 2, 4 },
-	{ aic_patch7_func, 338, 1, 1 },
-	{ aic_patch8_func, 339, 1, 1 },
-	{ aic_patch0_func, 340, 1, 1 },
-	{ aic_patch16_func, 341, 1, 1 },
-	{ aic_patch6_func, 360, 6, 3 },
-	{ aic_patch16_func, 360, 5, 1 },
-	{ aic_patch0_func, 366, 5, 1 },
-	{ aic_patch13_func, 374, 5, 1 },
-	{ aic_patch0_func, 379, 54, 17 },
-	{ aic_patch14_func, 379, 1, 1 },
-	{ aic_patch7_func, 381, 2, 2 },
-	{ aic_patch17_func, 382, 1, 1 },
-	{ aic_patch9_func, 385, 1, 1 },
-	{ aic_patch18_func, 392, 1, 1 },
-	{ aic_patch14_func, 397, 9, 3 },
-	{ aic_patch9_func, 398, 3, 2 },
-	{ aic_patch0_func, 401, 3, 1 },
-	{ aic_patch9_func, 409, 6, 2 },
-	{ aic_patch0_func, 415, 9, 2 },
-	{ aic_patch13_func, 415, 1, 1 },
-	{ aic_patch13_func, 424, 2, 1 },
-	{ aic_patch14_func, 426, 1, 1 },
-	{ aic_patch9_func, 428, 1, 2 },
-	{ aic_patch0_func, 429, 1, 1 },
-	{ aic_patch7_func, 432, 1, 1 },
-	{ aic_patch7_func, 433, 1, 1 },
-	{ aic_patch8_func, 434, 3, 3 },
-	{ aic_patch6_func, 435, 1, 2 },
-	{ aic_patch0_func, 436, 1, 1 },
-	{ aic_patch9_func, 437, 1, 1 },
-	{ aic_patch15_func, 438, 1, 2 },
-	{ aic_patch13_func, 438, 1, 1 },
-	{ aic_patch14_func, 440, 9, 4 },
-	{ aic_patch9_func, 440, 1, 1 },
-	{ aic_patch9_func, 447, 2, 1 },
-	{ aic_patch0_func, 449, 4, 3 },
-	{ aic_patch9_func, 449, 1, 2 },
-	{ aic_patch0_func, 450, 3, 1 },
-	{ aic_patch1_func, 454, 2, 1 },
-	{ aic_patch7_func, 456, 5, 2 },
-	{ aic_patch0_func, 461, 1, 1 },
-	{ aic_patch8_func, 462, 109, 23 },
-	{ aic_patch1_func, 464, 3, 2 },
-	{ aic_patch0_func, 467, 5, 3 },
-	{ aic_patch9_func, 467, 2, 2 },
-	{ aic_patch0_func, 469, 3, 1 },
-	{ aic_patch1_func, 474, 2, 2 },
-	{ aic_patch0_func, 476, 6, 3 },
-	{ aic_patch9_func, 476, 2, 2 },
-	{ aic_patch0_func, 478, 3, 1 },
-	{ aic_patch1_func, 484, 2, 2 },
-	{ aic_patch0_func, 486, 9, 7 },
-	{ aic_patch9_func, 486, 5, 6 },
-	{ aic_patch19_func, 486, 1, 2 },
-	{ aic_patch0_func, 487, 1, 1 },
-	{ aic_patch19_func, 489, 1, 2 },
-	{ aic_patch0_func, 490, 1, 1 },
-	{ aic_patch0_func, 491, 4, 1 },
-	{ aic_patch6_func, 495, 3, 2 },
-	{ aic_patch0_func, 498, 1, 1 },
-	{ aic_patch1_func, 501, 1, 1 },
-	{ aic_patch6_func, 507, 1, 2 },
-	{ aic_patch0_func, 508, 1, 1 },
-	{ aic_patch20_func, 545, 7, 1 },
-	{ aic_patch3_func, 573, 1, 2 },
-	{ aic_patch0_func, 574, 1, 1 },
-	{ aic_patch21_func, 577, 1, 1 },
-	{ aic_patch8_func, 579, 105, 33 },
-	{ aic_patch4_func, 581, 1, 1 },
-	{ aic_patch1_func, 587, 2, 2 },
-	{ aic_patch0_func, 589, 1, 1 },
-	{ aic_patch1_func, 592, 1, 2 },
-	{ aic_patch0_func, 593, 1, 1 },
-	{ aic_patch9_func, 594, 3, 3 },
-	{ aic_patch15_func, 595, 1, 1 },
-	{ aic_patch0_func, 597, 4, 1 },
-	{ aic_patch19_func, 605, 2, 2 },
-	{ aic_patch0_func, 607, 1, 1 },
-	{ aic_patch19_func, 611, 10, 3 },
-	{ aic_patch5_func, 613, 8, 1 },
-	{ aic_patch0_func, 621, 9, 2 },
-	{ aic_patch5_func, 622, 8, 1 },
-	{ aic_patch4_func, 632, 1, 2 },
-	{ aic_patch0_func, 633, 1, 1 },
-	{ aic_patch19_func, 634, 1, 2 },
-	{ aic_patch0_func, 635, 3, 2 },
-	{ aic_patch4_func, 637, 1, 1 },
-	{ aic_patch5_func, 638, 1, 1 },
-	{ aic_patch5_func, 641, 1, 1 },
-	{ aic_patch5_func, 643, 1, 1 },
-	{ aic_patch4_func, 645, 2, 2 },
-	{ aic_patch0_func, 647, 2, 1 },
-	{ aic_patch5_func, 649, 1, 1 },
-	{ aic_patch5_func, 652, 1, 1 },
-	{ aic_patch5_func, 655, 1, 1 },
-	{ aic_patch19_func, 659, 1, 1 },
-	{ aic_patch19_func, 662, 1, 1 },
-	{ aic_patch4_func, 668, 1, 1 },
-	{ aic_patch6_func, 671, 1, 2 },
-	{ aic_patch0_func, 672, 1, 1 },
-	{ aic_patch7_func, 684, 16, 1 },
-	{ aic_patch4_func, 700, 20, 1 },
-	{ aic_patch9_func, 721, 4, 2 },
-	{ aic_patch0_func, 725, 4, 1 },
-	{ aic_patch9_func, 729, 4, 2 },
-	{ aic_patch0_func, 733, 3, 1 },
-	{ aic_patch6_func, 739, 1, 1 },
-	{ aic_patch22_func, 741, 14, 1 },
-	{ aic_patch7_func, 755, 3, 1 },
-	{ aic_patch9_func, 767, 24, 8 },
-	{ aic_patch19_func, 771, 1, 2 },
-	{ aic_patch0_func, 772, 1, 1 },
-	{ aic_patch15_func, 777, 4, 2 },
-	{ aic_patch0_func, 781, 7, 3 },
-	{ aic_patch23_func, 781, 5, 2 },
-	{ aic_patch0_func, 786, 2, 1 },
-	{ aic_patch0_func, 791, 42, 3 },
-	{ aic_patch18_func, 803, 18, 2 },
-	{ aic_patch0_func, 821, 1, 1 },
-	{ aic_patch4_func, 845, 1, 1 },
-	{ aic_patch4_func, 846, 3, 2 },
-	{ aic_patch0_func, 849, 1, 1 },
-	{ aic_patch13_func, 850, 3, 1 },
-	{ aic_patch4_func, 853, 12, 1 }
+	ahc_patch_func_t		*patch_func;
+	uint32_t		 begin		:10,
+				 skip_instr	:10,
+				 skip_patch	:12;
+} patches[] = {
+	{ ahc_patch1_func, 4, 1, 1 },
+	{ ahc_patch2_func, 6, 2, 1 },
+	{ ahc_patch2_func, 9, 1, 1 },
+	{ ahc_patch3_func, 11, 1, 2 },
+	{ ahc_patch0_func, 12, 2, 1 },
+	{ ahc_patch4_func, 15, 1, 2 },
+	{ ahc_patch0_func, 16, 1, 1 },
+	{ ahc_patch5_func, 22, 2, 1 },
+	{ ahc_patch3_func, 27, 1, 2 },
+	{ ahc_patch0_func, 28, 1, 1 },
+	{ ahc_patch6_func, 34, 1, 1 },
+	{ ahc_patch7_func, 37, 54, 19 },
+	{ ahc_patch8_func, 37, 1, 1 },
+	{ ahc_patch9_func, 42, 3, 2 },
+	{ ahc_patch0_func, 45, 3, 1 },
+	{ ahc_patch10_func, 49, 1, 2 },
+	{ ahc_patch0_func, 50, 2, 3 },
+	{ ahc_patch1_func, 50, 1, 2 },
+	{ ahc_patch0_func, 51, 1, 1 },
+	{ ahc_patch2_func, 53, 2, 1 },
+	{ ahc_patch9_func, 55, 1, 2 },
+	{ ahc_patch0_func, 56, 1, 1 },
+	{ ahc_patch9_func, 60, 1, 2 },
+	{ ahc_patch0_func, 61, 1, 1 },
+	{ ahc_patch9_func, 71, 1, 2 },
+	{ ahc_patch0_func, 72, 1, 1 },
+	{ ahc_patch9_func, 75, 1, 2 },
+	{ ahc_patch0_func, 76, 1, 1 },
+	{ ahc_patch9_func, 79, 1, 2 },
+	{ ahc_patch0_func, 80, 1, 1 },
+	{ ahc_patch8_func, 91, 9, 4 },
+	{ ahc_patch1_func, 93, 1, 2 },
+	{ ahc_patch0_func, 94, 1, 1 },
+	{ ahc_patch2_func, 96, 2, 1 },
+	{ ahc_patch2_func, 105, 4, 1 },
+	{ ahc_patch1_func, 109, 1, 2 },
+	{ ahc_patch0_func, 110, 2, 3 },
+	{ ahc_patch2_func, 110, 1, 2 },
+	{ ahc_patch0_func, 111, 1, 1 },
+	{ ahc_patch7_func, 112, 4, 2 },
+	{ ahc_patch0_func, 116, 1, 1 },
+	{ ahc_patch11_func, 117, 2, 1 },
+	{ ahc_patch1_func, 119, 1, 2 },
+	{ ahc_patch0_func, 120, 1, 1 },
+	{ ahc_patch7_func, 121, 4, 1 },
+	{ ahc_patch7_func, 131, 95, 11 },
+	{ ahc_patch4_func, 151, 1, 1 },
+	{ ahc_patch1_func, 168, 1, 1 },
+	{ ahc_patch12_func, 173, 1, 2 },
+	{ ahc_patch0_func, 174, 1, 1 },
+	{ ahc_patch9_func, 185, 1, 2 },
+	{ ahc_patch0_func, 186, 1, 1 },
+	{ ahc_patch9_func, 195, 1, 2 },
+	{ 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_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_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 }
 };
 
 static struct cs {
-	u_int16_t	begin;
-	u_int16_t	end;
-} const critical_sections[] = {
+	uint16_t	begin;
+	uint16_t	end;
+} critical_sections[] = {
 	{ 11, 18 },
 	{ 21, 30 },
-	{ 700, 716 },
-	{ 846, 849 },
-	{ 853, 859 },
-	{ 861, 863 },
-	{ 863, 865 }
+	{ 721, 737 },
+	{ 867, 870 },
+	{ 874, 880 },
+	{ 882, 884 },
+	{ 884, 886 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)