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/usb | |
| 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/usb')
| -rw-r--r-- | sys/dev/usb/umass_scsi.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usscanner.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index 342213c5f52..e8d6d469822 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.23 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.24 2009/02/16 21:19:07 miod Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ struct umass_scsi_softc { #define UMASS_ATAPI_DRIVE 0 int umass_scsi_cmd(struct scsi_xfer *); -void umass_scsi_minphys(struct buf *); +void umass_scsi_minphys(struct buf *, struct scsi_link *); void umass_scsi_cb(struct umass_softc *sc, void *priv, int residue, int status); @@ -270,7 +270,7 @@ umass_scsi_cmd(struct scsi_xfer *xs) } void -umass_scsi_minphys(struct buf *bp) +umass_scsi_minphys(struct buf *bp, struct scsi_link *sl) { if (bp->b_bcount > UMASS_MAX_TRANSFER_SIZE) bp->b_bcount = UMASS_MAX_TRANSFER_SIZE; diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index 0b9a075acc3..84c7c7cf2a5 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usscanner.c,v 1.27 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: usscanner.c,v 1.28 2009/02/16 21:19:07 miod Exp $ */ /* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */ /* @@ -152,7 +152,7 @@ struct usscanner_softc { void usscanner_cleanup(struct usscanner_softc *sc); int usscanner_scsipi_cmd(struct scsipi_xfer *xs); -void usscanner_scsipi_minphys(struct buf *bp); +void usscanner_scsipi_minphys(struct buf *bp, struct scsi_link *sl); void usscanner_done(struct usscanner_softc *sc); void usscanner_sense(struct usscanner_softc *sc); typedef void callback(usbd_xfer_handle, usbd_private_handle, usbd_status); @@ -433,7 +433,7 @@ usscanner_activate(struct device *self, enum devact act) } void -usscanner_scsipi_minphys(struct buf *bp) +usscanner_scsipi_minphys(struct buf *bp, struct scsi_link *sl) { if (bp->b_bcount > USSCANNER_MAX_TRANSFER_SIZE) bp->b_bcount = USSCANNER_MAX_TRANSFER_SIZE; |