Sync up drivers/scsi/aic7xxx

Sync up drivers/scsi/aic7xxx/. (2232-2239)

==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_reg.h#70 - /home/luben/projects/linux/2.6/linux-2.5/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#94 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#99 $
 * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $
 */

typedef int (ahd_reg_print_t)(u_int, u_int *, u_int); @@ -3772,5 +3772,5 @@

/* Exported Labels */
-#define LABEL_seq_isr 0x269
-#define LABEL_timer_isr 0x265
+#define LABEL_seq_isr 0x26d
+#define LABEL_timer_isr 0x269
==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_reg_print.c#51 - /home/luben/projects/linux/2.6/linux-2.5/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#94 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#99 $
 * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $
 */
 

==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_seq.h#71 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_seq.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#94 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#99 $
 * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $
 */

static uint8_t seqprog[] = {
@@ -17,15 +17,15 @@

	0x60, 0x3a, 0x1a, 0x68,
	0x04, 0x47, 0x1b, 0x68,
	0xff, 0x21, 0x1b, 0x70,
-	0x40, 0x4b, 0x92, 0x69,
+	0x40, 0x4b, 0x94, 0x69,
	0x00, 0xe2, 0x54, 0x59,
-	0x40, 0x4b, 0x92, 0x69,
+	0x40, 0x4b, 0x94, 0x69,
	0x20, 0x4b, 0x82, 0x69,
	0xfc, 0x42, 0x24, 0x78,
	0x10, 0x40, 0x24, 0x78,
-	0x00, 0xe2, 0xc4, 0x5d,
+	0x00, 0xe2, 0xcc, 0x5d,
	0x20, 0x4d, 0x28, 0x78,
-	0x00, 0xe2, 0xc4, 0x5d,
+	0x00, 0xe2, 0xcc, 0x5d,
	0x30, 0x3f, 0xc0, 0x09,
	0x30, 0xe0, 0x30, 0x60,
	0x7f, 0x4a, 0x94, 0x08,
@@ -47,7 +47,7 @@
	0x14, 0xea, 0x04, 0x00,
	0x08, 0x92, 0x25, 0x03,
	0xff, 0x90, 0x3f, 0x68,
-	0x00, 0xe2, 0x56, 0x5b,
+	0x00, 0xe2, 0x5e, 0x5b,
	0x00, 0xe2, 0x3e, 0x40,
	0x00, 0xea, 0x44, 0x59,
	0x01, 0xea, 0x00, 0x30,
@@ -60,8 +60,8 @@
	0x22, 0xea, 0x44, 0x59,
	0x22, 0xea, 0x00, 0x00,
	0x10, 0x16, 0x70, 0x78,
-	0x01, 0x0b, 0xa2, 0x32,
	0x10, 0x16, 0x2c, 0x00,
+	0x01, 0x0b, 0xa2, 0x32,
	0x18, 0xad, 0x00, 0x79,
	0x04, 0xad, 0xca, 0x68,
	0x80, 0xad, 0x64, 0x78,
@@ -114,7 +114,7 @@
	0x01, 0x4e, 0x9d, 0x1a,
	0x00, 0x4f, 0x9f, 0x22,
	0x01, 0x94, 0x6d, 0x33,
-	0x01, 0xea, 0x20, 0x33,
+	0xff, 0xea, 0x20, 0x0b,
	0x04, 0xac, 0x49, 0x32,
	0xff, 0xea, 0x5a, 0x03,
	0xff, 0xea, 0x5e, 0x03,
@@ -199,6 +199,7 @@
	0x11, 0xea, 0x44, 0x59,
	0x11, 0xea, 0x00, 0x00,
	0x02, 0x48, 0x51, 0x35,
+	0x04, 0x41, 0x86, 0x79,
	0x08, 0xea, 0x98, 0x00,
	0x08, 0x57, 0xae, 0x00,
	0x08, 0x3c, 0x78, 0x00,
@@ -206,11 +207,11 @@
	0x0f, 0x67, 0xc0, 0x09,
	0x00, 0x34, 0x69, 0x02,
	0x20, 0xea, 0x96, 0x00,

- 0x00, 0xe2, 0xf8, 0x41,
- 0x40, 0x3a, 0xae, 0x69,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x40, 0x3a, 0xb0, 0x69,

	0x02, 0x55, 0x06, 0x68,

- 0x02, 0x56, 0xae, 0x69,
- 0xff, 0x5b, 0xae, 0x61,
+ 0x02, 0x56, 0xb0, 0x69,
+ 0xff, 0x5b, 0xb0, 0x61,

	0x02, 0x20, 0x51, 0x31,
	0x80, 0xea, 0xb2, 0x01,
	0x44, 0xea, 0x00, 0x00,
@@ -218,39 +219,40 @@
	0x33, 0xea, 0x00, 0x00,
	0xff, 0xea, 0xb2, 0x09,
	0xff, 0xe0, 0xc0, 0x19,
-	0xff, 0xe0, 0xb0, 0x79,
+	0xff, 0xe0, 0xb2, 0x79,
	0x02, 0xac, 0x51, 0x31,
-	0x00, 0xe2, 0xa6, 0x41,
+	0x00, 0xe2, 0xa8, 0x41,
	0x02, 0x5e, 0x50, 0x31,
	0x02, 0xa8, 0xb8, 0x30,
	0x02, 0x5c, 0x50, 0x31,
-	0xff, 0xad, 0xc1, 0x71,
+	0xff, 0xad, 0xc3, 0x71,
	0x02, 0xac, 0x41, 0x31,
	0x02, 0x22, 0x51, 0x31,
	0x02, 0xa0, 0x5c, 0x33,
	0x02, 0xa0, 0x44, 0x32,

- 0x00, 0xe2, 0xca, 0x41,
- 0x10, 0x92, 0xcb, 0x69,
+ 0x00, 0xe2, 0xcc, 0x41,
+ 0x10, 0x92, 0xcd, 0x69,

	0x3d, 0x93, 0xc9, 0x29,
	0x01, 0xe4, 0xc8, 0x01,
	0x01, 0xea, 0xca, 0x01,
	0xff, 0xea, 0xda, 0x01,
	0x02, 0x20, 0x51, 0x31,
	0x02, 0xae, 0x41, 0x32,
-	0xff, 0x21, 0xd3, 0x61,
+	0xff, 0x21, 0xd5, 0x61,
	0xff, 0xea, 0x46, 0x02,
	0x02, 0x5c, 0x50, 0x31,
	0x40, 0xea, 0x96, 0x00,

- 0x02, 0x56, 0xcc, 0x6d,
- 0x01, 0x55, 0xcc, 0x6d,
- 0x10, 0x92, 0xdf, 0x79,
- 0x10, 0x40, 0xe8, 0x69,
- 0x01, 0x56, 0xe8, 0x79,
+ 0x02, 0x56, 0xd4, 0x6d,
+ 0x01, 0x55, 0xd4, 0x6d,
+ 0x10, 0x92, 0xe1, 0x79,
+ 0x10, 0x40, 0xea, 0x69,
+ 0x01, 0x56, 0xea, 0x79,

	0xff, 0x97, 0x07, 0x78,
	0x13, 0xea, 0x50, 0x59,
	0x13, 0xea, 0x04, 0x00,
	0x00, 0xe2, 0x06, 0x40,
	0xbf, 0x3a, 0x74, 0x08,
+	0x04, 0x41, 0xf0, 0x79,
	0x08, 0xea, 0x98, 0x00,
	0x08, 0x57, 0xae, 0x00,
	0x01, 0x93, 0x69, 0x32,
@@ -258,85 +260,87 @@
	0x40, 0xea, 0x66, 0x02,
	0x08, 0x3c, 0x78, 0x00,
	0x80, 0xea, 0x62, 0x02,
-	0x00, 0xe2, 0xb8, 0x5b,
+	0x00, 0xe2, 0xc0, 0x5b,
	0x01, 0x36, 0xc1, 0x31,

- 0x9f, 0xe0, 0x4c, 0x7c,
- 0x80, 0xe0, 0x0c, 0x72,
- 0xa0, 0xe0, 0x44, 0x72,
- 0xc0, 0xe0, 0x3a, 0x72,
- 0xe0, 0xe0, 0x74, 0x72,
+ 0x9f, 0xe0, 0x54, 0x7c,
+ 0x80, 0xe0, 0x10, 0x72,
+ 0xa0, 0xe0, 0x4c, 0x72,
+ 0xc0, 0xe0, 0x42, 0x72,
+ 0xe0, 0xe0, 0x7c, 0x72,

	0x01, 0xea, 0x50, 0x59,
	0x01, 0xea, 0x04, 0x00,

- 0x00, 0xe2, 0xf8, 0x41,
- 0x80, 0x33, 0x13, 0x7a,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x80, 0x33, 0x17, 0x7a,

	0x03, 0xea, 0x50, 0x59,
	0x03, 0xea, 0x04, 0x00,
-	0xee, 0x00, 0x1a, 0x6a,
+	0xee, 0x00, 0x1e, 0x6a,
	0x05, 0xea, 0xb4, 0x00,
	0x33, 0xea, 0x44, 0x59,
	0x33, 0xea, 0x00, 0x00,
	0x02, 0xa8, 0x90, 0x32,
	0x00, 0xe2, 0x6a, 0x59,
	0xef, 0x96, 0xd5, 0x19,
-	0x00, 0xe2, 0x2a, 0x52,
+	0x00, 0xe2, 0x2e, 0x52,
	0x09, 0x80, 0xe1, 0x30,
	0x02, 0xea, 0x36, 0x00,
	0xa8, 0xea, 0x32, 0x00,
-	0x00, 0xe2, 0x30, 0x42,
+	0x00, 0xe2, 0x34, 0x42,
	0x01, 0x96, 0xd1, 0x30,
	0x10, 0x80, 0x89, 0x31,
	0x20, 0xea, 0x32, 0x00,
	0xbf, 0x33, 0x67, 0x0a,

- 0x20, 0x19, 0x32, 0x6a,
- 0x02, 0x4d, 0xf8, 0x69,
+ 0x10, 0x4c, 0x3e, 0x6a,
+ 0x20, 0x19, 0x36, 0x6a,
+ 0x20, 0x19, 0x3a, 0x6a,
+ 0x02, 0x4d, 0xfc, 0x69,

	0x40, 0x33, 0x67, 0x02,

- 0x00, 0xe2, 0xf8, 0x41,
- 0x80, 0x33, 0xb5, 0x6a,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x80, 0x33, 0xbd, 0x6a,

	0x01, 0x44, 0x10, 0x33,
	0x08, 0x92, 0x25, 0x03,
-	0x00, 0xe2, 0xf8, 0x41,
+	0x00, 0xe2, 0xfc, 0x41,
	0x10, 0xea, 0x80, 0x00,
	0x01, 0x31, 0xc5, 0x31,

- 0x80, 0xe2, 0x60, 0x62,
- 0x10, 0x92, 0x85, 0x6a,
+ 0x80, 0xe2, 0x68, 0x62,
+ 0x10, 0x92, 0x8d, 0x6a,

	0xc0, 0x94, 0xc5, 0x01,
-	0x40, 0x92, 0x51, 0x6a,
+	0x40, 0x92, 0x59, 0x6a,
	0xbf, 0xe2, 0xc4, 0x09,
-	0x20, 0x92, 0x65, 0x7a,
+	0x20, 0x92, 0x6d, 0x7a,
	0x01, 0xe2, 0x88, 0x30,

- 0x00, 0xe2, 0xb8, 0x5b,
- 0xa0, 0x36, 0x6d, 0x62,
+ 0x00, 0xe2, 0xc0, 0x5b,
+ 0xa0, 0x36, 0x75, 0x62,

	0x23, 0x92, 0x89, 0x08,

- 0x00, 0xe2, 0xb8, 0x5b,
- 0xa0, 0x36, 0x6d, 0x62,
- 0x00, 0xa8, 0x64, 0x42,
- 0xff, 0xe2, 0x64, 0x62,
- 0x00, 0xe2, 0x84, 0x42,
+ 0x00, 0xe2, 0xc0, 0x5b,
+ 0xa0, 0x36, 0x75, 0x62,
+ 0x00, 0xa8, 0x6c, 0x42,
+ 0xff, 0xe2, 0x6c, 0x62,
+ 0x00, 0xe2, 0x8c, 0x42,

	0x40, 0xea, 0x98, 0x00,
	0x01, 0xe2, 0x88, 0x30,

- 0x00, 0xe2, 0xb8, 0x5b,
- 0xa0, 0x36, 0x43, 0x72,
+ 0x00, 0xe2, 0xc0, 0x5b,
+ 0xa0, 0x36, 0x4b, 0x72,

	0x40, 0xea, 0x98, 0x00,
	0x01, 0x31, 0x89, 0x32,
	0x08, 0xea, 0x62, 0x02,

- 0x00, 0xe2, 0xf8, 0x41,
- 0xe0, 0xea, 0xd4, 0x5b,
- 0x80, 0xe0, 0xc0, 0x6a,
- 0x04, 0xe0, 0x66, 0x73,
- 0x02, 0xe0, 0x96, 0x73,
- 0x00, 0xea, 0x1e, 0x73,
- 0x03, 0xe0, 0xa6, 0x73,
- 0x23, 0xe0, 0x96, 0x72,
- 0x08, 0xe0, 0xbc, 0x72,
- 0x00, 0xe2, 0xb8, 0x5b,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0xe0, 0xea, 0xdc, 0x5b,
+ 0x80, 0xe0, 0xc8, 0x6a,
+ 0x04, 0xe0, 0x6e, 0x73,
+ 0x02, 0xe0, 0x9e, 0x73,
+ 0x00, 0xea, 0x26, 0x73,
+ 0x03, 0xe0, 0xae, 0x73,
+ 0x23, 0xe0, 0x9e, 0x72,
+ 0x08, 0xe0, 0xc4, 0x72,
+ 0x00, 0xe2, 0xc0, 0x5b,

	0x07, 0xea, 0x50, 0x59,
	0x07, 0xea, 0x04, 0x00,

- 0x08, 0x42, 0xf9, 0x71,
- 0x04, 0x42, 0x93, 0x62,
+ 0x08, 0x42, 0xfd, 0x71,
+ 0x04, 0x42, 0x9b, 0x62,

	0x01, 0x43, 0x89, 0x30,
-	0x00, 0xe2, 0x84, 0x42,
+	0x00, 0xe2, 0x8c, 0x42,
	0x01, 0x44, 0xd4, 0x31,
-	0x00, 0xe2, 0x84, 0x42,
+	0x00, 0xe2, 0x8c, 0x42,
	0x01, 0x00, 0x60, 0x32,
	0x33, 0xea, 0x44, 0x59,
	0x33, 0xea, 0x00, 0x00,
@@ -344,20 +348,20 @@
	0x01, 0x64, 0xc0, 0x31,
	0x00, 0x30, 0x45, 0x59,
	0x01, 0x30, 0x01, 0x30,

- 0x01, 0xe0, 0xba, 0x7a,
- 0xa0, 0xea, 0xca, 0x5b,
- 0x01, 0xa0, 0xba, 0x62,
- 0x01, 0x84, 0xaf, 0x7a,
- 0x01, 0x95, 0xbd, 0x6a,
+ 0x01, 0xe0, 0xc2, 0x7a,
+ 0xa0, 0xea, 0xd2, 0x5b,
+ 0x01, 0xa0, 0xc2, 0x62,
+ 0x01, 0x84, 0xb7, 0x7a,
+ 0x01, 0x95, 0xc5, 0x6a,

	0x05, 0xea, 0x50, 0x59,
	0x05, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xbc, 0x42,
+	0x00, 0xe2, 0xc4, 0x42,
	0x03, 0xea, 0x50, 0x59,
	0x03, 0xea, 0x04, 0x00,

- 0x00, 0xe2, 0xbc, 0x42,
- 0x07, 0xea, 0xdc, 0x5b,
+ 0x00, 0xe2, 0xc4, 0x42,
+ 0x07, 0xea, 0xe4, 0x5b,

	0x01, 0x44, 0xd4, 0x31,
-	0x00, 0xe2, 0xf8, 0x41,
+	0x00, 0xe2, 0xfc, 0x41,
	0x3f, 0xe0, 0x6a, 0x0a,
	0xc0, 0x34, 0xc1, 0x09,
	0x00, 0x35, 0x51, 0x01,
@@ -368,54 +372,54 @@
	0x01, 0xea, 0xc6, 0x01,
	0x02, 0xe2, 0xc8, 0x31,
	0x02, 0xec, 0x40, 0x31,
-	0xff, 0xa1, 0xdc, 0x72,
+	0xff, 0xa1, 0xe4, 0x72,
	0x02, 0xe8, 0xda, 0x31,
	0x02, 0xa0, 0x50, 0x31,
-	0x00, 0xe2, 0xfe, 0x42,
+	0x00, 0xe2, 0x06, 0x43,
	0x80, 0x33, 0x67, 0x02,
	0x01, 0x44, 0xd4, 0x31,
-	0x00, 0xe2, 0xb8, 0x5b,
+	0x00, 0xe2, 0xc0, 0x5b,
	0x01, 0x33, 0x67, 0x02,
-	0xe0, 0x36, 0x19, 0x63,
+	0xe0, 0x36, 0x21, 0x63,
	0x02, 0x33, 0x67, 0x02,
-	0x20, 0x46, 0x12, 0x63,
+	0x20, 0x46, 0x1a, 0x63,
	0xff, 0xea, 0x52, 0x09,

- 0xa8, 0xea, 0xca, 0x5b,
- 0x04, 0x92, 0xf9, 0x7a,
+ 0xa8, 0xea, 0xd2, 0x5b,
+ 0x04, 0x92, 0x01, 0x7b,

	0x01, 0x34, 0xc1, 0x31,
-	0x00, 0x93, 0xf9, 0x62,
+	0x00, 0x93, 0x01, 0x63,
	0x01, 0x35, 0xc1, 0x31,
-	0x00, 0x94, 0x03, 0x73,
+	0x00, 0x94, 0x0b, 0x73,
	0x01, 0xa9, 0x52, 0x11,

- 0xff, 0xa9, 0xee, 0x6a,
- 0x00, 0xe2, 0x12, 0x43,
+ 0xff, 0xa9, 0xf6, 0x6a,
+ 0x00, 0xe2, 0x1a, 0x43,

	0x10, 0x33, 0x67, 0x02,
-	0x04, 0x92, 0x13, 0x7b,
+	0x04, 0x92, 0x1b, 0x7b,
	0xfb, 0x92, 0x25, 0x0b,
	0xff, 0xea, 0x66, 0x0a,
-	0x01, 0xa4, 0x0d, 0x6b,
+	0x01, 0xa4, 0x15, 0x6b,
	0x02, 0xa8, 0x90, 0x32,
	0x00, 0xe2, 0x6a, 0x59,

- 0x10, 0x92, 0xbd, 0x7a,
- 0xff, 0xea, 0xdc, 0x5b,
- 0x00, 0xe2, 0xbc, 0x42,
+ 0x10, 0x92, 0xc5, 0x7a,
+ 0xff, 0xea, 0xe4, 0x5b,
+ 0x00, 0xe2, 0xc4, 0x42,

	0x04, 0xea, 0x50, 0x59,
	0x04, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xbc, 0x42,
+	0x00, 0xe2, 0xc4, 0x42,
	0x04, 0xea, 0x50, 0x59,
	0x04, 0xea, 0x04, 0x00,

- 0x00, 0xe2, 0xf8, 0x41,
- 0x08, 0x92, 0xb5, 0x7a,
- 0xc0, 0x33, 0x29, 0x7b,
- 0x80, 0x33, 0xb5, 0x6a,
- 0xff, 0x88, 0x29, 0x6b,
- 0x40, 0x33, 0xb5, 0x6a,
- 0x10, 0x92, 0x2f, 0x7b,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x08, 0x92, 0xbd, 0x7a,
+ 0xc0, 0x33, 0x31, 0x7b,
+ 0x80, 0x33, 0xbd, 0x6a,
+ 0xff, 0x88, 0x31, 0x6b,
+ 0x40, 0x33, 0xbd, 0x6a,
+ 0x10, 0x92, 0x37, 0x7b,

	0x0a, 0xea, 0x50, 0x59,
	0x0a, 0xea, 0x04, 0x00,

- 0x00, 0xe2, 0x4e, 0x5b,
- 0x00, 0xe2, 0x82, 0x43,
- 0x50, 0x4b, 0x36, 0x6b,
+ 0x00, 0xe2, 0x56, 0x5b,
+ 0x00, 0xe2, 0x8a, 0x43,
+ 0x50, 0x4b, 0x3e, 0x6b,

	0xbf, 0x3a, 0x74, 0x08,
	0x01, 0xe0, 0xf4, 0x31,
	0xff, 0xea, 0xc0, 0x09,
@@ -429,21 +433,21 @@
	0x33, 0xea, 0x00, 0x00,
	0x02, 0x42, 0x51, 0x31,
	0xff, 0x90, 0x65, 0x68,

- 0xff, 0x88, 0x5b, 0x6b,
- 0x01, 0xa4, 0x57, 0x6b,
- 0x02, 0xa4, 0x5f, 0x6b,
- 0x01, 0x84, 0x5f, 0x7b,
+ 0xff, 0x88, 0x63, 0x6b,
+ 0x01, 0xa4, 0x5f, 0x6b,
+ 0x02, 0xa4, 0x67, 0x6b,
+ 0x01, 0x84, 0x67, 0x7b,

	0x02, 0x28, 0x19, 0x33,
	0x02, 0xa8, 0x50, 0x36,

- 0xff, 0x88, 0x5f, 0x73,
- 0x00, 0xe2, 0x32, 0x5b,
+ 0xff, 0x88, 0x67, 0x73,
+ 0x00, 0xe2, 0x3a, 0x5b,

	0x02, 0xa8, 0x20, 0x33,
	0x02, 0x2c, 0x19, 0x33,
	0x02, 0xa8, 0x58, 0x32,
	0x04, 0xa4, 0x49, 0x07,
-	0xc0, 0x33, 0xb5, 0x6a,
+	0xc0, 0x33, 0xbd, 0x6a,
	0x04, 0x92, 0x25, 0x03,
-	0x20, 0x92, 0x83, 0x6b,
+	0x20, 0x92, 0x8b, 0x6b,
	0x02, 0xa8, 0x40, 0x31,
	0xc0, 0x34, 0xc1, 0x09,
	0x00, 0x35, 0x51, 0x01,
@@ -458,56 +462,56 @@
	0xf7, 0x57, 0xae, 0x08,
	0x08, 0xea, 0x98, 0x00,
	0x01, 0x44, 0xd4, 0x31,
-	0xee, 0x00, 0x8c, 0x6b,
+	0xee, 0x00, 0x94, 0x6b,
	0x02, 0xea, 0xb4, 0x00,

- 0x00, 0xe2, 0xb4, 0x5b,
- 0x09, 0x4c, 0x8e, 0x7b,
+ 0x00, 0xe2, 0xbc, 0x5b,
+ 0x09, 0x4c, 0x96, 0x7b,

	0x08, 0x4c, 0x06, 0x68,
	0x0b, 0xea, 0x50, 0x59,
	0x0b, 0xea, 0x04, 0x00,
	0x01, 0x44, 0xd4, 0x31,

- 0x20, 0x33, 0xf9, 0x79,
- 0x00, 0xe2, 0x9e, 0x5b,
- 0x00, 0xe2, 0xf8, 0x41,
- 0x01, 0x84, 0xa3, 0x7b,
+ 0x20, 0x33, 0xfd, 0x79,
+ 0x00, 0xe2, 0xa6, 0x5b,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x01, 0x84, 0xab, 0x7b,

	0x01, 0xa4, 0x49, 0x07,
	0x08, 0x60, 0x30, 0x33,
	0x08, 0x80, 0x41, 0x37,
	0xdf, 0x33, 0x67, 0x0a,
-	0xee, 0x00, 0xb0, 0x6b,
+	0xee, 0x00, 0xb8, 0x6b,
	0x05, 0xea, 0xb4, 0x00,
	0x33, 0xea, 0x44, 0x59,
	0x33, 0xea, 0x00, 0x00,
	0x00, 0xe2, 0x6a, 0x59,
-	0x00, 0xe2, 0xbc, 0x42,
+	0x00, 0xe2, 0xc4, 0x42,
	0x01, 0xea, 0x6c, 0x02,
	0xc0, 0xea, 0x66, 0x06,

- 0xff, 0x42, 0xc4, 0x6b,
- 0x01, 0x41, 0xb8, 0x6b,
- 0x02, 0x41, 0xb8, 0x7b,
- 0xff, 0x42, 0xc4, 0x6b,
- 0x01, 0x41, 0xb8, 0x6b,
- 0x02, 0x41, 0xb8, 0x7b,
- 0xff, 0x42, 0xc4, 0x7b,
- 0x04, 0x4c, 0xb8, 0x6b,
+ 0xff, 0x42, 0xcc, 0x6b,
+ 0x01, 0x41, 0xc0, 0x6b,
+ 0x02, 0x41, 0xc0, 0x7b,
+ 0xff, 0x42, 0xcc, 0x6b,
+ 0x01, 0x41, 0xc0, 0x6b,
+ 0x02, 0x41, 0xc0, 0x7b,
+ 0xff, 0x42, 0xcc, 0x7b,
+ 0x04, 0x4c, 0xc0, 0x6b,

	0xe0, 0x41, 0x6c, 0x0e,
	0x01, 0x44, 0xd4, 0x31,

- 0xff, 0x42, 0xcc, 0x7b,
- 0x04, 0x4c, 0xcc, 0x6b,
+ 0xff, 0x42, 0xd4, 0x7b,
+ 0x04, 0x4c, 0xd4, 0x6b,

	0xe0, 0x41, 0x6c, 0x0a,
-	0xe0, 0x36, 0xf9, 0x61,
+	0xe0, 0x36, 0xfd, 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, 0xe4, 0x7b,
+	0x04, 0xa6, 0xec, 0x7b,
	0xff, 0xea, 0x5a, 0x09,
	0xff, 0xea, 0x4c, 0x0d,
-	0x01, 0xa6, 0x02, 0x6c,
+	0x01, 0xa6, 0x0a, 0x6c,
	0x10, 0xad, 0x64, 0x78,
-	0x80, 0xad, 0xfa, 0x6b,
+	0x80, 0xad, 0x02, 0x6c,
	0x08, 0xad, 0x64, 0x68,
	0x04, 0x84, 0xf9, 0x30,
	0x00, 0xea, 0x08, 0x81,
@@ -533,7 +537,7 @@
	0x00, 0x86, 0x0d, 0x23,
	0x00, 0x87, 0x0f, 0x23,
	0x01, 0x84, 0xc5, 0x31,
-	0x80, 0x83, 0x25, 0x7c,
+	0x80, 0x83, 0x2d, 0x7c,
	0x02, 0xe2, 0xc4, 0x01,
	0xff, 0xea, 0x4c, 0x09,
	0x01, 0xe2, 0x36, 0x30,
@@ -544,75 +548,75 @@
	0xfe, 0xa6, 0x4c, 0x0d,
	0x0b, 0x98, 0xe1, 0x30,
	0xfd, 0xa4, 0x49, 0x09,
-	0x80, 0xa3, 0x39, 0x7c,
+	0x80, 0xa3, 0x41, 0x7c,
	0x02, 0xa4, 0x48, 0x01,
	0x01, 0xa4, 0x36, 0x30,
	0xa8, 0xea, 0x32, 0x00,
	0xfd, 0xa4, 0x49, 0x0b,
	0x05, 0xa3, 0x07, 0x33,
-	0x80, 0x83, 0x45, 0x6c,
+	0x80, 0x83, 0x4d, 0x6c,
	0x02, 0xea, 0x4c, 0x05,
	0xff, 0xea, 0x4c, 0x0d,
	0x00, 0xe2, 0x3e, 0x59,
-	0x02, 0xa6, 0xe6, 0x6b,
+	0x02, 0xa6, 0xee, 0x6b,
	0x80, 0xf9, 0xf2, 0x05,
-	0xc0, 0x33, 0x53, 0x7c,
+	0xc0, 0x33, 0x5b, 0x7c,
	0x03, 0xea, 0x50, 0x59,
	0x03, 0xea, 0x04, 0x00,

- 0x20, 0x33, 0x77, 0x7c,
- 0x01, 0x84, 0x5d, 0x6c,
+ 0x20, 0x33, 0x7f, 0x7c,
+ 0x01, 0x84, 0x65, 0x6c,

	0x06, 0xea, 0x50, 0x59,
	0x06, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x7a, 0x44,
+	0x00, 0xe2, 0x82, 0x44,
	0x01, 0x00, 0x60, 0x32,
-	0xee, 0x00, 0x66, 0x6c,
+	0xee, 0x00, 0x6e, 0x6c,
	0x05, 0xea, 0xb4, 0x00,
	0x33, 0xea, 0x44, 0x59,
	0x33, 0xea, 0x00, 0x00,
	0x80, 0x3d, 0x7a, 0x00,
-	0xfc, 0x42, 0x68, 0x7c,
+	0xfc, 0x42, 0x70, 0x7c,
	0x7f, 0x3d, 0x7a, 0x08,
	0x00, 0x30, 0x45, 0x59,
	0x01, 0x30, 0x01, 0x30,
	0x09, 0xea, 0x50, 0x59,
	0x09, 0xea, 0x04, 0x00,

- 0x00, 0xe2, 0xf8, 0x41,
- 0x01, 0xa4, 0x5d, 0x6c,
- 0x00, 0xe2, 0x30, 0x5c,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x01, 0xa4, 0x65, 0x6c,
+ 0x00, 0xe2, 0x38, 0x5c,

	0x20, 0x33, 0x67, 0x02,
	0x01, 0x00, 0x60, 0x32,

- 0x02, 0xa6, 0x82, 0x7c,
- 0x00, 0xe2, 0x46, 0x5c,
+ 0x02, 0xa6, 0x8a, 0x7c,
+ 0x00, 0xe2, 0x4e, 0x5c,

	0x00, 0xe2, 0x56, 0x58,
	0x00, 0xe2, 0x66, 0x58,
	0x00, 0xe2, 0x3a, 0x58,
	0x00, 0x30, 0x45, 0x59,
	0x01, 0x30, 0x01, 0x30,

- 0x20, 0x19, 0x82, 0x6c,
- 0x00, 0xe2, 0xb2, 0x5c,
- 0x04, 0x19, 0x9c, 0x6c,
+ 0x20, 0x19, 0x8a, 0x6c,
+ 0x00, 0xe2, 0xba, 0x5c,
+ 0x04, 0x19, 0xa4, 0x6c,

	0x02, 0x19, 0x32, 0x00,

- 0x01, 0x84, 0x9d, 0x7c,
- 0x01, 0x1b, 0x96, 0x7c,
- 0x01, 0x1a, 0x9c, 0x6c,
- 0x00, 0xe2, 0x4c, 0x44,
- 0x80, 0x4b, 0xa2, 0x6c,
- 0x01, 0x4c, 0x9e, 0x7c,
- 0x03, 0x42, 0x4c, 0x6c,
- 0x00, 0xe2, 0xe0, 0x5b,
+ 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, 0xe8, 0x5b,

	0x80, 0xf9, 0xf2, 0x01,

- 0x04, 0x33, 0xf9, 0x79,
- 0x00, 0xe2, 0xf8, 0x41,
- 0x08, 0x5d, 0xba, 0x6c,
+ 0x04, 0x33, 0xfd, 0x79,
+ 0x00, 0xe2, 0xfc, 0x41,
+ 0x08, 0x5d, 0xc2, 0x6c,

	0x00, 0xe2, 0x56, 0x58,
	0x00, 0x30, 0x45, 0x59,
	0x01, 0x30, 0x01, 0x30,

- 0x02, 0x1b, 0xaa, 0x7c,
- 0x08, 0x5d, 0xb8, 0x7c,
+ 0x02, 0x1b, 0xb2, 0x7c,
+ 0x08, 0x5d, 0xc0, 0x7c,

	0x03, 0x68, 0x00, 0x37,
	0x01, 0x84, 0x09, 0x07,

- 0x80, 0x1b, 0xc4, 0x7c,
- 0x80, 0x84, 0xc5, 0x6c,
+ 0x80, 0x1b, 0xcc, 0x7c,
+ 0x80, 0x84, 0xcd, 0x6c,

	0xff, 0x85, 0x0b, 0x1b,
	0xff, 0x86, 0x0d, 0x23,
	0xff, 0x87, 0x0f, 0x23,
@@ -624,161 +628,161 @@
	0xf9, 0xd9, 0xb2, 0x0d,
	0x01, 0xd9, 0xb2, 0x05,
	0x01, 0x52, 0x48, 0x31,

- 0x20, 0xa4, 0xee, 0x7c,
- 0x20, 0x5b, 0xee, 0x7c,
- 0x80, 0xf9, 0xfc, 0x7c,
+ 0x20, 0xa4, 0xf6, 0x7c,
+ 0x20, 0x5b, 0xf6, 0x7c,
+ 0x80, 0xf9, 0x04, 0x7d,

	0x02, 0xea, 0xb4, 0x00,
	0x11, 0x00, 0x00, 0x10,
-	0x04, 0x19, 0x08, 0x7d,
+	0x04, 0x19, 0x10, 0x7d,
	0xdf, 0x19, 0x32, 0x08,

- 0x60, 0x5b, 0xe6, 0x6c,
- 0x01, 0x4c, 0xe2, 0x7c,
+ 0x60, 0x5b, 0xee, 0x6c,
+ 0x01, 0x4c, 0xea, 0x7c,

	0x20, 0x19, 0x32, 0x00,
	0x01, 0xd9, 0xb2, 0x05,
	0x02, 0xea, 0xb4, 0x00,
	0x01, 0xd9, 0xb2, 0x05,

- 0x10, 0x5b, 0x00, 0x6d,
- 0x08, 0x5b, 0x0a, 0x6d,
- 0x20, 0x5b, 0xfa, 0x6c,
- 0x02, 0x5b, 0x2a, 0x6d,
+ 0x10, 0x5b, 0x08, 0x6d,
+ 0x08, 0x5b, 0x12, 0x6d,
+ 0x20, 0x5b, 0x02, 0x6d,
+ 0x02, 0x5b, 0x32, 0x6d,

	0x0e, 0xea, 0x50, 0x59,
	0x0e, 0xea, 0x04, 0x00,
-	0x80, 0xf9, 0xea, 0x6c,
+	0x80, 0xf9, 0xf2, 0x6c,
	0xdf, 0x5c, 0xb8, 0x08,
	0x01, 0xd9, 0xb2, 0x05,

- 0x01, 0xa4, 0xe5, 0x6d,
- 0x00, 0xe2, 0x30, 0x5c,
- 0x00, 0xe2, 0x34, 0x5d,
+ 0x01, 0xa4, 0xed, 0x6d,
+ 0x00, 0xe2, 0x38, 0x5c,
+ 0x00, 0xe2, 0x3c, 0x5d,

	0x01, 0x90, 0x21, 0x1b,
	0x01, 0xd9, 0xb2, 0x05,
-	0x00, 0xe2, 0x32, 0x5b,
+	0x00, 0xe2, 0x3a, 0x5b,
	0xf3, 0x96, 0xd5, 0x19,

- 0x00, 0xe2, 0x18, 0x55,
- 0x80, 0x96, 0x19, 0x6d,
+ 0x00, 0xe2, 0x20, 0x55,
+ 0x80, 0x96, 0x21, 0x6d,

	0x0f, 0xea, 0x50, 0x59,
	0x0f, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x20, 0x45,
+	0x00, 0xe2, 0x28, 0x45,
	0x04, 0x8c, 0xe1, 0x30,
	0x01, 0xea, 0xf2, 0x00,
	0x02, 0xea, 0x36, 0x00,
	0xa8, 0xea, 0x32, 0x00,
-	0xff, 0x97, 0x27, 0x7d,
+	0xff, 0x97, 0x2f, 0x7d,
	0x14, 0xea, 0x50, 0x59,
	0x14, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x96, 0x5d,
+	0x00, 0xe2, 0x9e, 0x5d,
	0x01, 0xd9, 0xb2, 0x05,
	0x09, 0x80, 0xe1, 0x30,
	0x02, 0xea, 0x36, 0x00,
	0xa8, 0xea, 0x32, 0x00,
-	0x00, 0xe2, 0x8e, 0x5d,
+	0x00, 0xe2, 0x96, 0x5d,
	0x01, 0xd9, 0xb2, 0x05,
-	0x02, 0xa6, 0x44, 0x7d,
+	0x02, 0xa6, 0x4c, 0x7d,
	0x00, 0xe2, 0x3e, 0x59,

- 0x20, 0x5b, 0x52, 0x6d,
- 0xfc, 0x42, 0x3e, 0x7d,
- 0x10, 0x40, 0x40, 0x6d,
- 0x20, 0x4d, 0x42, 0x7d,
- 0x08, 0x5d, 0x52, 0x6d,
- 0x02, 0xa6, 0xe6, 0x6b,
+ 0x20, 0x5b, 0x5a, 0x6d,
+ 0xfc, 0x42, 0x46, 0x7d,
+ 0x10, 0x40, 0x48, 0x6d,
+ 0x20, 0x4d, 0x4a, 0x7d,
+ 0x08, 0x5d, 0x5a, 0x6d,
+ 0x02, 0xa6, 0xee, 0x6b,

	0x00, 0xe2, 0x3e, 0x59,

- 0x20, 0x5b, 0x52, 0x6d,
- 0x01, 0x1b, 0x72, 0x6d,
- 0xfc, 0x42, 0x4e, 0x7d,
- 0x10, 0x40, 0x50, 0x6d,
+ 0x20, 0x5b, 0x5a, 0x6d,
+ 0x01, 0x1b, 0x7a, 0x6d,
+ 0xfc, 0x42, 0x56, 0x7d,
+ 0x10, 0x40, 0x58, 0x6d,

	0x20, 0x4d, 0x64, 0x78,
	0x08, 0x5d, 0x64, 0x78,
	0x02, 0x19, 0x32, 0x00,
	0x01, 0x5b, 0x40, 0x31,

- 0x00, 0xe2, 0xb2, 0x5c,
- 0x00, 0xe2, 0x9e, 0x5b,
+ 0x00, 0xe2, 0xba, 0x5c,
+ 0x00, 0xe2, 0xa6, 0x5b,

	0x20, 0xea, 0xb6, 0x00,
-	0x00, 0xe2, 0xe0, 0x5b,
+	0x00, 0xe2, 0xe8, 0x5b,
	0x20, 0x5c, 0xb8, 0x00,

- 0x04, 0x19, 0x68, 0x6d,
- 0x01, 0x1a, 0x68, 0x6d,
+ 0x04, 0x19, 0x70, 0x6d,
+ 0x01, 0x1a, 0x70, 0x6d,

	0x00, 0xe2, 0x3e, 0x59,
	0x01, 0x1a, 0x64, 0x78,
	0x80, 0xf9, 0xf2, 0x01,
-	0x20, 0xa0, 0xcc, 0x7d,
+	0x20, 0xa0, 0xd4, 0x7d,
	0xff, 0x90, 0x21, 0x1b,
-	0x08, 0x92, 0x43, 0x6b,
+	0x08, 0x92, 0x4b, 0x6b,
	0x02, 0xea, 0xb4, 0x04,
	0x01, 0xa4, 0x49, 0x03,
-	0x40, 0x5b, 0x82, 0x6d,
+	0x40, 0x5b, 0x8a, 0x6d,
	0x00, 0xe2, 0x3e, 0x59,

- 0x40, 0x5b, 0x82, 0x6d,
- 0x04, 0x5d, 0xe6, 0x7d,
- 0x01, 0x1a, 0xe6, 0x7d,
+ 0x40, 0x5b, 0x8a, 0x6d,
+ 0x04, 0x5d, 0xee, 0x7d,
+ 0x01, 0x1a, 0xee, 0x7d,

	0x20, 0x4d, 0x64, 0x78,

- 0x40, 0x5b, 0xcc, 0x7d,
- 0x04, 0x5d, 0xe6, 0x7d,
- 0x01, 0x1a, 0xe6, 0x7d,
+ 0x40, 0x5b, 0xd4, 0x7d,
+ 0x04, 0x5d, 0xee, 0x7d,
+ 0x01, 0x1a, 0xee, 0x7d,

	0x80, 0xf9, 0xf2, 0x01,
	0xff, 0x90, 0x21, 0x1b,
-	0x08, 0x92, 0x43, 0x6b,
+	0x08, 0x92, 0x4b, 0x6b,
	0x02, 0xea, 0xb4, 0x04,
	0x00, 0xe2, 0x3e, 0x59,
	0x01, 0x1b, 0x64, 0x78,
	0x80, 0xf9, 0xf2, 0x01,
	0x02, 0xea, 0xb4, 0x04,
	0x00, 0xe2, 0x3e, 0x59,

- 0x01, 0x1b, 0xaa, 0x6d,
- 0x40, 0x5b, 0xb8, 0x7d,
- 0x01, 0x1b, 0xaa, 0x6d,
+ 0x01, 0x1b, 0xb2, 0x6d,
+ 0x40, 0x5b, 0xc0, 0x7d,
+ 0x01, 0x1b, 0xb2, 0x6d,

	0x02, 0x19, 0x32, 0x00,
	0x01, 0x1a, 0x64, 0x78,
	0x80, 0xf9, 0xf2, 0x01,
	0xff, 0xea, 0x10, 0x03,
	0x08, 0x92, 0x25, 0x03,

- 0x00, 0xe2, 0x42, 0x43,
- 0x01, 0x1a, 0xb4, 0x7d,
- 0x40, 0x5b, 0xb0, 0x7d,
- 0x01, 0x1a, 0x9e, 0x6d,
+ 0x00, 0xe2, 0x4a, 0x43,
+ 0x01, 0x1a, 0xbc, 0x7d,
+ 0x40, 0x5b, 0xb8, 0x7d,
+ 0x01, 0x1a, 0xa6, 0x6d,

	0xfc, 0x42, 0x64, 0x78,
-	0x01, 0x1a, 0xb8, 0x6d,
+	0x01, 0x1a, 0xc0, 0x6d,
	0x10, 0xea, 0x50, 0x59,
	0x10, 0xea, 0x04, 0x00,
	0xfc, 0x42, 0x64, 0x78,
-	0x10, 0x40, 0xbe, 0x6d,
+	0x10, 0x40, 0xc6, 0x6d,
	0x20, 0x4d, 0x64, 0x78,
-	0x40, 0x5b, 0x9e, 0x6d,
+	0x40, 0x5b, 0xa6, 0x6d,
	0x01, 0x1a, 0x64, 0x78,
	0x01, 0x90, 0x21, 0x1b,
	0x30, 0x3f, 0xc0, 0x09,
	0x30, 0xe0, 0x64, 0x60,
	0x40, 0x4b, 0x64, 0x68,
	0xff, 0xea, 0x52, 0x01,
-	0xee, 0x00, 0xd2, 0x6d,
+	0xee, 0x00, 0xdc, 0x6d,
	0x80, 0xf9, 0xf2, 0x01,
	0xff, 0x90, 0x21, 0x1b,
	0x02, 0xea, 0xb4, 0x00,
	0x20, 0xea, 0x9a, 0x00,
-	0xf3, 0x42, 0xde, 0x6d,
+	0xf3, 0x42, 0xe6, 0x6d,
	0x12, 0xea, 0x50, 0x59,
	0x12, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf8, 0x41,
+	0x00, 0xe2, 0xfc, 0x41,
	0x0d, 0xea, 0x50, 0x59,
	0x0d, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0xf8, 0x41,
+	0x00, 0xe2, 0xfc, 0x41,
	0x01, 0x90, 0x21, 0x1b,
	0x11, 0xea, 0x50, 0x59,
	0x11, 0xea, 0x04, 0x00,
-	0x00, 0xe2, 0x32, 0x5b,
+	0x00, 0xe2, 0x3a, 0x5b,
	0x08, 0x5a, 0xb4, 0x00,
-	0x00, 0xe2, 0x0c, 0x5e,
+	0x00, 0xe2, 0x14, 0x5e,
	0xa8, 0xea, 0x32, 0x00,
	0x00, 0xe2, 0x3e, 0x59,

- 0x80, 0x1a, 0xfa, 0x7d,
- 0x00, 0xe2, 0x0c, 0x5e,
+ 0x80, 0x1a, 0x02, 0x7e,
+ 0x00, 0xe2, 0x14, 0x5e,

	0x80, 0x19, 0x32, 0x00,

- 0x40, 0x5b, 0x00, 0x6e,
- 0x08, 0x5a, 0x00, 0x7e,
+ 0x40, 0x5b, 0x08, 0x6e,
+ 0x08, 0x5a, 0x08, 0x7e,

	0x20, 0x4d, 0x64, 0x78,
	0x02, 0x84, 0x09, 0x03,
-	0x40, 0x5b, 0xcc, 0x7d,
+	0x40, 0x5b, 0xd4, 0x7d,
	0xff, 0x90, 0x21, 0x1b,
	0x80, 0xf9, 0xf2, 0x01,
-	0x08, 0x92, 0x43, 0x6b,
+	0x08, 0x92, 0x4b, 0x6b,
	0x02, 0xea, 0xb4, 0x04,
	0x01, 0x38, 0xe1, 0x30,
	0x05, 0x39, 0xe3, 0x98,

@@ -794,12 +798,20 @@
};

