summaryrefslogtreecommitdiff
path: root/sys/dev/microcode
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2003-08-29 03:51:50 +0000
committerthorpej <thorpej@NetBSD.org>2003-08-29 03:51:50 +0000
commite5d09ce27d5ef22d67074b3a422f78875c3a6646 (patch)
tree65644c8c071710f15b74b13ac582f6ffac3abf84 /sys/dev/microcode
parent93cbf1d88e69d07798bbf32c291f662cfb50a7e7 (diff)
Apply the following change from 06/28/2003 04:40:46 made by gibbs to the
FreeBSD ahd driver: aic79xx.seq: Remove an old comment that no longer applies. Fix a jump in our unexpected non-packetized phase handler to use an explicit lable. The old code had a hardcoded jump offset that was off by one instruction.
Diffstat (limited to 'sys/dev/microcode')
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx.seq13
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx_reg.h2
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx_seq.h4
3 files changed, 9 insertions, 10 deletions
diff --git a/sys/dev/microcode/aic7xxx/aic79xx.seq b/sys/dev/microcode/aic7xxx/aic79xx.seq
index face0458234..e2c8a07649b 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx.seq
+++ b/sys/dev/microcode/aic7xxx/aic79xx.seq
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.seq,v 1.6 2003/08/29 01:28:53 thorpej Exp $ */
+/* $NetBSD: aic79xx.seq,v 1.7 2003/08/29 03:51:50 thorpej Exp $ */
/*
* Adaptec U320 device driver firmware for Linux and FreeBSD.
@@ -39,10 +39,10 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.11 2003/05/26 21:26:52 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.seq,v 1.12 2003/06/28 04:40:46 gibbs Exp $
*/
-VERSION = "Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#94 $"
+VERSION = "Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#95 $"
PATCH_ARG_LIST = "struct ahd_softc *ahd"
PREFIX = "ahd_"
@@ -584,9 +584,6 @@ found_last_sent_scb:
bmov CURRSCB, SCBPTR, 2;
curscb_ww_done:
} else {
- /*
- * Untested - Verify with Rev B.
- */
bmov SCBPTR, CURRSCB, 2;
}
@@ -1961,12 +1958,14 @@ SET_DST_MODE M_SCSI;
test SSTAT0, SELDO jnz return;
mvi SCBPTR[1], SCB_LIST_NULL;
unexpected_nonpkt_phase:
- test MODE_PTR, ~(MK_MODE(M_DFF1, M_DFF1)) jnz . + 3;
+ test MODE_PTR, ~(MK_MODE(M_DFF1, M_DFF1))
+ jnz unexpected_nonpkt_mode_cleared;
SET_SRC_MODE M_DFF0;
SET_DST_MODE M_DFF0;
or LONGJMP_ADDR[1], INVALID_ADDR;
dec SCB_FIFO_USE_COUNT;
mvi DFFSXFRCTL, CLRCHN;
+unexpected_nonpkt_mode_cleared:
mvi CLRSINT2, CLRNONPACKREQ;
test SCSIPHASE, ~(MSG_IN_PHASE|MSG_OUT_PHASE) jnz illegal_phase;
SET_SEQINTCODE(ENTERING_NONPACK)
diff --git a/sys/dev/microcode/aic7xxx/aic79xx_reg.h b/sys/dev/microcode/aic7xxx/aic79xx_reg.h
index 7663a60aa87..cebe19215b8 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx_reg.h
+++ b/sys/dev/microcode/aic7xxx/aic79xx_reg.h
@@ -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#95 $
* Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $
*/
typedef int (ahd_reg_print_t)(u_int, u_int *, u_int);
diff --git a/sys/dev/microcode/aic7xxx/aic79xx_seq.h b/sys/dev/microcode/aic7xxx/aic79xx_seq.h
index 37d44390d17..3ae3cbf93ed 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic79xx_seq.h
@@ -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#95 $
* Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $
*/
static uint8_t seqprog[] = {
@@ -748,7 +748,7 @@ static uint8_t seqprog[] = {
0x30, 0xe0, 0x64, 0x60,
0x40, 0x4b, 0x64, 0x68,
0xff, 0xea, 0x52, 0x01,
- 0xee, 0x00, 0xd2, 0x6d,
+ 0xee, 0x00, 0xd4, 0x6d,
0x80, 0xf9, 0xf2, 0x01,
0xff, 0x90, 0x21, 0x1b,
0x02, 0xea, 0xb4, 0x00,