summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorgibbs <gibbs@FreeBSD.org>1996-05-30 07:18:39 +0000
committergibbs <gibbs@FreeBSD.org>1996-05-30 07:18:39 +0000
commitac159e4246f0d46382b255644aafe03a5640114c (patch)
tree90fd323a15f5251c751fef75b1b24900fa34ab4d /sys/dev
parent1f6cfc836246cbe366daaf25537ad13235d8c5b2 (diff)
downloadFreeBSD-src-ac159e4246f0d46382b255644aafe03a5640114c.zip
FreeBSD-src-ac159e4246f0d46382b255644aafe03a5640114c.tar.gz
Merge in changes for NetBSD/OpenBSD.
Cosmetic change to p_mesgout code so that it "looks" the same as what is done in the inb* routines. NetBSD/OpenBSD support Submitted by:Noriyuki Soda <soda@sra.co.jp>, Pete Bentley <pete@demon.net>, Charles M. Hannum <mycroft@mit.edu>, Theo de Raadt <deraadt@theos.com>
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/aic7xxx/aic7xxx.seq8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 7bc1005..30b8380 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -39,9 +39,13 @@
*
*-M************************************************************************/
-VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.36 1996/05/23 15:01:47 gibbs Exp $"
+VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.37 1996/05/27 23:16:55 gibbs Exp $"
+#if defined(__NetBSD__)
+#include "../../../../dev/ic/aic7xxxreg.h"
+#elif defined(__FreeBSD__)
#include "../../dev/aic7xxx/aic7xxx_reg.h"
+#endif
/*
* We can't just use ACCUM in the sequencer code because it
@@ -496,10 +500,10 @@ p_mesgout_start:
*/
p_mesgout_loop:
test SSTAT0,SPIORDY jz p_mesgout_loop
+ test SSTAT1,PHASEMIS jnz p_mesgout_phasemis
cmp DINDEX,1 jne p_mesgout_outb /* last byte? */
mvi CLRSINT1,CLRATNO /* drop ATN */
p_mesgout_outb:
- test SSTAT1,PHASEMIS jnz p_mesgout_phasemis
dec DINDEX
or CLRSINT0, CLRSPIORDY
mov SCSIDATL,SINDIR
OpenPOWER on IntegriCloud