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/dev/isa | |
| 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/dev/isa')
| -rw-r--r-- | sys/dev/isa/aha.c | 8 | ||||
| -rw-r--r-- | sys/dev/isa/seagate.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/wds.c | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 00ce661c903..e96d7204819 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.61 2009/01/21 21:54:00 grange Exp $ */ +/* $OpenBSD: aha.c,v 1.62 2009/02/16 21:19:07 miod Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -154,7 +154,7 @@ void aha_done(struct aha_softc *, struct aha_ccb *); int aha_find(struct isa_attach_args *, struct aha_softc *, int); void aha_init(struct aha_softc *); void aha_inquire_setup_information(struct aha_softc *); -void ahaminphys(struct buf *); +void ahaminphys(struct buf *, struct scsi_link *); int aha_scsi_cmd(struct scsi_xfer *); int aha_poll(struct aha_softc *, struct scsi_xfer *, int); void aha_timeout(void *arg); @@ -1239,10 +1239,8 @@ noinquire: } void -ahaminphys(bp) - struct buf *bp; +ahaminphys(struct buf *bp, struct scsi_link *sl) { - if (bp->b_bcount > ((AHA_NSEG - 1) << PGSHIFT)) bp->b_bcount = ((AHA_NSEG - 1) << PGSHIFT); minphys(bp); diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index 28cfba3100e..51ba1920353 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: seagate.c,v 1.26 2009/01/21 21:54:00 grange Exp $ */ +/* $OpenBSD: seagate.c,v 1.27 2009/02/16 21:19:07 miod Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -291,7 +291,7 @@ void sea_reselect(struct sea_softc *sea); struct scsi_adapter sea_switch = { sea_scsi_cmd, - minphys, /* no special minphys(), since driver uses PIO */ + scsi_minphys, /* no special minphys(), since driver uses PIO */ 0, 0, }; diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index 6522735ff61..ca7468f8d25 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wds.c,v 1.27 2009/01/21 21:54:00 grange Exp $ */ +/* $OpenBSD: wds.c,v 1.28 2009/02/16 21:19:07 miod Exp $ */ /* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */ #undef WDSDIAG @@ -163,7 +163,7 @@ void wds_done(struct wds_softc *, struct wds_scb *, u_char); int wds_find(struct isa_attach_args *, struct wds_softc *); void wds_init(struct wds_softc *); void wds_inquire_setup_information(struct wds_softc *); -void wdsminphys(struct buf *); +void wdsminphys(struct buf *, struct scsi_link *); int wds_scsi_cmd(struct scsi_xfer *); void wds_sense(struct wds_softc *, struct wds_scb *); int wds_poll(struct wds_softc *, struct scsi_xfer *, int); @@ -1032,8 +1032,7 @@ out: } void -wdsminphys(bp) - struct buf *bp; +wdsminphys(struct buf *bp, struct scsi_link *sl) { if (bp->b_bcount > ((WDS_NSEG - 1) << PGSHIFT)) bp->b_bcount = ((WDS_NSEG - 1) << PGSHIFT); |