diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-16 21:19:08 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-16 21:19:08 +0000 |
| commit | 2da99529039b177155c4f8b121a56af665bbc013 (patch) | |
| tree | 164ac14d81166b8b640ca50ae2bfbd661def8e85 /sys/arch/mac68k | |
| parent | 02ba6ef4276aced0ecad6ed5dc9b0a7e1cd1d4ad (diff) | |
Extend the scsi_adapter minphys() callback to take a struct scsi_link *
as additional argument. This will allow intermediate layers between
scsi devices such as sd and scsi host adapters to take appropriate
action if necessary.
Diffstat (limited to 'sys/arch/mac68k')
| -rw-r--r-- | sys/arch/mac68k/dev/esp.c | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/ncr5380.c | 12 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/sbc.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index 9c3c934ba05..d61ddcc6cea 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.27 2007/07/29 21:24:02 miod Exp $ */ +/* $OpenBSD: esp.c,v 1.28 2009/02/16 21:19:05 miod Exp $ */ /* $NetBSD: esp.c,v 1.17 1998/09/05 15:15:35 pk Exp $ */ /* @@ -110,7 +110,7 @@ struct cfattach esp_ca = { struct scsi_adapter esp_switch = { ncr53c9x_scsi_cmd, - minphys, /* no max at this level; handled by DMA code */ + scsi_minphys, /* no max at this level; handled by DMA code */ NULL, NULL, }; diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index 002cee9eefa..318b497a19e 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.34 2008/11/25 17:52:02 krw Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.35 2009/02/16 21:19:05 miod Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -73,7 +73,7 @@ static volatile int main_running = 0; */ static u_char busy; -static void ncr5380_minphys(struct buf *bp); +static void ncr5380_minphys(struct buf *bp, struct scsi_link *sl); static int mac68k_ncr5380_scsi_cmd(struct scsi_xfer *xs); static void ncr5380_show_scsi_cmd(struct scsi_xfer *xs); @@ -397,11 +397,11 @@ mac68k_ncr5380_scsi_cmd(struct scsi_xfer *xs) } static void -ncr5380_minphys(struct buf *bp) +ncr5380_minphys(struct buf *bp, struct scsi_link *sl) { - if (bp->b_bcount > MIN_PHYS) - bp->b_bcount = MIN_PHYS; - minphys(bp); + if (bp->b_bcount > MIN_PHYS) + bp->b_bcount = MIN_PHYS; + minphys(bp); } #undef MIN_PHYS diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c index 2aa2df17931..097843034b1 100644 --- a/sys/arch/mac68k/dev/sbc.c +++ b/sys/arch/mac68k/dev/sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc.c,v 1.17 2007/12/29 03:04:18 dlg Exp $ */ +/* $OpenBSD: sbc.c,v 1.18 2009/02/16 21:19:05 miod Exp $ */ /* $NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $ */ /* @@ -76,7 +76,7 @@ int sbc_debug = 0 /* | SBC_DB_INTR | SBC_DB_DMA */; int sbc_link_flags = 0 /* | SDEV_DB2 */; int sbc_options = 0 /* | SBC_PDMA */; -static void sbc_minphys(struct buf *bp); +static void sbc_minphys(struct buf *bp, struct scsi_link *sl); struct scsi_adapter sbc_ops = { ncr5380_scsi_cmd, /* scsi_cmd() */ @@ -102,11 +102,11 @@ static int sbc_ready(struct ncr5380_softc *); static void sbc_wait_not_req(struct ncr5380_softc *); static void -sbc_minphys(struct buf *bp) +sbc_minphys(struct buf *bp, struct scsi_link *sl) { if (bp->b_bcount > MAX_DMA_LEN) bp->b_bcount = MAX_DMA_LEN; - return (minphys(bp)); + minphys(bp); } |