summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>1998-04-30 01:43:47 +0000
committerJason Wright <jason@cvs.openbsd.org>1998-04-30 01:43:47 +0000
commit6f77ea48ddab3fb5a31c157f65532fa94eb56aeb (patch)
tree363051a196b54ca7cd00114d314f804d9546bee6 /sys/dev
parent03e128bcf62100c479fe5e6920316b57e0d358df (diff)
Fix a few missing changes from the last NetBSD merge.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ncr53c9x.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 6c9aee266d5..9430ed813bc 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9x.c,v 1.4 1998/02/10 05:03:30 jason Exp $ */
+/* $OpenBSD: ncr53c9x.c,v 1.5 1998/04/30 01:43:46 jason Exp $ */
/* $NetBSD: ncr53c9x.c,v 1.23 1998/01/31 23:37:51 pk Exp $ */
/*
@@ -455,7 +455,7 @@ ncr53c9x_select(sc, ecb)
size_t dmasize;
ecb->cmd.id =
- MSG_IDENTIFY(lun, (ti->flags & T_RSELECTOFF)?0:1);
+ MSG_IDENTIFY(lun, (tiflags & T_RSELECTOFF)?0:1);
/* setup DMA transfer for command */
dmasize = clen = ecb->clen + 1;
@@ -484,7 +484,7 @@ ncr53c9x_select(sc, ecb)
* happy for it to disconnect etc.
*/
NCR_WRITE_REG(sc, NCR_FIFO,
- MSG_IDENTIFY(lun, (ti->flags & T_RSELECTOFF)?0:1));
+ MSG_IDENTIFY(lun, (tiflags & T_RSELECTOFF)?0:1));
if (ti->flags & T_NEGOTIATE) {
/* Arbitrate, select and stop after IDENTIFY message */
@@ -853,7 +853,8 @@ ncr53c9x_reselect(sc, message)
for (ecb = sc->nexus_list.tqh_first; ecb != NULL;
ecb = ecb->chain.tqe_next) {
sc_link = ecb->xs->sc_link;
- if (sc_link->target == target && sc_link->lun == lun)
+ if (sc_link->target == target &&
+ sc_link->lun == lun)
break;
}
if (ecb == NULL) {