diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-05 20:34:46 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-05 20:34:46 +0000 |
| commit | 2b642d576deacc43a68295b539e64c826438ea4b (patch) | |
| tree | c48cff1d7be79e8d70f5836de848c9f98311664e | |
| parent | 74947759f7e48d95d2830cbf77331b7643a5ccd8 (diff) | |
Replace last remaining users of link->scsibus with
link->bus->sc_dev.dv_unit.
| -rw-r--r-- | sys/arch/mac68k/dev/ncr5380.c | 8 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ncr5380sbc.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index 9eac18c5b21..1bf683c46ba 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.41 2011/04/06 18:03:03 miod Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.42 2011/07/05 20:34:45 matthew Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -409,7 +409,7 @@ ncr5380_show_scsi_cmd(struct scsi_xfer *xs) int i = 0; if (!(xs->flags & SCSI_RESET)) { - printf("(%d:%d:%d,0x%x)-", xs->sc_link->scsibus, + printf("(%d:%d:%d,0x%x)-", xs->sc_link->bus->sc_dev.dv_unit, xs->sc_link->target, xs->sc_link->lun, xs->sc_link->flags); while (i < xs->cmdlen) { if (i) @@ -419,8 +419,8 @@ ncr5380_show_scsi_cmd(struct scsi_xfer *xs) printf("-\n"); } else { - printf("(%d:%d:%d)-RESET-\n", - xs->sc_link->scsibus,xs->sc_link->target, xs->sc_link->lun); + printf("(%d:%d:%d)-RESET-\n", xs->sc_link->bus->sc_dev.dv_unit, + xs->sc_link->target, xs->sc_link->lun); } } diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index e07581a9c67..d789870b791 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.111 2011/04/27 09:40:59 dlg Exp $ */ +/* $OpenBSD: autoconf.c,v 1.112 2011/07/05 20:34:45 matthew Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -1365,7 +1365,7 @@ device_register(struct device *dev, void *aux) struct scsi_link *sl = saa->saa_sc_link; if (strcmp(bp->name, "fp") == 0 && - bp->val[0] == sl->scsibus) { + bp->val[0] == sl->bus->sc_dev.dv_unit) { DPRINTF(ACDB_BOOTDEV, ("\t-- matched component %s to %s\n", bp->name, dev->dv_xname)); bootpath_store(1, bp + 1); diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c index db912a11573..c59614dbf76 100644 --- a/sys/dev/ic/ncr5380sbc.c +++ b/sys/dev/ic/ncr5380sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380sbc.c,v 1.28 2011/06/23 22:59:13 deraadt Exp $ */ +/* $OpenBSD: ncr5380sbc.c,v 1.29 2011/07/05 20:34:45 matthew Exp $ */ /* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */ /* @@ -2433,7 +2433,7 @@ ncr5380_show_scsi_cmd(xs) if ( ! ( xs->flags & SCSI_RESET ) ) { printf("si(%d:%d:%d)-", - xs->sc_link->scsibus, xs->sc_link->target, + xs->sc_link->bus->sc_dev.dv_unit, xs->sc_link->target, xs->sc_link->lun); while (i < xs->cmdlen) { if (i) printf(","); @@ -2442,7 +2442,7 @@ ncr5380_show_scsi_cmd(xs) printf("-\n"); } else { printf("si(%d:%d:%d)-RESET-\n", - xs->sc_link->scsibus, xs->sc_link->target, + xs->sc_link->bus->sc_dev.dv_unit, xs->sc_link->target, xs->sc_link->lun); } } |