diff options
36 files changed, 92 insertions, 88 deletions
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c index 36c9758..4b475d3 100644 --- a/sys/dev/advansys/adv_eisa.c +++ b/sys/dev/advansys/adv_eisa.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_eisa.c,v 1.4 1999/05/08 21:59:16 dfr Exp $ + * $Id: adv_eisa.c,v 1.5 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -178,7 +178,7 @@ adveisaattach(device_t dev) * by the MI portions of the advansys driver */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADV_EISA_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, @@ -213,7 +213,7 @@ adveisaattach(device_t dev) * by the MI portions of the advansys driver */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADV_EISA_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c index 58eebf0..5cc06c58 100644 --- a/sys/dev/advansys/adv_isa.c +++ b/sys/dev/advansys/adv_isa.c @@ -44,7 +44,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_isa.c,v 1.10 1999/04/23 23:29:23 gibbs Exp $ + * $Id: adv_isa.c,v 1.11 1999/05/08 18:20:57 peter Exp $ */ #include <sys/param.h> @@ -212,7 +212,7 @@ advisaprobe(struct isa_device *id) /* XXX Should be a child of the ISA bus dma tag */ error = bus_dma_tag_create(/*parent*/NULL, - /*alignemnt*/0, + /*alignemnt*/1, /*boundary*/0, lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index 4a669d0..1ca2cee 100644 --- a/sys/dev/advansys/adv_pci.c +++ b/sys/dev/advansys/adv_pci.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_pci.c,v 1.6 1999/05/09 17:06:35 peter Exp $ + * $Id: adv_pci.c,v 1.7 1999/07/03 20:16:58 peter Exp $ */ #include <sys/param.h> @@ -163,7 +163,7 @@ advpciattach(pcici_t config_id, int unit) /* Allocate a dmatag for our transfer DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADV_PCI_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c index ee3f887..c05604c 100644 --- a/sys/dev/advansys/advansys.c +++ b/sys/dev/advansys/advansys.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: advansys.c,v 1.9 1999/04/19 21:27:35 gibbs Exp $ + * $Id: advansys.c,v 1.10 1999/05/06 20:16:09 ken Exp $ */ /* * Ported from: @@ -1257,7 +1257,7 @@ adv_attach(adv) */ /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(adv->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(adv->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1271,7 +1271,7 @@ adv_attach(adv) adv->init_level++; /* DMA tag for our sense buffers */ - if (bus_dma_tag_create(adv->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(adv->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index 8b0b86a..6509786 100644 --- a/sys/dev/advansys/adw_pci.c +++ b/sys/dev/advansys/adw_pci.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adw_pci.c,v 1.5 1999/05/09 17:06:36 peter Exp $ + * $Id: adw_pci.c,v 1.6 1999/07/03 20:16:58 peter Exp $ */ #include <sys/param.h> @@ -136,7 +136,7 @@ adwpciattach(pcici_t config_id, int unit) /* Allocate a dmatag for our transfer DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADW_PCI_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c index aef4612..0b6bc7e 100644 --- a/sys/dev/advansys/adwcam.c +++ b/sys/dev/advansys/adwcam.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adwcam.c,v 1.2 1998/10/15 23:47:14 gibbs Exp $ + * $Id: adwcam.c,v 1.3 1999/05/06 20:16:12 ken Exp $ */ /* * Ported from: @@ -968,7 +968,7 @@ adw_init(struct adw_softc *adw) printf("Queue Depth %d\n", adw->max_acbs); /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -982,7 +982,7 @@ adw_init(struct adw_softc *adw) adw->init_level++; /* DMA tag for our ccb structures */ - if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1013,7 +1013,7 @@ adw_init(struct adw_softc *adw) bzero(adw->acbs, adw->max_acbs * sizeof(struct acb)); /* DMA tag for our S/G structures. We allocate in page sized chunks */ - if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index 97bc80b..fe9d7b9 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -55,7 +55,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aha.c,v 1.25 1999/05/14 23:10:25 imp Exp $ + * $Id: aha.c,v 1.26 1999/05/25 20:15:19 gibbs Exp $ */ #include "pnp.h" @@ -523,7 +523,7 @@ aha_init(struct aha_softc* aha) */ /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -536,7 +536,7 @@ aha_init(struct aha_softc* aha) aha->init_level++; /* DMA tag for our mailboxes */ - if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -572,7 +572,7 @@ aha_init(struct aha_softc* aha) ahainitmboxes(aha); /* DMA tag for our ccb structures */ - if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -602,7 +602,7 @@ aha_init(struct aha_softc* aha) aha->init_level++; /* DMA tag for our S/G structures. We allocate in page sized chunks */ - if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(aha->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c index dec2dfe..b6e0cb0 100644 --- a/sys/dev/aha/aha_isa.c +++ b/sys/dev/aha/aha_isa.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aha_isa.c,v 1.7 1999/04/16 21:22:19 peter Exp $ + * $Id: aha_isa.c,v 1.8 1999/05/08 18:20:55 peter Exp $ */ #include "pnp.h" @@ -182,7 +182,7 @@ aha_isa_attach(dev) filter_arg = NULL; lowaddr = BUS_SPACE_MAXADDR_24BIT; - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, filter, filter_arg, /*maxsize*/BUS_SPACE_MAXSIZE_24BIT, diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c index 7ae7bd1..a1dc84a 100644 --- a/sys/dev/ahb/ahb.c +++ b/sys/dev/ahb/ahb.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahb.c,v 1.12 1999/05/08 21:59:17 dfr Exp $ + * $Id: ahb.c,v 1.13 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -299,7 +299,7 @@ ahbattach(device_t dev) */ /* DMA tag for mapping buffers into device visible space. */ /* XXX Should be a child of the EISA bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -312,7 +312,7 @@ ahbattach(device_t dev) ahb->init_level++; /* DMA tag for our ccb structures and ha inquiry data */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c index f11d563..3945018 100644 --- a/sys/dev/aic7xxx/ahc_eisa.c +++ b/sys/dev/aic7xxx/ahc_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.10 1999/05/17 21:56:00 gibbs Exp $ + * $Id: ahc_eisa.c,v 1.11 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -166,7 +166,7 @@ aic7770_attach(device_t dev) } /* XXX Should be a child of the EISA bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c index c8a5d3b..d1861df 100644 --- a/sys/dev/amd/amd.c +++ b/sys/dev/amd/amd.c @@ -1884,6 +1884,7 @@ SRBdone(struct amd_softc *amd, struct amd_srb *pSRB) status = pSRB->TargetStatus; pccb->ccb_h.status = CAM_REQ_CMP; + pccb->ccb_h.status = CAM_REQ_CMP; if (pSRB->SRBFlag & AUTO_REQSENSE) { pSRB->SRBFlag &= ~AUTO_REQSENSE; pSRB->AdaptStatus = 0; @@ -1991,6 +1992,7 @@ SRBdone(struct amd_softc *amd, struct amd_srb *pSRB) } else { /* No error */ pSRB->AdaptStatus = 0; pSRB->TargetStatus = 0; + pcsio->resid = 0; /* there is no error, (sense is invalid) */ } } @@ -2279,7 +2281,7 @@ amd_init(int unit, pcici_t config_id) amd->tag = I386_BUS_SPACE_IO; amd->bsh = pci_conf_read(config_id, PCI_MAP_REG_START) & 0xFFFE; /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(/*parent_dmat*/NULL, /*alignment*/0, + if (bus_dma_tag_create(/*parent_dmat*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c index f56a9d8..abedc48 100644 --- a/sys/dev/buslogic/bt.c +++ b/sys/dev/buslogic/bt.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt.c,v 1.21 1999/05/08 21:59:00 dfr Exp $ + * $Id: bt.c,v 1.22 1999/05/23 18:54:34 gibbs Exp $ */ /* @@ -707,7 +707,7 @@ bt_init(device_t dev) */ /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -720,7 +720,7 @@ bt_init(device_t dev) bt->init_level++; /* DMA tag for our mailboxes */ - if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -756,7 +756,7 @@ bt_init(device_t dev) btinitmboxes(bt); /* DMA tag for our ccb structures */ - if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -786,7 +786,7 @@ bt_init(device_t dev) bt->init_level++; /* DMA tag for our S/G structures. We allocate in page sized chunks */ - if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c index eaaee0d..d9cb584 100644 --- a/sys/dev/buslogic/bt_eisa.c +++ b/sys/dev/buslogic/bt_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_eisa.c,v 1.7 1999/05/08 21:59:18 dfr Exp $ + * $Id: bt_eisa.c,v 1.8 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -300,7 +300,7 @@ bt_eisa_attach(device_t dev) /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c index 581370f..6a45d50 100644 --- a/sys/dev/buslogic/bt_isa.c +++ b/sys/dev/buslogic/bt_isa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_isa.c,v 1.14 1999/06/03 20:56:09 peter Exp $ + * $Id: bt_isa.c,v 1.15 1999/06/28 09:19:58 peter Exp $ */ #include <sys/param.h> @@ -234,7 +234,7 @@ bt_isa_attach(device_t dev) } /* XXX Should be a child of the ISA or VL bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, filter, filter_arg, /*maxsize*/BUS_SPACE_MAXSIZE_32BIT, @@ -253,7 +253,7 @@ bt_isa_attach(device_t dev) if (lowaddr != BUS_SPACE_MAXADDR_32BIT) { /* DMA tag for our sense buffers */ - if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/0, + if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c index e4f8669..5aa8844 100644 --- a/sys/dev/buslogic/bt_pci.c +++ b/sys/dev/buslogic/bt_pci.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_pci.c,v 1.7 1999/05/08 21:59:38 dfr Exp $ + * $Id: bt_pci.c,v 1.8 1999/07/03 20:17:01 peter Exp $ */ #include <sys/param.h> @@ -172,7 +172,7 @@ bt_pci_attach(device_t dev) /* Allocate a dmatag for our CCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c index 0c376f4..caeab91 100644 --- a/sys/dev/dpt/dpt_eisa.c +++ b/sys/dev/dpt/dpt_eisa.c @@ -33,7 +33,7 @@ */ /* - * $Id: dpt_eisa.c,v 1.6 1999/05/08 21:59:19 dfr Exp $ + * $Id: dpt_eisa.c,v 1.7 1999/08/01 22:57:09 mdodd Exp $ */ #include "eisa.h" @@ -147,7 +147,7 @@ dpt_eisa_attach(device_t dev) /* Allocate a dmatag representing the capabilities of this attachment */ /* XXX Should be a child of the EISA bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c index 3caaf45..4e03f78 100644 --- a/sys/dev/dpt/dpt_pci.c +++ b/sys/dev/dpt/dpt_pci.c @@ -32,7 +32,7 @@ * dptpci.c: PCI Bus Attachment for DPT SCSI HBAs */ -#ident "$Id: dpt_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $" +#ident "$Id: dpt_pci.c,v 1.13 1999/05/09 17:06:44 peter Exp $" #include "opt_devfs.h" #include "opt_dpt.h" @@ -158,7 +158,7 @@ dpt_pci_attach(pcici_t config_id, int unit) /* Allocate a dmatag representing the capabilities of this attachment */ /* XXX Should be a child of the PCI bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c index d3143df..bb7362e 100644 --- a/sys/dev/dpt/dpt_scsi.c +++ b/sys/dev/dpt/dpt_scsi.c @@ -43,7 +43,7 @@ * arrays that span controllers (Wow!). */ -#ident "$Id: dpt_scsi.c,v 1.22 1998/12/22 20:21:12 eivind Exp $" +#ident "$Id: dpt_scsi.c,v 1.23 1999/05/06 20:16:22 ken Exp $" #define _DPT_C_ @@ -1159,7 +1159,7 @@ dpt_init(struct dpt_softc *dpt) /* XXX Shouldn't we poll a status register or something??? */ #endif /* DMA tag for our S/G structures. We allocate in page sized chunks */ - if (bus_dma_tag_create(dpt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(dpt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1281,7 +1281,7 @@ dpt_init(struct dpt_softc *dpt) dpt->sgsize = dpt_max_segs; /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(dpt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(dpt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1295,7 +1295,7 @@ dpt_init(struct dpt_softc *dpt) dpt->init_level++; /* DMA tag for our ccb structures and interrupt status packet */ - if (bus_dma_tag_create(dpt->parent_dmat, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(dpt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index 00fbc27..b7fca56 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ida.c,v 1.1 1999/06/24 03:31:57 jlemon Exp $ */ /* @@ -192,7 +192,7 @@ ida_init(struct ida_softc *ida) /* DMA tag for our hardware QCB structures */ error = bus_dma_tag_create(ida->parent_dmat, - /*alignment*/0, /*boundary*/0, + /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, IDA_QCB_MAX * sizeof(struct ida_hardware_qcb), @@ -203,7 +203,7 @@ ida_init(struct ida_softc *ida) /* DMA tag for mapping buffers into device space */ error = bus_dma_tag_create(ida->parent_dmat, - /*alignment*/0, /*boundary*/0, + /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/MAXBSIZE, /*nsegments*/IDA_NSEG, diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index 6f5e260..330ce7c 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/ida_pci.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ida_pci.c,v 1.2 1999/07/03 20:17:02 peter Exp $ + * $Id: ida_pci.c,v 1.3 1999/07/29 01:03:02 mdodd Exp $ */ #include <sys/param.h> @@ -145,7 +145,7 @@ ida_pci_attach(device_t dev) return (ENOMEM); } - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/MAXBSIZE, /*nsegments*/IDA_NSEG, diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 69dbd83..34473da 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -1,4 +1,4 @@ -/* $Id: isp_pci.c,v 1.27 1999/07/05 22:04:08 mjacob Exp $ */ +/* $Id: isp_pci.c,v 1.28 1999/07/06 01:24:20 mjacob Exp $ */ /* release_6_5_99 */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. @@ -516,7 +516,7 @@ isp_pci_attach(pcici_t cfid, int unit) pci_cfgwrite(cfid, PCIR_ROMADDR, data, 4); ISP_UNLOCK(isp); - if (bus_dma_tag_create(NULL, 0, 0, BUS_SPACE_MAXADDR_32BIT, + if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, lim + 1, 255, lim, 0, &pcs->parent_dmat) != 0) { printf("%s: could not create master dma tag\n", isp->isp_name); diff --git a/sys/i386/eisa/adv_eisa.c b/sys/i386/eisa/adv_eisa.c index 36c9758..4b475d3 100644 --- a/sys/i386/eisa/adv_eisa.c +++ b/sys/i386/eisa/adv_eisa.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_eisa.c,v 1.4 1999/05/08 21:59:16 dfr Exp $ + * $Id: adv_eisa.c,v 1.5 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -178,7 +178,7 @@ adveisaattach(device_t dev) * by the MI portions of the advansys driver */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADV_EISA_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, @@ -213,7 +213,7 @@ adveisaattach(device_t dev) * by the MI portions of the advansys driver */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADV_EISA_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/i386/eisa/ahb.c b/sys/i386/eisa/ahb.c index 7ae7bd1..a1dc84a 100644 --- a/sys/i386/eisa/ahb.c +++ b/sys/i386/eisa/ahb.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahb.c,v 1.12 1999/05/08 21:59:17 dfr Exp $ + * $Id: ahb.c,v 1.13 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -299,7 +299,7 @@ ahbattach(device_t dev) */ /* DMA tag for mapping buffers into device visible space. */ /* XXX Should be a child of the EISA bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -312,7 +312,7 @@ ahbattach(device_t dev) ahb->init_level++; /* DMA tag for our ccb structures and ha inquiry data */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/i386/eisa/ahc_eisa.c b/sys/i386/eisa/ahc_eisa.c index f11d563..3945018 100644 --- a/sys/i386/eisa/ahc_eisa.c +++ b/sys/i386/eisa/ahc_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.10 1999/05/17 21:56:00 gibbs Exp $ + * $Id: ahc_eisa.c,v 1.11 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -166,7 +166,7 @@ aic7770_attach(device_t dev) } /* XXX Should be a child of the EISA bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/i386/eisa/bt_eisa.c b/sys/i386/eisa/bt_eisa.c index eaaee0d..d9cb584 100644 --- a/sys/i386/eisa/bt_eisa.c +++ b/sys/i386/eisa/bt_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_eisa.c,v 1.7 1999/05/08 21:59:18 dfr Exp $ + * $Id: bt_eisa.c,v 1.8 1999/08/01 22:57:08 mdodd Exp $ */ #include "eisa.h" @@ -300,7 +300,7 @@ bt_eisa_attach(device_t dev) /* Allocate a dmatag for our SCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/i386/eisa/dpt_eisa.c b/sys/i386/eisa/dpt_eisa.c index 0c376f4..caeab91 100644 --- a/sys/i386/eisa/dpt_eisa.c +++ b/sys/i386/eisa/dpt_eisa.c @@ -33,7 +33,7 @@ */ /* - * $Id: dpt_eisa.c,v 1.6 1999/05/08 21:59:19 dfr Exp $ + * $Id: dpt_eisa.c,v 1.7 1999/08/01 22:57:09 mdodd Exp $ */ #include "eisa.h" @@ -147,7 +147,7 @@ dpt_eisa_attach(device_t dev) /* Allocate a dmatag representing the capabilities of this attachment */ /* XXX Should be a child of the EISA bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/i386/isa/adv_isa.c b/sys/i386/isa/adv_isa.c index 58eebf0..5cc06c58 100644 --- a/sys/i386/isa/adv_isa.c +++ b/sys/i386/isa/adv_isa.c @@ -44,7 +44,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_isa.c,v 1.10 1999/04/23 23:29:23 gibbs Exp $ + * $Id: adv_isa.c,v 1.11 1999/05/08 18:20:57 peter Exp $ */ #include <sys/param.h> @@ -212,7 +212,7 @@ advisaprobe(struct isa_device *id) /* XXX Should be a child of the ISA bus dma tag */ error = bus_dma_tag_create(/*parent*/NULL, - /*alignemnt*/0, + /*alignemnt*/1, /*boundary*/0, lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/i386/isa/aha_isa.c b/sys/i386/isa/aha_isa.c index dec2dfe..b6e0cb0 100644 --- a/sys/i386/isa/aha_isa.c +++ b/sys/i386/isa/aha_isa.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aha_isa.c,v 1.7 1999/04/16 21:22:19 peter Exp $ + * $Id: aha_isa.c,v 1.8 1999/05/08 18:20:55 peter Exp $ */ #include "pnp.h" @@ -182,7 +182,7 @@ aha_isa_attach(dev) filter_arg = NULL; lowaddr = BUS_SPACE_MAXADDR_24BIT; - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, filter, filter_arg, /*maxsize*/BUS_SPACE_MAXSIZE_24BIT, diff --git a/sys/isa/bt_isa.c b/sys/isa/bt_isa.c index 581370f..6a45d50 100644 --- a/sys/isa/bt_isa.c +++ b/sys/isa/bt_isa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_isa.c,v 1.14 1999/06/03 20:56:09 peter Exp $ + * $Id: bt_isa.c,v 1.15 1999/06/28 09:19:58 peter Exp $ */ #include <sys/param.h> @@ -234,7 +234,7 @@ bt_isa_attach(device_t dev) } /* XXX Should be a child of the ISA or VL bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, lowaddr, /*highaddr*/BUS_SPACE_MAXADDR, filter, filter_arg, /*maxsize*/BUS_SPACE_MAXSIZE_32BIT, @@ -253,7 +253,7 @@ bt_isa_attach(device_t dev) if (lowaddr != BUS_SPACE_MAXADDR_32BIT) { /* DMA tag for our sense buffers */ - if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/0, + if (bus_dma_tag_create(bt->parent_dmat, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c index 4a669d0..1ca2cee 100644 --- a/sys/pci/adv_pci.c +++ b/sys/pci/adv_pci.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_pci.c,v 1.6 1999/05/09 17:06:35 peter Exp $ + * $Id: adv_pci.c,v 1.7 1999/07/03 20:16:58 peter Exp $ */ #include <sys/param.h> @@ -163,7 +163,7 @@ advpciattach(pcici_t config_id, int unit) /* Allocate a dmatag for our transfer DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADV_PCI_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c index 8b0b86a..6509786 100644 --- a/sys/pci/adw_pci.c +++ b/sys/pci/adw_pci.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adw_pci.c,v 1.5 1999/05/09 17:06:36 peter Exp $ + * $Id: adw_pci.c,v 1.6 1999/07/03 20:16:58 peter Exp $ */ #include <sys/param.h> @@ -136,7 +136,7 @@ adwpciattach(pcici_t config_id, int unit) /* Allocate a dmatag for our transfer DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/ADW_PCI_MAX_DMA_ADDR, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/pci/amd.c b/sys/pci/amd.c index c8a5d3b..d1861df 100644 --- a/sys/pci/amd.c +++ b/sys/pci/amd.c @@ -1884,6 +1884,7 @@ SRBdone(struct amd_softc *amd, struct amd_srb *pSRB) status = pSRB->TargetStatus; pccb->ccb_h.status = CAM_REQ_CMP; + pccb->ccb_h.status = CAM_REQ_CMP; if (pSRB->SRBFlag & AUTO_REQSENSE) { pSRB->SRBFlag &= ~AUTO_REQSENSE; pSRB->AdaptStatus = 0; @@ -1991,6 +1992,7 @@ SRBdone(struct amd_softc *amd, struct amd_srb *pSRB) } else { /* No error */ pSRB->AdaptStatus = 0; pSRB->TargetStatus = 0; + pcsio->resid = 0; /* there is no error, (sense is invalid) */ } } @@ -2279,7 +2281,7 @@ amd_init(int unit, pcici_t config_id) amd->tag = I386_BUS_SPACE_IO; amd->bsh = pci_conf_read(config_id, PCI_MAP_REG_START) & 0xFFFE; /* DMA tag for mapping buffers into device visible space. */ - if (bus_dma_tag_create(/*parent_dmat*/NULL, /*alignment*/0, + if (bus_dma_tag_create(/*parent_dmat*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, diff --git a/sys/pci/bt_pci.c b/sys/pci/bt_pci.c index e4f8669..5aa8844 100644 --- a/sys/pci/bt_pci.c +++ b/sys/pci/bt_pci.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_pci.c,v 1.7 1999/05/08 21:59:38 dfr Exp $ + * $Id: bt_pci.c,v 1.8 1999/07/03 20:17:01 peter Exp $ */ #include <sys/param.h> @@ -172,7 +172,7 @@ bt_pci_attach(device_t dev) /* Allocate a dmatag for our CCB DMA maps */ /* XXX Should be a child of the PCI bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c index 3caaf45..4e03f78 100644 --- a/sys/pci/dpt_pci.c +++ b/sys/pci/dpt_pci.c @@ -32,7 +32,7 @@ * dptpci.c: PCI Bus Attachment for DPT SCSI HBAs */ -#ident "$Id: dpt_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $" +#ident "$Id: dpt_pci.c,v 1.13 1999/05/09 17:06:44 peter Exp $" #include "opt_devfs.h" #include "opt_dpt.h" @@ -158,7 +158,7 @@ dpt_pci_attach(pcici_t config_id, int unit) /* Allocate a dmatag representing the capabilities of this attachment */ /* XXX Should be a child of the PCI bus dma tag */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/0, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/NULL, /*alignemnt*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, diff --git a/sys/pci/ida_pci.c b/sys/pci/ida_pci.c index 6f5e260..330ce7c 100644 --- a/sys/pci/ida_pci.c +++ b/sys/pci/ida_pci.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ida_pci.c,v 1.2 1999/07/03 20:17:02 peter Exp $ + * $Id: ida_pci.c,v 1.3 1999/07/29 01:03:02 mdodd Exp $ */ #include <sys/param.h> @@ -145,7 +145,7 @@ ida_pci_attach(device_t dev) return (ENOMEM); } - error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/0, + error = bus_dma_tag_create(/*parent*/NULL, /*alignment*/1, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/MAXBSIZE, /*nsegments*/IDA_NSEG, diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c index 69dbd83..34473da 100644 --- a/sys/pci/isp_pci.c +++ b/sys/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $Id: isp_pci.c,v 1.27 1999/07/05 22:04:08 mjacob Exp $ */ +/* $Id: isp_pci.c,v 1.28 1999/07/06 01:24:20 mjacob Exp $ */ /* release_6_5_99 */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. @@ -516,7 +516,7 @@ isp_pci_attach(pcici_t cfid, int unit) pci_cfgwrite(cfid, PCIR_ROMADDR, data, 4); ISP_UNLOCK(isp); - if (bus_dma_tag_create(NULL, 0, 0, BUS_SPACE_MAXADDR_32BIT, + if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, lim + 1, 255, lim, 0, &pcs->parent_dmat) != 0) { printf("%s: could not create master dma tag\n", isp->isp_name); |