typedef int ahd_patch_func_t (struct ahd_softc *ahd); +static ahd_patch_func_t ahd_patch23_func;
+
+static int
+ahd_patch23_func(struct ahd_softc *ahd)
+{
+ return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) != 0);
+}
+
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);
+ return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) == 0);
}

static ahd_patch_func_t ahd_patch21_func;
@@ -807,7 +819,7 @@
static int
ahd_patch21_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_patch20_func;
@@ -815,7 +827,7 @@
static int
ahd_patch20_func(struct ahd_softc *ahd)
{
- return ((ahd->features & AHD_RTI) == 0);
+ return ((ahd->flags & AHD_INITIATORROLE) != 0);
}

static ahd_patch_func_t ahd_patch19_func;
@@ -823,7 +835,7 @@
static int
ahd_patch19_func(struct ahd_softc *ahd)
{
- return ((ahd->flags & AHD_INITIATORROLE) != 0);
+ return ((ahd->flags & AHD_TARGETROLE) != 0);
}

static ahd_patch_func_t ahd_patch18_func;
@@ -831,7 +843,7 @@
static int
ahd_patch18_func(struct ahd_softc *ahd)
{
- return ((ahd->flags & AHD_TARGETROLE) != 0);
+ return ((ahd->bugs & AHD_AUTOFLUSH_BUG) != 0);
}

