6 files changed, 185 insertions, 133 deletions

diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 609a4eb399f67..4884317a5c63a 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -171,16 +171,19 @@ adv_eisa_attach(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*/1,
-					   /*boundary*/0,
-					   /*lowaddr*/ADV_EISA_MAX_DMA_ADDR,
-					   /*highaddr*/BUS_SPACE_MAXADDR,
-					   /*filter*/NULL, /*filterarg*/NULL,
-					   /*maxsize*/BUS_SPACE_MAXSIZE_32BIT,
-					   /*nsegments*/~0,
-					   /*maxsegsz*/ADV_EISA_MAX_DMA_COUNT,
-					   /*flags*/0,
-					   &adv_b->parent_dmat);
+		error = bus_dma_tag_create(
+				/* parent	*/ NULL,
+				/* alignment	*/ 1,
+				/* boundary	*/ 0,
+				/* lowaddr	*/ ADV_EISA_MAX_DMA_ADDR,
+				/* highaddr	*/ BUS_SPACE_MAXADDR,
+				/* filter	*/ NULL,
+				/* filterarg	*/ NULL,
+				/* maxsize	*/ BUS_SPACE_MAXSIZE_32BIT,
+				/* nsegments	*/ ~0,
+				/* maxsegsz	*/ ADV_EISA_MAX_DMA_COUNT,
+				/* flags	*/ 0,
+				&adv_b->parent_dmat);
  
 		if (error != 0) {
 			printf("%s: Could not allocate DMA tag - error %d\n",
@@ -206,16 +209,19 @@ adv_eisa_attach(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*/1,
-					   /*boundary*/0,
-					   /*lowaddr*/ADV_EISA_MAX_DMA_ADDR,
-					   /*highaddr*/BUS_SPACE_MAXADDR,
-					   /*filter*/NULL, /*filterarg*/NULL,
-					   /*maxsize*/BUS_SPACE_MAXSIZE_32BIT,
-					   /*nsegments*/~0,
-					   /*maxsegsz*/ADV_EISA_MAX_DMA_COUNT,
-					   /*flags*/0,
-					   &adv->parent_dmat);
+		error = bus_dma_tag_create(
+				/* parent	*/ NULL,
+				/* alignment	*/ 1,
+				/* boundary	*/ 0,
+				/* lowaddr	*/ ADV_EISA_MAX_DMA_ADDR,
+				/* highaddr	*/ BUS_SPACE_MAXADDR,
+				/* filter	*/ NULL,
+				/* filterarg	*/ NULL,
+				/* maxsize	*/ BUS_SPACE_MAXSIZE_32BIT,
+				/* nsegments	*/ ~0,
+				/* maxsegsz	*/ ADV_EISA_MAX_DMA_COUNT,
+				/* flags	*/ 0,
+				&adv->parent_dmat);
  
 		if (error != 0) {
 			printf("%s: Could not allocate DMA tag - error %d\n",
@@ -234,18 +240,19 @@ adv_eisa_attach(device_t dev)
 
 	if (overrun_buf == NULL) {
 		/* Need to allocate our overrun buffer */
-		if (bus_dma_tag_create(adv->parent_dmat,
-				       /*alignment*/8,
-				       /*boundary*/0,
-				       ADV_EISA_MAX_DMA_ADDR,
-				       BUS_SPACE_MAXADDR,
-				       /*filter*/NULL,
-				       /*filterarg*/NULL,
-				       ADV_OVERRUN_BSIZE,
-				       /*nsegments*/1,
-				       BUS_SPACE_MAXSIZE_32BIT,
-				       /*flags*/0,
-				       &overrun_dmat) != 0) {
+		if (bus_dma_tag_create(
+				/* parent	*/ adv->parent_dmat,
+				/* alignment	*/ 8,
+				/* boundary	*/ 0,
+				/* lowaddr	*/ ADV_EISA_MAX_DMA_ADDR,
+				/* highaddr	*/ BUS_SPACE_MAXADDR,
+				/* filter	*/ NULL,
+				/* filterarg	*/ NULL,
+				/* maxsize	*/ ADV_OVERRUN_BSIZE,
+				/* nsegments	*/ 1,
+				/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+				/* flags	*/ 0,
+				&overrun_dmat) != 0) {
 			adv_free(adv);
 			goto bad;
        		}
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index b8c5e3fe83721..e8eca4ea5f157 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -218,18 +218,19 @@ adv_isa_probe(device_t dev)
 		 * by the MI portions of the advansys driver
 		 */
 		/* XXX Should be a child of the ISA bus dma tag */ 
-		error = bus_dma_tag_create(/*parent*/NULL,
-					   /*alignemnt*/1,
-					   /*boundary*/0,
-					   lowaddr,
-					   /*highaddr*/BUS_SPACE_MAXADDR,
-					   /*filter*/NULL,
-					   /*filterarg*/NULL,
-					   maxsize,
-					   /*nsegs*/~0,
-					   maxsegsz,
-					   /*flags*/0,
-					   &adv->parent_dmat); 
+		error = bus_dma_tag_create(
+				/* parent	*/ NULL,
+				/* alignemnt	*/ 1,
+				/* boundary	*/ 0,
+				/* lowaddr	*/ lowaddr,
+				/* highaddr	*/ BUS_SPACE_MAXADDR,
+				/* filter	*/ NULL,
+				/* filterarg	*/ NULL,
+				/* maxsize	*/ maxsize,
+				/* nsegments	*/ ~0,
+				/* maxsegsz	*/ maxsegsz,
+				/* flags	*/ 0,
+				&adv->parent_dmat); 
 
 		if (error != 0) {
 			printf("%s: Could not allocate DMA tag - error %d\n",
@@ -243,18 +244,19 @@ adv_isa_probe(device_t dev)
 
 		if (overrun_buf == NULL) {
 			/* Need to allocate our overrun buffer */
-			if (bus_dma_tag_create(adv->parent_dmat,
-					       /*alignment*/8,
-					       /*boundary*/0,
-					       ADV_ISA_MAX_DMA_ADDR,
-					       BUS_SPACE_MAXADDR,
-					       /*filter*/NULL,
-					       /*filterarg*/NULL,
-					       ADV_OVERRUN_BSIZE,
-					       /*nsegments*/1,
-					       BUS_SPACE_MAXSIZE_32BIT,
-					       /*flags*/0,
-					       &overrun_dmat) != 0) {
+			if (bus_dma_tag_create(
+				/* parent	*/ adv->parent_dmat,
+				/* alignment	*/ 8,
+				/* boundary	*/ 0,
+				/* lowaddr	*/ ADV_ISA_MAX_DMA_ADDR,
+				/* highaddr	*/ BUS_SPACE_MAXADDR,
+				/* filter	*/ NULL,
+				/* filterarg	*/ NULL,
+				/* maxsize	*/ ADV_OVERRUN_BSIZE,
+				/* nsegments	*/ 1,
+				/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+				/* flags	*/ 0,
+				&overrun_dmat) != 0) {
 				adv_free(adv);
 				bus_release_resource(dev, SYS_RES_IOPORT, 0,
 						     iores);
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index b8234cc117596..0891f48b8fd50 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -185,16 +185,19 @@ adv_pci_attach(device_t dev)
 
 	/* 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*/1,
-				   /*boundary*/0,
-				   /*lowaddr*/ADV_PCI_MAX_DMA_ADDR,
-				   /*highaddr*/BUS_SPACE_MAXADDR,
-				   /*filter*/NULL, /*filterarg*/NULL,
-				   /*maxsize*/BUS_SPACE_MAXSIZE_32BIT,
-				   /*nsegments*/~0,
-				   /*maxsegsz*/ADV_PCI_MAX_DMA_COUNT,
-				   /*flags*/0,
-				   &adv->parent_dmat);
+	error = bus_dma_tag_create(
+			/* parent	*/ NULL,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ ADV_PCI_MAX_DMA_ADDR,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* nsegments	*/ ~0,
+			/* maxsegsz	*/ ADV_PCI_MAX_DMA_COUNT,
+			/* flags	*/ 0,
+			&adv->parent_dmat);
  
 	if (error != 0) {
 		printf("%s: Could not allocate DMA tag - error %d\n",
@@ -208,13 +211,19 @@ adv_pci_attach(device_t dev)
 
 	if (overrun_buf == NULL) {
 		/* Need to allocate our overrun buffer */
-		if (bus_dma_tag_create(adv->parent_dmat,
-				       /*alignment*/8, /*boundary*/0,
-				       ADV_PCI_MAX_DMA_ADDR, BUS_SPACE_MAXADDR,
-				       /*filter*/NULL, /*filterarg*/NULL,
-				       ADV_OVERRUN_BSIZE, /*nsegments*/1,
-				       BUS_SPACE_MAXSIZE_32BIT, /*flags*/0,
-				       &overrun_dmat) != 0) {
+		if (bus_dma_tag_create(
+				/* parent	*/ adv->parent_dmat,
+				/* alignment	*/ 8,
+				/* boundary	*/ 0,
+				/* lowaddr	*/ ADV_PCI_MAX_DMA_ADDR,
+				/* highaddr	*/ BUS_SPACE_MAXADDR,
+				/* filter	*/ NULL,
+				/* filterarg	*/ NULL,
+				/* maxsize	*/ ADV_OVERRUN_BSIZE,
+				/* nsegments	*/ 1,
+				/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+				/* flags	*/ 0,
+				&overrun_dmat) != 0) {
 			bus_dma_tag_destroy(adv->parent_dmat);
 			adv_free(adv);
 			bus_release_resource(dev, SYS_RES_IOPORT, rid, iores);
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index fcd7d3f947745..ed820aa7e1e6d 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -1335,28 +1335,38 @@ adv_attach(adv)
 		max_sg = 255;
 
 	/* DMA tag for mapping buffers into device visible space. */
-	if (bus_dma_tag_create(adv->parent_dmat, /*alignment*/1, /*boundary*/0,
-			       /*lowaddr*/BUS_SPACE_MAXADDR,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       /*maxsize*/MAXPHYS,
-			       /*nsegments*/max_sg,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/BUS_DMA_ALLOCNOW,
-			       &adv->buffer_dmat) != 0) {
+	if (bus_dma_tag_create(
+			/* parent	*/ adv->parent_dmat,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ BUS_SPACE_MAXADDR,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ MAXPHYS,
+			/* nsegments	*/ max_sg,
+			/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* flags	*/ BUS_DMA_ALLOCNOW,
+			&adv->buffer_dmat) != 0) {
 		return (ENXIO);
 	}
 	adv->init_level++;
 
 	/* DMA tag for our sense buffers */
-	if (bus_dma_tag_create(adv->parent_dmat, /*alignment*/1, /*boundary*/0,
-			       /*lowaddr*/BUS_SPACE_MAXADDR,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       sizeof(struct scsi_sense_data)*adv->max_openings,
-			       /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &adv->sense_dmat) != 0) {
+	if (bus_dma_tag_create(
+			/* parent	*/ adv->parent_dmat,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ BUS_SPACE_MAXADDR,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ sizeof(struct scsi_sense_data) *
+					   adv->max_openings,
+			/* nsegments	*/ 1,
+			/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* flags	*/ 0,
+			&adv->sense_dmat) != 0) {
 		return (ENXIO);
         }
 
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index eed11a0413d70..b843005a5d6a7 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -256,16 +256,19 @@ adw_pci_attach(device_t dev)
 
 	/* 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*/1,
-				   /*boundary*/0,
-				   /*lowaddr*/ADW_PCI_MAX_DMA_ADDR,
-				   /*highaddr*/BUS_SPACE_MAXADDR,
-				   /*filter*/NULL, /*filterarg*/NULL,
-				   /*maxsize*/BUS_SPACE_MAXSIZE_32BIT,
-				   /*nsegments*/~0,
-				   /*maxsegsz*/ADW_PCI_MAX_DMA_COUNT,
-				   /*flags*/0,
-				   &adw->parent_dmat);
+	error = bus_dma_tag_create(
+			/* parent	*/ NULL,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ ADW_PCI_MAX_DMA_ADDR,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* nsegments	*/ ~0,
+			/* maxsegsz	*/ ADW_PCI_MAX_DMA_COUNT,
+			/* flags	*/ 0,
+			&adw->parent_dmat);
 
 	adw->init_level++;
  
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 50074131d359c..4085f3bfa89d8 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -1029,30 +1029,40 @@ adw_init(struct adw_softc *adw)
 	printf("%s: SCSI ID %d, ", adw_name(adw), adw->initiator_id);
 
 	/* DMA tag for mapping buffers into device visible space. */
-	if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/1, /*boundary*/0,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       /*maxsize*/MAXBSIZE, /*nsegments*/ADW_SGSIZE,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/BUS_DMA_ALLOCNOW,
-			       &adw->buffer_dmat) != 0) {
+	if (bus_dma_tag_create(
+			/* parent	*/ adw->parent_dmat,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ BUS_SPACE_MAXADDR_32BIT,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ MAXBSIZE,
+			/* nsegments	*/ ADW_SGSIZE,
+			/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* flags	*/ BUS_DMA_ALLOCNOW,
+			&adw->buffer_dmat) != 0) {
 		return (ENOMEM);
 	}
 
 	adw->init_level++;
 
 	/* DMA tag for our ccb carrier structures */
-	if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/0x10,
-			       /*boundary*/0,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       (adw->max_acbs + ADW_NUM_CARRIER_QUEUES + 1)
-				* sizeof(struct adw_carrier),
-			       /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &adw->carrier_dmat) != 0) {
+	if (bus_dma_tag_create(
+			/* parent	*/ adw->parent_dmat,
+			/* alignment	*/ 0x10,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ BUS_SPACE_MAXADDR_32BIT,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ (adw->max_acbs +
+					    ADW_NUM_CARRIER_QUEUES + 1) *
+					    sizeof(struct adw_carrier),
+			/* nsegments	*/ 1,
+			/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* flags	*/ 0,
+			&adw->carrier_dmat) != 0) {
 		return (ENOMEM);
         }
 
@@ -1099,14 +1109,19 @@ adw_init(struct adw_softc *adw)
 	adw->init_level++;
 
 	/* DMA tag for our acb structures */
-	if (bus_dma_tag_create(adw->parent_dmat, /*alignment*/1, /*boundary*/0,
-			       /*lowaddr*/BUS_SPACE_MAXADDR,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       adw->max_acbs * sizeof(struct acb),
-			       /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &adw->acb_dmat) != 0) {
+	if (bus_dma_tag_create(
+			/* parent	*/ adw->parent_dmat,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ BUS_SPACE_MAXADDR,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ adw->max_acbs * sizeof(struct acb),
+			/* nsegments	*/ 1,
+			/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* flags	*/ 0,
+			&adw->acb_dmat) != 0) {
 		return (ENOMEM);
         }
 
@@ -1129,13 +1144,19 @@ 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*/1, /*boundary*/0,
-			       /*lowaddr*/BUS_SPACE_MAXADDR,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       PAGE_SIZE, /*nsegments*/1,
-			       /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT,
-			       /*flags*/0, &adw->sg_dmat) != 0) {
+	if (bus_dma_tag_create(
+			/* parent	*/ adw->parent_dmat,
+			/* alignment	*/ 1,
+			/* boundary	*/ 0,
+			/* lowaddr	*/ BUS_SPACE_MAXADDR,
+			/* highaddr	*/ BUS_SPACE_MAXADDR,
+			/* filter	*/ NULL,
+			/* filterarg	*/ NULL,
+			/* maxsize	*/ PAGE_SIZE,
+			/* nsegments	*/ 1,
+			/* maxsegsz	*/ BUS_SPACE_MAXSIZE_32BIT,
+			/* flags	*/ 0,
+			&adw->sg_dmat) != 0) {
 		return (ENOMEM);
         }