From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luben Tuikov Subject: [patch 5/28] Sync up drivers/scsi/aic7xxx Date: Tue, 28 Sep 2004 09:04:45 -0400 Sender: linux-scsi-owner@vger.kernel.org Message-ID: <4159616D.8090701@adaptec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from magic.adaptec.com ([216.52.22.17]:20170 "EHLO magic.adaptec.com") by vger.kernel.org with ESMTP id S267713AbUI1NEy (ORCPT ); Tue, 28 Sep 2004 09:04:54 -0400 Received: from redfish.adaptec.com (redfish.adaptec.com [162.62.50.11]) by magic.adaptec.com (8.11.6/8.11.6) with ESMTP id i8SD4rW02433 for ; Tue, 28 Sep 2004 06:04:53 -0700 Received: from rtpe2k01.adaptec.com (rtpe2k01.adaptec.com [10.110.12.40]) by redfish.adaptec.com (8.11.6/8.11.6) with ESMTP id i8SD4qm30845 for ; Tue, 28 Sep 2004 06:04:52 -0700 List-Id: linux-scsi@vger.kernel.org To: SCSI Mailing List Sync up drivers/scsi/aic7xxx/. (2281-2285) Signed-off-by: Luben Tuikov ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_reg.h#71 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped ==== --- /tmp/tmp.26263.0 2004-09-27 12:50:17.540423776 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped 2003-08-26 19:01:58.000000000 -0400 @@ -2,7 +2,7 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#99 $ + * $Id$ * $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 0x26d -#define LABEL_timer_isr 0x269 +#define LABEL_seq_isr 0x26f +#define LABEL_timer_isr 0x26b ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_reg_print.c#52 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped ==== --- /tmp/tmp.26263.1 2004-09-27 12:50:18.088340480 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped 2003-08-26 19:01:58.000000000 -0400 @@ -2,7 +2,7 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#99 $ + * $Id$ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $ */ ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_seq.h#72 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped ==== --- /tmp/tmp.26263.2 2004-09-27 12:50:18.284310688 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped 2003-08-26 19:01:58.000000000 -0400 @@ -2,7 +2,7 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#99 $ + * $Id$ * $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, 0x94, 0x69, + 0x40, 0x4b, 0x96, 0x69, 0x00, 0xe2, 0x54, 0x59, - 0x40, 0x4b, 0x94, 0x69, + 0x40, 0x4b, 0x96, 0x69, 0x20, 0x4b, 0x82, 0x69, 0xfc, 0x42, 0x24, 0x78, 0x10, 0x40, 0x24, 0x78, - 0x00, 0xe2, 0xcc, 0x5d, + 0x00, 0xe2, 0xd0, 0x5d, 0x20, 0x4d, 0x28, 0x78, - 0x00, 0xe2, 0xcc, 0x5d, + 0x00, 0xe2, 0xd0, 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, 0x5e, 0x5b, + 0x00, 0xe2, 0x62, 0x5b, 0x00, 0xe2, 0x3e, 0x40, 0x00, 0xea, 0x44, 0x59, 0x01, 0xea, 0x00, 0x30, @@ -199,7 +199,8 @@ 0x11, 0xea, 0x44, 0x59, 0x11, 0xea, 0x00, 0x00, 0x02, 0x48, 0x51, 0x35, - 0x04, 0x41, 0x86, 0x79, + 0xc0, 0x4a, 0x94, 0x00, + 0x04, 0x41, 0x88, 0x79, 0x08, 0xea, 0x98, 0x00, 0x08, 0x57, 0xae, 0x00, 0x08, 0x3c, 0x78, 0x00, @@ -207,11 +208,12 @@ 0x0f, 0x67, 0xc0, 0x09, 0x00, 0x34, 0x69, 0x02, 0x20, 0xea, 0x96, 0x00, - 0x00, 0xe2, 0xfc, 0x41, - 0x40, 0x3a, 0xb0, 0x69, + 0x00, 0xe2, 0x00, 0x42, + 0xc0, 0x4a, 0x94, 0x00, + 0x40, 0x3a, 0xb4, 0x69, 0x02, 0x55, 0x06, 0x68, - 0x02, 0x56, 0xb0, 0x69, - 0xff, 0x5b, 0xb0, 0x61, + 0x02, 0x56, 0xb4, 0x69, + 0xff, 0x5b, 0xb4, 0x61, 0x02, 0x20, 0x51, 0x31, 0x80, 0xea, 0xb2, 0x01, 0x44, 0xea, 0x00, 0x00, @@ -219,40 +221,40 @@ 0x33, 0xea, 0x00, 0x00, 0xff, 0xea, 0xb2, 0x09, 0xff, 0xe0, 0xc0, 0x19, - 0xff, 0xe0, 0xb2, 0x79, + 0xff, 0xe0, 0xb6, 0x79, 0x02, 0xac, 0x51, 0x31, - 0x00, 0xe2, 0xa8, 0x41, + 0x00, 0xe2, 0xac, 0x41, 0x02, 0x5e, 0x50, 0x31, 0x02, 0xa8, 0xb8, 0x30, 0x02, 0x5c, 0x50, 0x31, - 0xff, 0xad, 0xc3, 0x71, + 0xff, 0xad, 0xc7, 0x71, 0x02, 0xac, 0x41, 0x31, 0x02, 0x22, 0x51, 0x31, 0x02, 0xa0, 0x5c, 0x33, 0x02, 0xa0, 0x44, 0x32, - 0x00, 0xe2, 0xcc, 0x41, - 0x10, 0x92, 0xcd, 0x69, + 0x00, 0xe2, 0xd0, 0x41, + 0x10, 0x92, 0xd1, 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, 0xd5, 0x61, + 0xff, 0x21, 0xd9, 0x61, 0xff, 0xea, 0x46, 0x02, 0x02, 0x5c, 0x50, 0x31, 0x40, 0xea, 0x96, 0x00, - 0x02, 0x56, 0xd4, 0x6d, - 0x01, 0x55, 0xd4, 0x6d, - 0x10, 0x92, 0xe1, 0x79, - 0x10, 0x40, 0xea, 0x69, - 0x01, 0x56, 0xea, 0x79, + 0x02, 0x56, 0xd8, 0x6d, + 0x01, 0x55, 0xd8, 0x6d, + 0x10, 0x92, 0xe5, 0x79, + 0x10, 0x40, 0xee, 0x69, + 0x01, 0x56, 0xee, 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, + 0x04, 0x41, 0xf4, 0x79, 0x08, 0xea, 0x98, 0x00, 0x08, 0x57, 0xae, 0x00, 0x01, 0x93, 0x69, 0x32, @@ -260,87 +262,87 @@ 0x40, 0xea, 0x66, 0x02, 0x08, 0x3c, 0x78, 0x00, 0x80, 0xea, 0x62, 0x02, - 0x00, 0xe2, 0xc0, 0x5b, + 0x00, 0xe2, 0xc4, 0x5b, 0x01, 0x36, 0xc1, 0x31, - 0x9f, 0xe0, 0x54, 0x7c, - 0x80, 0xe0, 0x10, 0x72, - 0xa0, 0xe0, 0x4c, 0x72, - 0xc0, 0xe0, 0x42, 0x72, - 0xe0, 0xe0, 0x7c, 0x72, + 0x9f, 0xe0, 0x58, 0x7c, + 0x80, 0xe0, 0x14, 0x72, + 0xa0, 0xe0, 0x50, 0x72, + 0xc0, 0xe0, 0x46, 0x72, + 0xe0, 0xe0, 0x80, 0x72, 0x01, 0xea, 0x50, 0x59, 0x01, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xfc, 0x41, - 0x80, 0x33, 0x17, 0x7a, + 0x00, 0xe2, 0x00, 0x42, + 0x80, 0x33, 0x1b, 0x7a, 0x03, 0xea, 0x50, 0x59, 0x03, 0xea, 0x04, 0x00, - 0xee, 0x00, 0x1e, 0x6a, + 0xee, 0x00, 0x22, 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, 0x2e, 0x52, + 0x00, 0xe2, 0x32, 0x52, 0x09, 0x80, 0xe1, 0x30, 0x02, 0xea, 0x36, 0x00, 0xa8, 0xea, 0x32, 0x00, - 0x00, 0xe2, 0x34, 0x42, + 0x00, 0xe2, 0x38, 0x42, 0x01, 0x96, 0xd1, 0x30, 0x10, 0x80, 0x89, 0x31, 0x20, 0xea, 0x32, 0x00, 0xbf, 0x33, 0x67, 0x0a, - 0x10, 0x4c, 0x3e, 0x6a, - 0x20, 0x19, 0x36, 0x6a, + 0x10, 0x4c, 0x42, 0x6a, 0x20, 0x19, 0x3a, 0x6a, - 0x02, 0x4d, 0xfc, 0x69, + 0x20, 0x19, 0x3e, 0x6a, + 0x02, 0x4d, 0x00, 0x6a, 0x40, 0x33, 0x67, 0x02, - 0x00, 0xe2, 0xfc, 0x41, - 0x80, 0x33, 0xbd, 0x6a, + 0x00, 0xe2, 0x00, 0x42, + 0x80, 0x33, 0xc1, 0x6a, 0x01, 0x44, 0x10, 0x33, 0x08, 0x92, 0x25, 0x03, - 0x00, 0xe2, 0xfc, 0x41, + 0x00, 0xe2, 0x00, 0x42, 0x10, 0xea, 0x80, 0x00, 0x01, 0x31, 0xc5, 0x31, - 0x80, 0xe2, 0x68, 0x62, - 0x10, 0x92, 0x8d, 0x6a, + 0x80, 0xe2, 0x6c, 0x62, + 0x10, 0x92, 0x91, 0x6a, 0xc0, 0x94, 0xc5, 0x01, - 0x40, 0x92, 0x59, 0x6a, + 0x40, 0x92, 0x5d, 0x6a, 0xbf, 0xe2, 0xc4, 0x09, - 0x20, 0x92, 0x6d, 0x7a, + 0x20, 0x92, 0x71, 0x7a, 0x01, 0xe2, 0x88, 0x30, - 0x00, 0xe2, 0xc0, 0x5b, - 0xa0, 0x36, 0x75, 0x62, + 0x00, 0xe2, 0xc4, 0x5b, + 0xa0, 0x36, 0x79, 0x62, 0x23, 0x92, 0x89, 0x08, - 0x00, 0xe2, 0xc0, 0x5b, - 0xa0, 0x36, 0x75, 0x62, - 0x00, 0xa8, 0x6c, 0x42, - 0xff, 0xe2, 0x6c, 0x62, - 0x00, 0xe2, 0x8c, 0x42, + 0x00, 0xe2, 0xc4, 0x5b, + 0xa0, 0x36, 0x79, 0x62, + 0x00, 0xa8, 0x70, 0x42, + 0xff, 0xe2, 0x70, 0x62, + 0x00, 0xe2, 0x90, 0x42, 0x40, 0xea, 0x98, 0x00, 0x01, 0xe2, 0x88, 0x30, - 0x00, 0xe2, 0xc0, 0x5b, - 0xa0, 0x36, 0x4b, 0x72, + 0x00, 0xe2, 0xc4, 0x5b, + 0xa0, 0x36, 0x4f, 0x72, 0x40, 0xea, 0x98, 0x00, 0x01, 0x31, 0x89, 0x32, 0x08, 0xea, 0x62, 0x02, - 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, + 0x00, 0xe2, 0x00, 0x42, + 0xe0, 0xea, 0xe0, 0x5b, + 0x80, 0xe0, 0xcc, 0x6a, + 0x04, 0xe0, 0x72, 0x73, + 0x02, 0xe0, 0xa2, 0x73, + 0x00, 0xea, 0x2a, 0x73, + 0x03, 0xe0, 0xb2, 0x73, + 0x23, 0xe0, 0xa2, 0x72, + 0x08, 0xe0, 0xc8, 0x72, + 0x00, 0xe2, 0xc4, 0x5b, 0x07, 0xea, 0x50, 0x59, 0x07, 0xea, 0x04, 0x00, - 0x08, 0x42, 0xfd, 0x71, - 0x04, 0x42, 0x9b, 0x62, + 0x08, 0x42, 0x01, 0x72, + 0x04, 0x42, 0x9f, 0x62, 0x01, 0x43, 0x89, 0x30, - 0x00, 0xe2, 0x8c, 0x42, + 0x00, 0xe2, 0x90, 0x42, 0x01, 0x44, 0xd4, 0x31, - 0x00, 0xe2, 0x8c, 0x42, + 0x00, 0xe2, 0x90, 0x42, 0x01, 0x00, 0x60, 0x32, 0x33, 0xea, 0x44, 0x59, 0x33, 0xea, 0x00, 0x00, @@ -348,20 +350,20 @@ 0x01, 0x64, 0xc0, 0x31, 0x00, 0x30, 0x45, 0x59, 0x01, 0x30, 0x01, 0x30, - 0x01, 0xe0, 0xc2, 0x7a, - 0xa0, 0xea, 0xd2, 0x5b, - 0x01, 0xa0, 0xc2, 0x62, - 0x01, 0x84, 0xb7, 0x7a, - 0x01, 0x95, 0xc5, 0x6a, + 0x01, 0xe0, 0xc6, 0x7a, + 0xa0, 0xea, 0xd6, 0x5b, + 0x01, 0xa0, 0xc6, 0x62, + 0x01, 0x84, 0xbb, 0x7a, + 0x01, 0x95, 0xc9, 0x6a, 0x05, 0xea, 0x50, 0x59, 0x05, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xc4, 0x42, + 0x00, 0xe2, 0xc8, 0x42, 0x03, 0xea, 0x50, 0x59, 0x03, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xc4, 0x42, - 0x07, 0xea, 0xe4, 0x5b, + 0x00, 0xe2, 0xc8, 0x42, + 0x07, 0xea, 0xe8, 0x5b, 0x01, 0x44, 0xd4, 0x31, - 0x00, 0xe2, 0xfc, 0x41, + 0x00, 0xe2, 0x00, 0x42, 0x3f, 0xe0, 0x6a, 0x0a, 0xc0, 0x34, 0xc1, 0x09, 0x00, 0x35, 0x51, 0x01, @@ -372,54 +374,54 @@ 0x01, 0xea, 0xc6, 0x01, 0x02, 0xe2, 0xc8, 0x31, 0x02, 0xec, 0x40, 0x31, - 0xff, 0xa1, 0xe4, 0x72, + 0xff, 0xa1, 0xe8, 0x72, 0x02, 0xe8, 0xda, 0x31, 0x02, 0xa0, 0x50, 0x31, - 0x00, 0xe2, 0x06, 0x43, + 0x00, 0xe2, 0x0a, 0x43, 0x80, 0x33, 0x67, 0x02, 0x01, 0x44, 0xd4, 0x31, - 0x00, 0xe2, 0xc0, 0x5b, + 0x00, 0xe2, 0xc4, 0x5b, 0x01, 0x33, 0x67, 0x02, - 0xe0, 0x36, 0x21, 0x63, + 0xe0, 0x36, 0x25, 0x63, 0x02, 0x33, 0x67, 0x02, - 0x20, 0x46, 0x1a, 0x63, + 0x20, 0x46, 0x1e, 0x63, 0xff, 0xea, 0x52, 0x09, - 0xa8, 0xea, 0xd2, 0x5b, - 0x04, 0x92, 0x01, 0x7b, + 0xa8, 0xea, 0xd6, 0x5b, + 0x04, 0x92, 0x05, 0x7b, 0x01, 0x34, 0xc1, 0x31, - 0x00, 0x93, 0x01, 0x63, + 0x00, 0x93, 0x05, 0x63, 0x01, 0x35, 0xc1, 0x31, - 0x00, 0x94, 0x0b, 0x73, + 0x00, 0x94, 0x0f, 0x73, 0x01, 0xa9, 0x52, 0x11, - 0xff, 0xa9, 0xf6, 0x6a, - 0x00, 0xe2, 0x1a, 0x43, + 0xff, 0xa9, 0xfa, 0x6a, + 0x00, 0xe2, 0x1e, 0x43, 0x10, 0x33, 0x67, 0x02, - 0x04, 0x92, 0x1b, 0x7b, + 0x04, 0x92, 0x1f, 0x7b, 0xfb, 0x92, 0x25, 0x0b, 0xff, 0xea, 0x66, 0x0a, - 0x01, 0xa4, 0x15, 0x6b, + 0x01, 0xa4, 0x19, 0x6b, 0x02, 0xa8, 0x90, 0x32, 0x00, 0xe2, 0x6a, 0x59, - 0x10, 0x92, 0xc5, 0x7a, - 0xff, 0xea, 0xe4, 0x5b, - 0x00, 0xe2, 0xc4, 0x42, + 0x10, 0x92, 0xc9, 0x7a, + 0xff, 0xea, 0xe8, 0x5b, + 0x00, 0xe2, 0xc8, 0x42, 0x04, 0xea, 0x50, 0x59, 0x04, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xc4, 0x42, + 0x00, 0xe2, 0xc8, 0x42, 0x04, 0xea, 0x50, 0x59, 0x04, 0xea, 0x04, 0x00, - 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, + 0x00, 0xe2, 0x00, 0x42, + 0x08, 0x92, 0xc1, 0x7a, + 0xc0, 0x33, 0x35, 0x7b, + 0x80, 0x33, 0xc1, 0x6a, + 0xff, 0x88, 0x35, 0x6b, + 0x40, 0x33, 0xc1, 0x6a, + 0x10, 0x92, 0x3b, 0x7b, 0x0a, 0xea, 0x50, 0x59, 0x0a, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0x56, 0x5b, - 0x00, 0xe2, 0x8a, 0x43, - 0x50, 0x4b, 0x3e, 0x6b, + 0x00, 0xe2, 0x5a, 0x5b, + 0x00, 0xe2, 0x8e, 0x43, + 0x50, 0x4b, 0x42, 0x6b, 0xbf, 0x3a, 0x74, 0x08, 0x01, 0xe0, 0xf4, 0x31, 0xff, 0xea, 0xc0, 0x09, @@ -433,21 +435,21 @@ 0x33, 0xea, 0x00, 0x00, 0x02, 0x42, 0x51, 0x31, 0xff, 0x90, 0x65, 0x68, - 0xff, 0x88, 0x63, 0x6b, - 0x01, 0xa4, 0x5f, 0x6b, - 0x02, 0xa4, 0x67, 0x6b, - 0x01, 0x84, 0x67, 0x7b, + 0xff, 0x88, 0x67, 0x6b, + 0x01, 0xa4, 0x63, 0x6b, + 0x02, 0xa4, 0x6b, 0x6b, + 0x01, 0x84, 0x6b, 0x7b, 0x02, 0x28, 0x19, 0x33, 0x02, 0xa8, 0x50, 0x36, - 0xff, 0x88, 0x67, 0x73, - 0x00, 0xe2, 0x3a, 0x5b, + 0xff, 0x88, 0x6b, 0x73, + 0x00, 0xe2, 0x3e, 0x5b, 0x02, 0xa8, 0x20, 0x33, 0x02, 0x2c, 0x19, 0x33, 0x02, 0xa8, 0x58, 0x32, 0x04, 0xa4, 0x49, 0x07, - 0xc0, 0x33, 0xbd, 0x6a, + 0xc0, 0x33, 0xc1, 0x6a, 0x04, 0x92, 0x25, 0x03, - 0x20, 0x92, 0x8b, 0x6b, + 0x20, 0x92, 0x8f, 0x6b, 0x02, 0xa8, 0x40, 0x31, 0xc0, 0x34, 0xc1, 0x09, 0x00, 0x35, 0x51, 0x01, @@ -462,56 +464,56 @@ 0xf7, 0x57, 0xae, 0x08, 0x08, 0xea, 0x98, 0x00, 0x01, 0x44, 0xd4, 0x31, - 0xee, 0x00, 0x94, 0x6b, + 0xee, 0x00, 0x98, 0x6b, 0x02, 0xea, 0xb4, 0x00, - 0x00, 0xe2, 0xbc, 0x5b, - 0x09, 0x4c, 0x96, 0x7b, + 0x00, 0xe2, 0xc0, 0x5b, + 0x09, 0x4c, 0x9a, 0x7b, 0x08, 0x4c, 0x06, 0x68, 0x0b, 0xea, 0x50, 0x59, 0x0b, 0xea, 0x04, 0x00, 0x01, 0x44, 0xd4, 0x31, - 0x20, 0x33, 0xfd, 0x79, - 0x00, 0xe2, 0xa6, 0x5b, - 0x00, 0xe2, 0xfc, 0x41, - 0x01, 0x84, 0xab, 0x7b, + 0x20, 0x33, 0x01, 0x7a, + 0x00, 0xe2, 0xaa, 0x5b, + 0x00, 0xe2, 0x00, 0x42, + 0x01, 0x84, 0xaf, 0x7b, 0x01, 0xa4, 0x49, 0x07, 0x08, 0x60, 0x30, 0x33, 0x08, 0x80, 0x41, 0x37, 0xdf, 0x33, 0x67, 0x0a, - 0xee, 0x00, 0xb8, 0x6b, + 0xee, 0x00, 0xbc, 0x6b, 0x05, 0xea, 0xb4, 0x00, 0x33, 0xea, 0x44, 0x59, 0x33, 0xea, 0x00, 0x00, 0x00, 0xe2, 0x6a, 0x59, - 0x00, 0xe2, 0xc4, 0x42, + 0x00, 0xe2, 0xc8, 0x42, 0x01, 0xea, 0x6c, 0x02, 0xc0, 0xea, 0x66, 0x06, - 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, + 0xff, 0x42, 0xd0, 0x6b, + 0x01, 0x41, 0xc4, 0x6b, + 0x02, 0x41, 0xc4, 0x7b, + 0xff, 0x42, 0xd0, 0x6b, + 0x01, 0x41, 0xc4, 0x6b, + 0x02, 0x41, 0xc4, 0x7b, + 0xff, 0x42, 0xd0, 0x7b, + 0x04, 0x4c, 0xc4, 0x6b, 0xe0, 0x41, 0x6c, 0x0e, 0x01, 0x44, 0xd4, 0x31, - 0xff, 0x42, 0xd4, 0x7b, - 0x04, 0x4c, 0xd4, 0x6b, + 0xff, 0x42, 0xd8, 0x7b, + 0x04, 0x4c, 0xd8, 0x6b, 0xe0, 0x41, 0x6c, 0x0a, - 0xe0, 0x36, 0xfd, 0x61, + 0xe0, 0x36, 0x01, 0x62, 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, 0xec, 0x7b, + 0x04, 0xa6, 0xf0, 0x7b, 0xff, 0xea, 0x5a, 0x09, 0xff, 0xea, 0x4c, 0x0d, - 0x01, 0xa6, 0x0a, 0x6c, + 0x01, 0xa6, 0x0e, 0x6c, 0x10, 0xad, 0x64, 0x78, - 0x80, 0xad, 0x02, 0x6c, + 0x80, 0xad, 0x06, 0x6c, 0x08, 0xad, 0x64, 0x68, 0x04, 0x84, 0xf9, 0x30, 0x00, 0xea, 0x08, 0x81, @@ -537,7 +539,7 @@ 0x00, 0x86, 0x0d, 0x23, 0x00, 0x87, 0x0f, 0x23, 0x01, 0x84, 0xc5, 0x31, - 0x80, 0x83, 0x2d, 0x7c, + 0x80, 0x83, 0x31, 0x7c, 0x02, 0xe2, 0xc4, 0x01, 0xff, 0xea, 0x4c, 0x09, 0x01, 0xe2, 0x36, 0x30, @@ -548,75 +550,75 @@ 0xfe, 0xa6, 0x4c, 0x0d, 0x0b, 0x98, 0xe1, 0x30, 0xfd, 0xa4, 0x49, 0x09, - 0x80, 0xa3, 0x41, 0x7c, + 0x80, 0xa3, 0x45, 0x7c, 0x02, 0xa4, 0x48, 0x01, 0x01, 0xa4, 0x36, 0x30, 0xa8, 0xea, 0x32, 0x00, 0xfd, 0xa4, 0x49, 0x0b, 0x05, 0xa3, 0x07, 0x33, - 0x80, 0x83, 0x4d, 0x6c, + 0x80, 0x83, 0x51, 0x6c, 0x02, 0xea, 0x4c, 0x05, 0xff, 0xea, 0x4c, 0x0d, 0x00, 0xe2, 0x3e, 0x59, - 0x02, 0xa6, 0xee, 0x6b, + 0x02, 0xa6, 0xf2, 0x6b, 0x80, 0xf9, 0xf2, 0x05, - 0xc0, 0x33, 0x5b, 0x7c, + 0xc0, 0x33, 0x5f, 0x7c, 0x03, 0xea, 0x50, 0x59, 0x03, 0xea, 0x04, 0x00, - 0x20, 0x33, 0x7f, 0x7c, - 0x01, 0x84, 0x65, 0x6c, + 0x20, 0x33, 0x83, 0x7c, + 0x01, 0x84, 0x69, 0x6c, 0x06, 0xea, 0x50, 0x59, 0x06, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0x82, 0x44, + 0x00, 0xe2, 0x86, 0x44, 0x01, 0x00, 0x60, 0x32, - 0xee, 0x00, 0x6e, 0x6c, + 0xee, 0x00, 0x72, 0x6c, 0x05, 0xea, 0xb4, 0x00, 0x33, 0xea, 0x44, 0x59, 0x33, 0xea, 0x00, 0x00, 0x80, 0x3d, 0x7a, 0x00, - 0xfc, 0x42, 0x70, 0x7c, + 0xfc, 0x42, 0x74, 0x7c, 0x7f, 0x3d, 0x7a, 0x08, 0x00, 0x30, 0x45, 0x59, 0x01, 0x30, 0x01, 0x30, 0x09, 0xea, 0x50, 0x59, 0x09, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xfc, 0x41, - 0x01, 0xa4, 0x65, 0x6c, - 0x00, 0xe2, 0x38, 0x5c, + 0x00, 0xe2, 0x00, 0x42, + 0x01, 0xa4, 0x69, 0x6c, + 0x00, 0xe2, 0x3c, 0x5c, 0x20, 0x33, 0x67, 0x02, 0x01, 0x00, 0x60, 0x32, - 0x02, 0xa6, 0x8a, 0x7c, - 0x00, 0xe2, 0x4e, 0x5c, + 0x02, 0xa6, 0x8e, 0x7c, + 0x00, 0xe2, 0x52, 0x5c, 0x00, 0xe2, 0x56, 0x58, 0x00, 0xe2, 0x66, 0x58, 0x00, 0xe2, 0x3a, 0x58, 0x00, 0x30, 0x45, 0x59, 0x01, 0x30, 0x01, 0x30, - 0x20, 0x19, 0x8a, 0x6c, - 0x00, 0xe2, 0xba, 0x5c, - 0x04, 0x19, 0xa4, 0x6c, + 0x20, 0x19, 0x8e, 0x6c, + 0x00, 0xe2, 0xbe, 0x5c, + 0x04, 0x19, 0xa8, 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, 0xe8, 0x5b, + 0x01, 0x84, 0xa9, 0x7c, + 0x01, 0x1b, 0xa2, 0x7c, + 0x01, 0x1a, 0xa8, 0x6c, + 0x00, 0xe2, 0x58, 0x44, + 0x80, 0x4b, 0xae, 0x6c, + 0x01, 0x4c, 0xaa, 0x7c, + 0x03, 0x42, 0x58, 0x6c, + 0x00, 0xe2, 0xec, 0x5b, 0x80, 0xf9, 0xf2, 0x01, - 0x04, 0x33, 0xfd, 0x79, - 0x00, 0xe2, 0xfc, 0x41, - 0x08, 0x5d, 0xc2, 0x6c, + 0x04, 0x33, 0x01, 0x7a, + 0x00, 0xe2, 0x00, 0x42, + 0x08, 0x5d, 0xc6, 0x6c, 0x00, 0xe2, 0x56, 0x58, 0x00, 0x30, 0x45, 0x59, 0x01, 0x30, 0x01, 0x30, - 0x02, 0x1b, 0xb2, 0x7c, - 0x08, 0x5d, 0xc0, 0x7c, + 0x02, 0x1b, 0xb6, 0x7c, + 0x08, 0x5d, 0xc4, 0x7c, 0x03, 0x68, 0x00, 0x37, 0x01, 0x84, 0x09, 0x07, - 0x80, 0x1b, 0xcc, 0x7c, - 0x80, 0x84, 0xcd, 0x6c, + 0x80, 0x1b, 0xd0, 0x7c, + 0x80, 0x84, 0xd1, 0x6c, 0xff, 0x85, 0x0b, 0x1b, 0xff, 0x86, 0x0d, 0x23, 0xff, 0x87, 0x0f, 0x23, @@ -628,161 +630,161 @@ 0xf9, 0xd9, 0xb2, 0x0d, 0x01, 0xd9, 0xb2, 0x05, 0x01, 0x52, 0x48, 0x31, - 0x20, 0xa4, 0xf6, 0x7c, - 0x20, 0x5b, 0xf6, 0x7c, - 0x80, 0xf9, 0x04, 0x7d, + 0x20, 0xa4, 0xfa, 0x7c, + 0x20, 0x5b, 0xfa, 0x7c, + 0x80, 0xf9, 0x08, 0x7d, 0x02, 0xea, 0xb4, 0x00, 0x11, 0x00, 0x00, 0x10, - 0x04, 0x19, 0x10, 0x7d, + 0x04, 0x19, 0x14, 0x7d, 0xdf, 0x19, 0x32, 0x08, - 0x60, 0x5b, 0xee, 0x6c, - 0x01, 0x4c, 0xea, 0x7c, + 0x60, 0x5b, 0xf2, 0x6c, + 0x01, 0x4c, 0xee, 0x7c, 0x20, 0x19, 0x32, 0x00, 0x01, 0xd9, 0xb2, 0x05, 0x02, 0xea, 0xb4, 0x00, 0x01, 0xd9, 0xb2, 0x05, - 0x10, 0x5b, 0x08, 0x6d, - 0x08, 0x5b, 0x12, 0x6d, - 0x20, 0x5b, 0x02, 0x6d, - 0x02, 0x5b, 0x32, 0x6d, + 0x10, 0x5b, 0x0c, 0x6d, + 0x08, 0x5b, 0x16, 0x6d, + 0x20, 0x5b, 0x06, 0x6d, + 0x02, 0x5b, 0x36, 0x6d, 0x0e, 0xea, 0x50, 0x59, 0x0e, 0xea, 0x04, 0x00, - 0x80, 0xf9, 0xf2, 0x6c, + 0x80, 0xf9, 0xf6, 0x6c, 0xdf, 0x5c, 0xb8, 0x08, 0x01, 0xd9, 0xb2, 0x05, - 0x01, 0xa4, 0xed, 0x6d, - 0x00, 0xe2, 0x38, 0x5c, - 0x00, 0xe2, 0x3c, 0x5d, + 0x01, 0xa4, 0xf1, 0x6d, + 0x00, 0xe2, 0x3c, 0x5c, + 0x00, 0xe2, 0x40, 0x5d, 0x01, 0x90, 0x21, 0x1b, 0x01, 0xd9, 0xb2, 0x05, - 0x00, 0xe2, 0x3a, 0x5b, + 0x00, 0xe2, 0x3e, 0x5b, 0xf3, 0x96, 0xd5, 0x19, - 0x00, 0xe2, 0x20, 0x55, - 0x80, 0x96, 0x21, 0x6d, + 0x00, 0xe2, 0x24, 0x55, + 0x80, 0x96, 0x25, 0x6d, 0x0f, 0xea, 0x50, 0x59, 0x0f, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0x28, 0x45, + 0x00, 0xe2, 0x2c, 0x45, 0x04, 0x8c, 0xe1, 0x30, 0x01, 0xea, 0xf2, 0x00, 0x02, 0xea, 0x36, 0x00, 0xa8, 0xea, 0x32, 0x00, - 0xff, 0x97, 0x2f, 0x7d, + 0xff, 0x97, 0x33, 0x7d, 0x14, 0xea, 0x50, 0x59, 0x14, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0x9e, 0x5d, + 0x00, 0xe2, 0xa2, 0x5d, 0x01, 0xd9, 0xb2, 0x05, 0x09, 0x80, 0xe1, 0x30, 0x02, 0xea, 0x36, 0x00, 0xa8, 0xea, 0x32, 0x00, - 0x00, 0xe2, 0x96, 0x5d, + 0x00, 0xe2, 0x9a, 0x5d, 0x01, 0xd9, 0xb2, 0x05, - 0x02, 0xa6, 0x4c, 0x7d, + 0x02, 0xa6, 0x50, 0x7d, 0x00, 0xe2, 0x3e, 0x59, - 0x20, 0x5b, 0x5a, 0x6d, - 0xfc, 0x42, 0x46, 0x7d, - 0x10, 0x40, 0x48, 0x6d, - 0x20, 0x4d, 0x4a, 0x7d, - 0x08, 0x5d, 0x5a, 0x6d, - 0x02, 0xa6, 0xee, 0x6b, + 0x20, 0x5b, 0x5e, 0x6d, + 0xfc, 0x42, 0x4a, 0x7d, + 0x10, 0x40, 0x4c, 0x6d, + 0x20, 0x4d, 0x4e, 0x7d, + 0x08, 0x5d, 0x5e, 0x6d, + 0x02, 0xa6, 0xf2, 0x6b, 0x00, 0xe2, 0x3e, 0x59, - 0x20, 0x5b, 0x5a, 0x6d, - 0x01, 0x1b, 0x7a, 0x6d, - 0xfc, 0x42, 0x56, 0x7d, - 0x10, 0x40, 0x58, 0x6d, + 0x20, 0x5b, 0x5e, 0x6d, + 0x01, 0x1b, 0x7e, 0x6d, + 0xfc, 0x42, 0x5a, 0x7d, + 0x10, 0x40, 0x5c, 0x6d, 0x20, 0x4d, 0x64, 0x78, 0x08, 0x5d, 0x64, 0x78, 0x02, 0x19, 0x32, 0x00, 0x01, 0x5b, 0x40, 0x31, - 0x00, 0xe2, 0xba, 0x5c, - 0x00, 0xe2, 0xa6, 0x5b, + 0x00, 0xe2, 0xbe, 0x5c, + 0x00, 0xe2, 0xaa, 0x5b, 0x20, 0xea, 0xb6, 0x00, - 0x00, 0xe2, 0xe8, 0x5b, + 0x00, 0xe2, 0xec, 0x5b, 0x20, 0x5c, 0xb8, 0x00, - 0x04, 0x19, 0x70, 0x6d, - 0x01, 0x1a, 0x70, 0x6d, + 0x04, 0x19, 0x74, 0x6d, + 0x01, 0x1a, 0x74, 0x6d, 0x00, 0xe2, 0x3e, 0x59, 0x01, 0x1a, 0x64, 0x78, 0x80, 0xf9, 0xf2, 0x01, - 0x20, 0xa0, 0xd4, 0x7d, + 0x20, 0xa0, 0xd8, 0x7d, 0xff, 0x90, 0x21, 0x1b, - 0x08, 0x92, 0x4b, 0x6b, + 0x08, 0x92, 0x4f, 0x6b, 0x02, 0xea, 0xb4, 0x04, 0x01, 0xa4, 0x49, 0x03, - 0x40, 0x5b, 0x8a, 0x6d, + 0x40, 0x5b, 0x8e, 0x6d, 0x00, 0xe2, 0x3e, 0x59, - 0x40, 0x5b, 0x8a, 0x6d, - 0x04, 0x5d, 0xee, 0x7d, - 0x01, 0x1a, 0xee, 0x7d, + 0x40, 0x5b, 0x8e, 0x6d, + 0x04, 0x5d, 0xf2, 0x7d, + 0x01, 0x1a, 0xf2, 0x7d, 0x20, 0x4d, 0x64, 0x78, - 0x40, 0x5b, 0xd4, 0x7d, - 0x04, 0x5d, 0xee, 0x7d, - 0x01, 0x1a, 0xee, 0x7d, + 0x40, 0x5b, 0xd8, 0x7d, + 0x04, 0x5d, 0xf2, 0x7d, + 0x01, 0x1a, 0xf2, 0x7d, 0x80, 0xf9, 0xf2, 0x01, 0xff, 0x90, 0x21, 0x1b, - 0x08, 0x92, 0x4b, 0x6b, + 0x08, 0x92, 0x4f, 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, 0xb2, 0x6d, - 0x40, 0x5b, 0xc0, 0x7d, - 0x01, 0x1b, 0xb2, 0x6d, + 0x01, 0x1b, 0xb6, 0x6d, + 0x40, 0x5b, 0xc4, 0x7d, + 0x01, 0x1b, 0xb6, 0x6d, 0x02, 0x19, 0x32, 0x00, 0x01, 0x1a, 0x64, 0x78, 0x80, 0xf9, 0xf2, 0x01, 0xff, 0xea, 0x10, 0x03, 0x08, 0x92, 0x25, 0x03, - 0x00, 0xe2, 0x4a, 0x43, - 0x01, 0x1a, 0xbc, 0x7d, - 0x40, 0x5b, 0xb8, 0x7d, - 0x01, 0x1a, 0xa6, 0x6d, + 0x00, 0xe2, 0x4e, 0x43, + 0x01, 0x1a, 0xc0, 0x7d, + 0x40, 0x5b, 0xbc, 0x7d, + 0x01, 0x1a, 0xaa, 0x6d, 0xfc, 0x42, 0x64, 0x78, - 0x01, 0x1a, 0xc0, 0x6d, + 0x01, 0x1a, 0xc4, 0x6d, 0x10, 0xea, 0x50, 0x59, 0x10, 0xea, 0x04, 0x00, 0xfc, 0x42, 0x64, 0x78, - 0x10, 0x40, 0xc6, 0x6d, + 0x10, 0x40, 0xca, 0x6d, 0x20, 0x4d, 0x64, 0x78, - 0x40, 0x5b, 0xa6, 0x6d, + 0x40, 0x5b, 0xaa, 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, 0xdc, 0x6d, + 0xee, 0x00, 0xe0, 0x6d, 0x80, 0xf9, 0xf2, 0x01, 0xff, 0x90, 0x21, 0x1b, 0x02, 0xea, 0xb4, 0x00, 0x20, 0xea, 0x9a, 0x00, - 0xf3, 0x42, 0xe6, 0x6d, + 0xf3, 0x42, 0xea, 0x6d, 0x12, 0xea, 0x50, 0x59, 0x12, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xfc, 0x41, + 0x00, 0xe2, 0x00, 0x42, 0x0d, 0xea, 0x50, 0x59, 0x0d, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0xfc, 0x41, + 0x00, 0xe2, 0x00, 0x42, 0x01, 0x90, 0x21, 0x1b, 0x11, 0xea, 0x50, 0x59, 0x11, 0xea, 0x04, 0x00, - 0x00, 0xe2, 0x3a, 0x5b, + 0x00, 0xe2, 0x3e, 0x5b, 0x08, 0x5a, 0xb4, 0x00, - 0x00, 0xe2, 0x14, 0x5e, + 0x00, 0xe2, 0x18, 0x5e, 0xa8, 0xea, 0x32, 0x00, 0x00, 0xe2, 0x3e, 0x59, - 0x80, 0x1a, 0x02, 0x7e, - 0x00, 0xe2, 0x14, 0x5e, + 0x80, 0x1a, 0x06, 0x7e, + 0x00, 0xe2, 0x18, 0x5e, 0x80, 0x19, 0x32, 0x00, - 0x40, 0x5b, 0x08, 0x6e, - 0x08, 0x5a, 0x08, 0x7e, + 0x40, 0x5b, 0x0c, 0x6e, + 0x08, 0x5a, 0x0c, 0x7e, 0x20, 0x4d, 0x64, 0x78, 0x02, 0x84, 0x09, 0x03, - 0x40, 0x5b, 0xd4, 0x7d, + 0x40, 0x5b, 0xd8, 0x7d, 0xff, 0x90, 0x21, 0x1b, 0x80, 0xf9, 0xf2, 0x01, - 0x08, 0x92, 0x4b, 0x6b, + 0x08, 0x92, 0x4f, 0x6b, 0x02, 0xea, 0xb4, 0x04, 0x01, 0x38, 0xe1, 0x30, 0x05, 0x39, 0xe3, 0x98, @@ -1033,102 +1035,104 @@ { ahd_patch0_func, 187, 1, 1 }, { ahd_patch2_func, 190, 1, 2 }, { ahd_patch0_func, 191, 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_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_patch3_func, 193, 1, 1 }, + { ahd_patch7_func, 194, 3, 1 }, + { ahd_patch3_func, 203, 1, 1 }, + { ahd_patch5_func, 204, 16, 2 }, + { ahd_patch0_func, 220, 1, 1 }, + { ahd_patch8_func, 240, 2, 1 }, + { ahd_patch1_func, 244, 1, 2 }, + { ahd_patch0_func, 245, 1, 1 }, + { ahd_patch7_func, 248, 3, 1 }, + { ahd_patch1_func, 263, 1, 2 }, + { ahd_patch0_func, 264, 1, 1 }, + { ahd_patch1_func, 267, 1, 2 }, + { ahd_patch0_func, 268, 1, 1 }, + { ahd_patch2_func, 271, 1, 2 }, + { ahd_patch0_func, 272, 1, 1 }, + { ahd_patch9_func, 285, 2, 2 }, + { ahd_patch0_func, 287, 1, 1 }, + { ahd_patch1_func, 329, 1, 2 }, + { ahd_patch0_func, 330, 1, 1 }, + { ahd_patch2_func, 338, 1, 2 }, + { ahd_patch0_func, 339, 1, 1 }, + { ahd_patch2_func, 342, 1, 2 }, + { ahd_patch0_func, 343, 1, 1 }, + { ahd_patch1_func, 349, 1, 2 }, + { ahd_patch0_func, 350, 1, 1 }, + { ahd_patch1_func, 352, 1, 2 }, + { ahd_patch0_func, 353, 1, 1 }, + { ahd_patch10_func, 372, 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_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_patch10_func, 377, 1, 1 }, + { ahd_patch10_func, 389, 1, 1 }, + { ahd_patch1_func, 399, 1, 2 }, + { ahd_patch0_func, 400, 1, 1 }, + { ahd_patch1_func, 402, 1, 2 }, + { ahd_patch0_func, 403, 1, 1 }, + { ahd_patch1_func, 411, 1, 2 }, + { ahd_patch0_func, 412, 1, 1 }, + { ahd_patch2_func, 425, 1, 2 }, + { ahd_patch0_func, 426, 1, 1 }, + { ahd_patch11_func, 456, 1, 1 }, + { ahd_patch1_func, 463, 1, 2 }, + { ahd_patch0_func, 464, 1, 1 }, + { ahd_patch2_func, 476, 1, 2 }, + { ahd_patch0_func, 477, 1, 1 }, + { ahd_patch12_func, 482, 6, 2 }, + { ahd_patch0_func, 488, 1, 1 }, + { ahd_patch13_func, 511, 1, 1 }, + { ahd_patch14_func, 520, 1, 1 }, + { ahd_patch15_func, 521, 1, 2 }, + { ahd_patch0_func, 522, 1, 1 }, + { ahd_patch16_func, 525, 1, 1 }, + { ahd_patch15_func, 526, 1, 1 }, + { ahd_patch17_func, 537, 1, 2 }, + { ahd_patch0_func, 538, 1, 1 }, + { ahd_patch1_func, 557, 1, 2 }, + { ahd_patch0_func, 558, 1, 1 }, + { ahd_patch1_func, 561, 1, 2 }, + { ahd_patch0_func, 562, 1, 1 }, + { ahd_patch2_func, 567, 1, 2 }, + { ahd_patch0_func, 568, 1, 1 }, + { ahd_patch2_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, 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_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 } + { ahd_patch1_func, 574, 1, 2 }, + { ahd_patch0_func, 575, 1, 1 }, + { ahd_patch2_func, 586, 1, 2 }, + { ahd_patch0_func, 587, 1, 1 }, + { ahd_patch18_func, 591, 1, 1 }, + { ahd_patch19_func, 596, 1, 1 }, + { ahd_patch20_func, 597, 2, 1 }, + { ahd_patch19_func, 601, 1, 2 }, + { ahd_patch0_func, 602, 1, 1 }, + { ahd_patch2_func, 605, 1, 2 }, + { ahd_patch0_func, 606, 1, 1 }, + { ahd_patch2_func, 621, 1, 2 }, + { ahd_patch0_func, 622, 1, 1 }, + { ahd_patch21_func, 623, 14, 1 }, + { ahd_patch1_func, 641, 1, 2 }, + { ahd_patch0_func, 642, 1, 1 }, + { ahd_patch21_func, 643, 1, 1 }, + { ahd_patch1_func, 655, 1, 2 }, + { ahd_patch0_func, 656, 1, 1 }, + { ahd_patch1_func, 663, 1, 2 }, + { ahd_patch0_func, 664, 1, 1 }, + { ahd_patch18_func, 687, 1, 1 }, + { ahd_patch18_func, 725, 1, 1 }, + { ahd_patch1_func, 736, 1, 2 }, + { ahd_patch0_func, 737, 1, 1 }, + { ahd_patch1_func, 754, 1, 2 }, + { ahd_patch0_func, 755, 1, 1 }, + { ahd_patch1_func, 757, 1, 2 }, + { ahd_patch0_func, 758, 1, 1 }, + { ahd_patch1_func, 761, 1, 2 }, + { ahd_patch0_func, 762, 1, 1 }, + { ahd_patch22_func, 764, 1, 2 }, + { ahd_patch0_func, 765, 2, 1 }, + { ahd_patch23_func, 768, 4, 2 }, + { ahd_patch0_func, 772, 1, 1 }, + { ahd_patch23_func, 780, 11, 1 } }; static struct cs { @@ -1143,10 +1147,10 @@ { 129, 157 }, { 159, 162 }, { 170, 178 }, - { 202, 252 }, - { 685, 701 }, - { 701, 715 }, - { 725, 729 } + { 204, 254 }, + { 687, 703 }, + { 703, 717 }, + { 727, 731 } }; static const int num_critical_sections = sizeof(critical_sections) ==== //depot/aic7xxx/aic7xxx/aic7xxx.h#82 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx.h ==== --- /tmp/tmp.26263.3 2004-09-27 12:50:18.469282568 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx.h 2003-08-26 18:27:15.000000000 -0400 @@ -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#82 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#83 $ * * $FreeBSD$ */ @@ -532,7 +532,7 @@ * The current state of this SCB. */ typedef enum { - SCB_FREE = 0x0000, + SCB_FLAG_NONE = 0x0000, SCB_OTHERTCL_TIMEOUT = 0x0002,/* * Another device was active * during the first timeout for ==== //depot/aic7xxx/aic7xxx/aic7xxx.c#136 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_core.c ==== --- /tmp/tmp.26263.4 2004-09-27 12:50:19.238165680 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_core.c 2003-08-26 18:27:00.000000000 -0400 @@ -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.c#136 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#137 $ * * $FreeBSD$ */ @@ -4514,7 +4514,7 @@ */ next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg); next_scb->ahc_softc = ahc; - next_scb->flags = SCB_FREE; + next_scb->flags = SCB_FLAG_NONE; #ifndef __linux__ error = ahc_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0, &next_scb->dmamap); ==== //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#43 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_inline.h ==== --- /tmp/tmp.26263.5 2004-09-27 12:50:19.308155040 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic7xxx_inline.h 2003-08-26 18:31:45.000000000 -0400 @@ -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_inline.h#43 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#44 $ * * $FreeBSD$ */ @@ -383,7 +383,7 @@ hscb = scb->hscb; /* Clean up for the next user */ ahc->scb_data->scbindex[hscb->tag] = NULL; - scb->flags = SCB_FREE; + scb->flags = SCB_FLAG_NONE; hscb->control = 0; SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs, scb, links.sle); ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aiclib.c#8 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aiclib.c ==== --- /tmp/tmp.26263.6 2004-09-27 12:50:19.464131328 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aiclib.c 2003-08-26 17:52:43.000000000 -0400 @@ -1411,3 +1411,53 @@ } return (opt_arg); } + +/************************* Magic SysReq Support *******************************/ +void +aic_sysrq_handler(int key, struct pt_regs *unused, struct kbd_struct *unused1, + struct tty_struct *unused2) +{ + struct aic_softc *aic; + u_long l; + + aic_list_lock(&l); + + TAILQ_FOREACH(aic, &aic_tailq, links) { + u_long s; + + aic_lock(aic, &s); + aic_dump_card_state(aic); + aic_unlock(aic, &s); + } + aic_list_unlock(&l); +} + +int +aic_install_sysrq(struct sysrq_key_op *key_op) +{ + char *str; + int len; + int i; + + str = key_op->help_msg; + len = strlen(str); + for (i = 0; i < len; i++) { + int key; + + key = str[i]; + if (register_sysrq_key(key, key_op) == 0) { + + if (key >= 'a' && key <= 'z') + str[i] = key + ('A' - 'a'); + return (key); + } + } + return (0); +} + +void +aic_remove_sysrq(int key, struct sysrq_key_op *key_op) +{ + unregister_sysrq_key(key, key_op); +} + ==== //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aiclib.h#10 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aiclib.h ==== --- /tmp/tmp.26263.7 2004-09-27 12:50:19.669100168 -0400 +++ /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aiclib.h 2003-08-26 18:24:47.000000000 -0400 @@ -66,9 +66,11 @@ #endif /* - * SCSI command format + * Linux Timer Support. */ +#define AIC_USECS_PER_JIFFY (1000000/HZ) +/************************* SCSI command formats *******************************/ /* * Define dome bits that are in ALL (or a lot of) scsi commands */ @@ -911,9 +913,30 @@ #define aic_inquiry_match AIC_LIB_ENTRY(_inquiry_match) #define aic_static_inquiry_match AIC_LIB_ENTRY(_static_inquiry_match) #define aic_parse_brace_option AIC_LIB_ENTRY(_parse_brace_option) +#define aic_sysrq_handler AIC_LIB_ENTRY(_sysrq_handler) +#define aic_install_sysrq AIC_LIB_ENTRY(_install_sysrq) +#define aic_remove_sysrq AIC_LIB_ENTRY(_remove_sysrq) +#define aic_list_lock AIC_LIB_ENTRY(_list_lock) +#define aic_list_unlock AIC_LIB_ENTRY(_list_unlock) +#define aic_lock AIC_LIB_ENTRY(_lock) +#define aic_unlock AIC_LIB_ENTRY(_unlock) +#define aic_dump_card_state AIC_LIB_ENTRY(_dump_card_state) +#define aic_tailq AIC_LIB_ENTRY(_tailq) +#define aic_softc AIC_LIB_ENTRY(_softc) /******************************************************************************/ +/************************* Magic SysReq Support *******************************/ +#include + +void aic_sysrq_handler(int, struct pt_regs *, + struct kbd_struct *, + struct tty_struct *); +int aic_install_sysrq(struct sysrq_key_op *); +void aic_remove_sysrq(int key, + struct sysrq_key_op *key_op); + +/************************ SCSI Library Functions *****************************/ void aic_sense_desc(int /*sense_key*/, int /*asc*/, int /*ascq*/, struct scsi_inquiry_data*, const char** /*sense_key_desc*/,