static ahd_patch_func_t ahd_patch17_func;
@@ -839,7 +851,7 @@
static int
ahd_patch17_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_patch16_func;
@@ -847,7 +859,7 @@
static int
ahd_patch16_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_patch15_func;
@@ -855,7 +867,7 @@
static int
ahd_patch15_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_patch14_func;
@@ -863,7 +875,7 @@
static int
ahd_patch14_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_patch13_func;
@@ -871,7 +883,7 @@
static int
ahd_patch13_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_patch12_func;
@@ -879,7 +891,7 @@
static int
ahd_patch12_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_patch11_func;
@@ -887,7 +899,7 @@
static int
ahd_patch11_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_patch10_func;
@@ -895,7 +907,7 @@
static int
ahd_patch10_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_patch9_func;
@@ -903,7 +915,7 @@
static int
ahd_patch9_func(struct ahd_softc *ahd)
{
- return ((ahd->flags & AHD_SEQUENCER_DEBUG) != 0);
+ return ((ahd->features & AHD_FAST_CDB_DELIVERY) != 0);
}

static ahd_patch_func_t ahd_patch8_func;
@@ -1021,100 +1033,102 @@

	{ 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_patch7_func, 193, 3, 1 },
+ { ahd_patch5_func, 202, 16, 2 },
+ { ahd_patch0_func, 218, 1, 1 },
+ { ahd_patch8_func, 238, 2, 1 },
+ { ahd_patch1_func, 242, 1, 2 },
+ { ahd_patch0_func, 243, 1, 1 },
+ { ahd_patch7_func, 246, 3, 1 },
+ { ahd_patch1_func, 261, 1, 2 },
+ { ahd_patch0_func, 262, 1, 1 },
+ { ahd_patch1_func, 265, 1, 2 },
+ { ahd_patch0_func, 266, 1, 1 },
+ { ahd_patch2_func, 269, 1, 2 },
+ { ahd_patch0_func, 270, 1, 1 },
+ { ahd_patch9_func, 283, 2, 2 },
+ { ahd_patch0_func, 285, 1, 1 },
+ { ahd_patch1_func, 327, 1, 2 },
+ { ahd_patch0_func, 328, 1, 1 },

	{ ahd_patch2_func, 336, 1, 2 },
	{ ahd_patch0_func, 337, 1, 1 },

