From 9aea6d63bb2d61b6d95eeddc7e0072b6523cc5f3 Mon Sep 17 00:00:00 2001
From: scottl <scottl@FreeBSD.org>
Date: Thu, 5 Dec 2002 00:47:27 +0000
Subject: [PATCH] The sequencer downloading code assumes that all jump labels
 are acurate in relation to a fully compiled sequencer program (all patches
 downloaded).  Correct a few occurances of a relative jump across a macro that
 ended up jumping us into the last instruction of the macro.

Spproved by:	re (bmah)
---
 sys/dev/aic7xxx/aic79xx.seq | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index 6774896a1419..804ab77772e4 100644
--- a/sys/dev/aic7xxx/aic79xx.seq
+++ b/sys/dev/aic7xxx/aic79xx.seq
@@ -40,7 +40,7 @@
  * $FreeBSD$
  */
 
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#72 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#73 $"
 PATCH_ARG_LIST = "struct ahd_softc *ahd"
 PREFIX = "ahd_"
 
@@ -62,8 +62,9 @@ idle_loop:
 		 * interrupt collision on the hardware
 		 * setting of HWERR.
 		 */
-		test	ERROR, 0xFF jz . + 2;
+		test	ERROR, 0xFF jz no_error_set;
 		SET_SEQINTCODE(SAW_HWERR)
+no_error_set:
 	}
 	SET_MODE(M_SCSI, M_SCSI)
 	test	SCSISEQ0, ENSELO|ENARBO jnz idle_loop_checkbus;
@@ -937,8 +938,9 @@ complete_accepted:
 	/*
 	 * See if we attempted to deliver a message but the target ingnored us.
 	 */
-	test	SCB_CONTROL, MK_MESSAGE jz . + 2;
+	test	SCB_CONTROL, MK_MESSAGE jz complete_nomsg;
 	SET_SEQINTCODE(MKMSG_FAILED)
+complete_nomsg:
 	call	queue_scb_completion;
 	jmp	await_busfree;