aic7xxx.seq:

	Be consistant about testing for parity errors after waiting for a
	REQ on the bus.

	Don't ack the last byte in a transaction until after we've cleared
	all target state.

aic7xxx_asm.c:
	Test the return value of getopt against -1 not EOF. (Yet another
	shameless victum of the style guide being wrong).

4 files changed, 16 insertions, 13 deletions

diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index d7806f9..804832a 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -37,7 +37,7 @@
  *OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *SUCH DAMAGE.
  *
- *	$Id: aic7xxx.seq,v 1.68 1997/04/04 19:35:30 gibbs Exp $
+ *	$Id: aic7xxx.seq,v 1.69 1997/04/05 22:03:47 gibbs Exp $
  *
  *-M************************************************************************/
 
@@ -310,7 +310,8 @@ ndx_dtr_2:
  *
  */
 ITloop:
-	test	SSTAT1,REQINIT	jz ITloop;
+	test	SSTAT1,REQINIT		jz ITloop;
+	test	SSTAT1, SCSIPERR	jnz ITloop;
 
 	and	A,PHASE_MASK,SCSISIGI;
 	mov	LASTPHASE,A;
@@ -328,8 +329,8 @@ ITloop:
 
 await_busfree:
 	and	SIMODE1, ~ENBUSFREE;
-	mov	NONE, SCSIDATL;		/* Ack the last byte */
 	call	clear_target_state;
+	mov	NONE, SCSIDATL;		/* Ack the last byte */
 	test	SSTAT1,REQINIT|BUSFREE	jz .;
 	test	SSTAT1, BUSFREE jnz poll_for_work;
 	mvi	INTSTAT, BAD_PHASE;
@@ -538,7 +539,8 @@ p_mesgout_start:
  * a MESSAGE REJECT.
  */
 p_mesgout_loop:
-	test	SSTAT1, REQINIT	jz p_mesgout_loop;
+	test	SSTAT1, REQINIT		jz p_mesgout_loop;
+	test	SSTAT1, SCSIPERR	jnz p_mesgout_loop;
 	and	LASTPHASE, PHASE_MASK, SCSISIGI;
 	cmp	LASTPHASE, P_MESGOUT jne p_mesgout_done;
 /*
@@ -780,6 +782,7 @@ snoop_tag:
 	mov	NONE,SCSIDATL;		/* ACK Identify MSG */
 snoop_tag_loop:
 	test	SSTAT1,REQINIT		jz snoop_tag_loop;
+	test	SSTAT1, SCSIPERR	jnz snoop_tag_loop;
 	and	LASTPHASE, PHASE_MASK, SCSISIGI;
 	cmp	LASTPHASE, P_MESGIN	jne not_found;
 	cmp	SCSIBUSL,MSG_SIMPLE_Q_TAG jne not_found;
diff --git a/sys/dev/aic7xxx/aic7xxx_asm.c b/sys/dev/aic7xxx/aic7xxx_asm.c
index 4c7bf0a..9e3e4e1 100644
--- a/sys/dev/aic7xxx/aic7xxx_asm.c
+++ b/sys/dev/aic7xxx/aic7xxx_asm.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aic7xxx_asm.c,v 1.15 1997/03/16 07:08:15 gibbs Exp $
+ *      $Id: aic7xxx_asm.c,v 1.16 1997/03/18 19:18:39 gibbs Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -75,7 +75,7 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	int ch;
+	int  ch;
 	int  retval;
 	char *inputfilename;
 	char *regfilename;
@@ -96,7 +96,7 @@ main(argc, argv)
 #if DEBUG
 	yy_flex_debug = 0;
 #endif
-	while ((ch = getopt(argc, argv, "d:l:n:o:r:I:O:")) != EOF) {
+	while ((ch = getopt(argc, argv, "d:l:n:o:r:I:O:")) != -1) {
 		switch(ch) {
 		case 'd':
 #if DEBUG
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index 4c7bf0a..9e3e4e1 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aic7xxx_asm.c,v 1.15 1997/03/16 07:08:15 gibbs Exp $
+ *      $Id: aic7xxx_asm.c,v 1.16 1997/03/18 19:18:39 gibbs Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -75,7 +75,7 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	int ch;
+	int  ch;
 	int  retval;
 	char *inputfilename;
 	char *regfilename;
@@ -96,7 +96,7 @@ main(argc, argv)
 #if DEBUG
 	yy_flex_debug = 0;
 #endif
-	while ((ch = getopt(argc, argv, "d:l:n:o:r:I:O:")) != EOF) {
+	while ((ch = getopt(argc, argv, "d:l:n:o:r:I:O:")) != -1) {
 		switch(ch) {
 		case 'd':
 #if DEBUG
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index 4c7bf0a..9e3e4e1 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aic7xxx_asm.c,v 1.15 1997/03/16 07:08:15 gibbs Exp $
+ *      $Id: aic7xxx_asm.c,v 1.16 1997/03/18 19:18:39 gibbs Exp $
  */
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -75,7 +75,7 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
-	int ch;
+	int  ch;
 	int  retval;
 	char *inputfilename;
 	char *regfilename;
@@ -96,7 +96,7 @@ main(argc, argv)
 #if DEBUG
 	yy_flex_debug = 0;
 #endif
-	while ((ch = getopt(argc, argv, "d:l:n:o:r:I:O:")) != EOF) {
+	while ((ch = getopt(argc, argv, "d:l:n:o:r:I:O:")) != -1) {
 		switch(ch) {
 		case 'd':
 #if DEBUG