- { ahd_patch1_func, 343, 1, 2 },
- { ahd_patch0_func, 344, 1, 1 },
- { ahd_patch1_func, 346, 1, 2 },
- { ahd_patch0_func, 347, 1, 1 },
- { ahd_patch9_func, 366, 1, 1 },
- { ahd_patch9_func, 369, 1, 1 },
- { ahd_patch9_func, 371, 1, 1 },
- { ahd_patch9_func, 383, 1, 1 },
- { ahd_patch1_func, 393, 1, 2 },
- { ahd_patch0_func, 394, 1, 1 },
- { ahd_patch1_func, 396, 1, 2 },
- { ahd_patch0_func, 397, 1, 1 },
- { ahd_patch1_func, 405, 1, 2 },
- { ahd_patch0_func, 406, 1, 1 },
- { ahd_patch2_func, 419, 1, 2 },
- { ahd_patch0_func, 420, 1, 1 },
- { ahd_patch10_func, 450, 1, 1 },
- { ahd_patch1_func, 457, 1, 2 },
- { ahd_patch0_func, 458, 1, 1 },
- { ahd_patch2_func, 470, 1, 2 },
- { ahd_patch0_func, 471, 1, 1 },
- { ahd_patch11_func, 476, 6, 2 },
- { ahd_patch0_func, 482, 1, 1 },
- { ahd_patch12_func, 505, 1, 1 },
- { ahd_patch13_func, 514, 1, 1 },
- { ahd_patch14_func, 515, 1, 2 },
- { ahd_patch0_func, 516, 1, 1 },
- { ahd_patch15_func, 519, 1, 1 },
- { ahd_patch14_func, 520, 1, 1 },
- { ahd_patch16_func, 531, 1, 2 },
- { ahd_patch0_func, 532, 1, 1 },
- { ahd_patch1_func, 551, 1, 2 },
- { ahd_patch0_func, 552, 1, 1 },
+ { ahd_patch2_func, 340, 1, 2 },
+ { ahd_patch0_func, 341, 1, 1 },
+ { ahd_patch1_func, 347, 1, 2 },
+ { ahd_patch0_func, 348, 1, 1 },
+ { ahd_patch1_func, 350, 1, 2 },
+ { ahd_patch0_func, 351, 1, 1 },
+ { ahd_patch10_func, 370, 1, 1 },
+ { ahd_patch10_func, 373, 1, 1 },
+ { ahd_patch10_func, 375, 1, 1 },
+ { ahd_patch10_func, 387, 1, 1 },
+ { ahd_patch1_func, 397, 1, 2 },
+ { ahd_patch0_func, 398, 1, 1 },
+ { ahd_patch1_func, 400, 1, 2 },
+ { ahd_patch0_func, 401, 1, 1 },
+ { ahd_patch1_func, 409, 1, 2 },
+ { ahd_patch0_func, 410, 1, 1 },
+ { ahd_patch2_func, 423, 1, 2 },
+ { ahd_patch0_func, 424, 1, 1 },
+ { ahd_patch11_func, 454, 1, 1 },
+ { ahd_patch1_func, 461, 1, 2 },
+ { ahd_patch0_func, 462, 1, 1 },
+ { ahd_patch2_func, 474, 1, 2 },
+ { ahd_patch0_func, 475, 1, 1 },
+ { ahd_patch12_func, 480, 6, 2 },
+ { ahd_patch0_func, 486, 1, 1 },
+ { ahd_patch13_func, 509, 1, 1 },
+ { ahd_patch14_func, 518, 1, 1 },
+ { ahd_patch15_func, 519, 1, 2 },
+ { ahd_patch0_func, 520, 1, 1 },
+ { ahd_patch16_func, 523, 1, 1 },
+ { ahd_patch15_func, 524, 1, 1 },
+ { ahd_patch17_func, 535, 1, 2 },
+ { ahd_patch0_func, 536, 1, 1 },

	{ ahd_patch1_func, 555, 1, 2 },
	{ ahd_patch0_func, 556, 1, 1 },

