PERFORCE change 94792 for review

[John-Mark Gurney]

http://perforce.freebsd.org/chv.cgi?CH=94792

Change 94792 by jmg at jmg_carbon-60 on 2006/04/08 06:16:58

	teach ata and em about new parent tags..

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/dev/ata/ata-dma.c#3 edit
.. //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#3 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/dev/ata/ata-dma.c#3 (text+ko) ====

@@ -96,7 +96,7 @@
     struct ata_channel *ch = device_get_softc(dev);
     struct ata_dc_cb_args ccba;
 
-    if (bus_dma_tag_create(NULL, ch->dma->alignment, 0,
+    if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0,
 			   BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR,
 			   NULL, NULL, ch->dma->max_iosize,
 			   ATA_DMA_ENTRIES, ch->dma->segsize,

==== //depot/projects/kmacy_sun4v/src/sys/dev/em/if_em.c#3 (text+ko) ====

@@ -2242,7 +2242,7 @@
 {
 	int error;
 
-	error = bus_dma_tag_create(NULL,		/* parent */
+	error = bus_dma_tag_create(bus_get_dma_tag(sc->dev),	/* parent */
 				E1000_DBA_ALIGN, 0,	/* alignment, bounds */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR,	/* highaddr */
@@ -2346,7 +2346,7 @@
 	 * Setup DMA descriptor areas.
 	 */
 	size = roundup2(sc->hw.max_frame_size, MCLBYTES);
-	if ((error = bus_dma_tag_create(NULL,		/* parent */
+	if ((error = bus_dma_tag_create(bus_get_dma_tag(dev),	/* parent */
 				1, 0,			/* alignment, bounds */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR,	/* highaddr */
@@ -2732,7 +2732,7 @@
 
 	bzero(sc->rx_buffer_area, sizeof(struct em_buffer) * sc->num_rx_desc);
 
-	error = bus_dma_tag_create(NULL,		/* parent */
+	error = bus_dma_tag_create(bus_get_dma_tag(dev),	/* parent */
 				1, 0,			/* alignment, bounds */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR,	/* highaddr */