- { ahd_patch2_func, 561, 1, 2 },
- { ahd_patch0_func, 562, 1, 1 },
- { ahd_patch2_func, 566, 1, 2 },
- { ahd_patch0_func, 567, 1, 1 },
- { ahd_patch1_func, 568, 1, 2 },
- { ahd_patch0_func, 569, 1, 1 },
- { ahd_patch2_func, 580, 1, 2 },
- { ahd_patch0_func, 581, 1, 1 },
- { ahd_patch17_func, 585, 1, 1 },
- { ahd_patch18_func, 590, 1, 1 },
- { ahd_patch19_func, 591, 2, 1 },
- { ahd_patch18_func, 595, 1, 2 },
- { ahd_patch0_func, 596, 1, 1 },
- { ahd_patch2_func, 599, 1, 2 },
+ { 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_patch18_func, 589, 1, 1 },
+ { ahd_patch19_func, 594, 1, 1 },
+ { ahd_patch20_func, 595, 2, 1 },
+ { ahd_patch19_func, 599, 1, 2 },

	{ ahd_patch0_func, 600, 1, 1 },

- { ahd_patch2_func, 615, 1, 2 },
- { ahd_patch0_func, 616, 1, 1 },
- { ahd_patch20_func, 617, 14, 1 },
- { ahd_patch1_func, 635, 1, 2 },
- { ahd_patch0_func, 636, 1, 1 },
- { ahd_patch20_func, 637, 1, 1 },
- { ahd_patch1_func, 649, 1, 2 },
- { ahd_patch0_func, 650, 1, 1 },
- { ahd_patch1_func, 657, 1, 2 },
- { ahd_patch0_func, 658, 1, 1 },
- { ahd_patch17_func, 681, 1, 1 },
- { ahd_patch17_func, 719, 1, 1 },
- { ahd_patch1_func, 730, 1, 2 },
- { ahd_patch0_func, 731, 1, 1 },
- { ahd_patch1_func, 748, 1, 2 },
- { ahd_patch0_func, 749, 1, 1 },
- { ahd_patch1_func, 751, 1, 2 },
- { ahd_patch0_func, 752, 1, 1 },
+ { ahd_patch2_func, 603, 1, 2 },
+ { ahd_patch0_func, 604, 1, 1 },
+ { ahd_patch2_func, 619, 1, 2 },
+ { ahd_patch0_func, 620, 1, 1 },
+ { ahd_patch21_func, 621, 14, 1 },
+ { ahd_patch1_func, 639, 1, 2 },
+ { ahd_patch0_func, 640, 1, 1 },
+ { ahd_patch21_func, 641, 1, 1 },
+ { ahd_patch1_func, 653, 1, 2 },
+ { ahd_patch0_func, 654, 1, 1 },
+ { ahd_patch1_func, 661, 1, 2 },
+ { ahd_patch0_func, 662, 1, 1 },
+ { ahd_patch18_func, 685, 1, 1 },
+ { ahd_patch18_func, 723, 1, 1 },
+ { ahd_patch1_func, 734, 1, 2 },
+ { ahd_patch0_func, 735, 1, 1 },
+ { ahd_patch1_func, 752, 1, 2 },
+ { ahd_patch0_func, 753, 1, 1 },

	{ ahd_patch1_func, 755, 1, 2 },
	{ ahd_patch0_func, 756, 1, 1 },

- { ahd_patch21_func, 758, 1, 2 },
- { ahd_patch0_func, 759, 2, 1 },
- { ahd_patch22_func, 762, 4, 2 },
- { ahd_patch0_func, 766, 1, 1 },
- { ahd_patch22_func, 774, 11, 1 }
+ { ahd_patch1_func, 759, 1, 2 },
+ { ahd_patch0_func, 760, 1, 1 },
+ { ahd_patch22_func, 762, 1, 2 },
+ { ahd_patch0_func, 763, 2, 1 },
+ { ahd_patch23_func, 766, 4, 2 },
+ { ahd_patch0_func, 770, 1, 1 },
+ { ahd_patch23_func, 778, 11, 1 }
};

static struct cs {
@@ -1129,10 +1143,10 @@

	{ 129, 157 },
	{ 159, 162 },
	{ 170, 178 },

- { 201, 250 },
- { 681, 697 },
- { 697, 711 },
- { 721, 725 }
+ { 202, 252 },
+ { 685, 701 },
+ { 701, 715 },
+ { 725, 729 }
};

static const int num_critical_sections = sizeof(critical_sections)
==== //depot/aic7xxx/aic7xxx/aic7xxx.h#80 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx.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/aic7xxx.h#80 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#81 $
 *
 * $FreeBSD$
 */

@@ -243,7 +243,7 @@

	 */
	AHC_AIC7850_FE	= AHC_SPIOCAP|AHC_AUTOPAUSE|AHC_TARGETMODE|AHC_ULTRA,
	AHC_AIC7860_FE	= AHC_AIC7850_FE,
-	AHC_AIC7870_FE	= AHC_TARGETMODE,
+	AHC_AIC7870_FE	= AHC_TARGETMODE|AHC_AUTOPAUSE,
	AHC_AIC7880_FE	= AHC_AIC7870_FE|AHC_ULTRA,
	/*
	 * Although we have space for both the initiator and

==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_reg.h#25 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped ==== ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_reg_print.c#12 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped ==== ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_seq.h#26 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped ====