svn commit: r244870 - in projects/physbio/sys: arm/arm ia64/ia64 powerpc/powerpc sparc64/include sparc64/sparc64

[Jeff Roberson]

Author: jeff
Date: Sun Dec 30 21:07:21 2012
New Revision: 244870
URL: http://svnweb.freebsd.org/changeset/base/244870

Log:
   - Resolve some compile errors discovered during make universe.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  projects/physbio/sys/arm/arm/busdma_machdep-v6.c
  projects/physbio/sys/ia64/ia64/busdma_machdep.c
  projects/physbio/sys/powerpc/powerpc/busdma_machdep.c
  projects/physbio/sys/sparc64/include/bus_dma.h
  projects/physbio/sys/sparc64/sparc64/iommu.c

Modified: projects/physbio/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- projects/physbio/sys/arm/arm/busdma_machdep-v6.c	Sun Dec 30 17:54:25 2012	(r244869)
+++ projects/physbio/sys/arm/arm/busdma_machdep-v6.c	Sun Dec 30 21:07:21 2012	(r244870)
@@ -1084,7 +1084,7 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus
 					      (void *)bpage->vaddr,
 					      bpage->datacount);
 				else
-					physcopyout(page->dataaddr,
+					physcopyout(bpage->dataaddr,
 					      (void *)bpage->vaddr,
 					      bpage->datacount);
 				cpu_dcache_wb_range((vm_offset_t)bpage->vaddr,

Modified: projects/physbio/sys/ia64/ia64/busdma_machdep.c
==============================================================================
--- projects/physbio/sys/ia64/ia64/busdma_machdep.c	Sun Dec 30 17:54:25 2012	(r244869)
+++ projects/physbio/sys/ia64/ia64/busdma_machdep.c	Sun Dec 30 21:07:21 2012	(r244870)
@@ -536,7 +536,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dm
 	}
 }
 
-static void
+static int
 _bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int flags)
 {
 
@@ -558,7 +558,7 @@ _bus_dmamap_reserve_pages(bus_dma_tag_t 
 	}
 	mtx_unlock(&bounce_lock);
 
-	return (0)
+	return (0);
 }
 
 /*
@@ -669,7 +669,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 	bus_size_t sgsize;
 	bus_addr_t curaddr;
 	vm_offset_t vaddr;
-	bus_addr_t paddr;
+	int error;
 
 	if (map == NULL)
 		map = &nobounce_dmamap;

Modified: projects/physbio/sys/powerpc/powerpc/busdma_machdep.c
==============================================================================
--- projects/physbio/sys/powerpc/powerpc/busdma_machdep.c	Sun Dec 30 17:54:25 2012	(r244869)
+++ projects/physbio/sys/powerpc/powerpc/busdma_machdep.c	Sun Dec 30 21:07:21 2012	(r244870)
@@ -769,7 +769,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 	bus_size_t sgsize;
 	bus_addr_t curaddr;
 	vm_offset_t vaddr;
-	bus_addr_t paddr;
+	int error;
 
 	if (segs == NULL)
 		segs = map->segments;
@@ -891,12 +891,12 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus
 
 		if (op & BUS_DMASYNC_PREWRITE) {
 			while (bpage != NULL) {
-				if (page->datavaddr != 0)
+				if (bpage->datavaddr != 0)
 					bcopy((void *)bpage->datavaddr,
 					      (void *)bpage->vaddr,
 					      bpage->datacount);
 				else
-					physcopyout(page->dataaddr,
+					physcopyout(bpage->dataaddr,
 					    (void *)bpage->vaddr,
 					    bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
@@ -906,7 +906,7 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus
 
 		if (op & BUS_DMASYNC_POSTREAD) {
 			while (bpage != NULL) {
-				if (page->datavaddr != 0)
+				if (bpage->datavaddr != 0)
 					bcopy((void *)bpage->vaddr,
 					      (void *)bpage->datavaddr,
 					      bpage->datacount);

Modified: projects/physbio/sys/sparc64/include/bus_dma.h
==============================================================================
--- projects/physbio/sys/sparc64/include/bus_dma.h	Sun Dec 30 17:54:25 2012	(r244869)
+++ projects/physbio/sys/sparc64/include/bus_dma.h	Sun Dec 30 21:07:21 2012	(r244870)
@@ -85,7 +85,8 @@ struct bus_dma_methods {
 	    void *buf, bus_size_t buflen, struct pmap *pmap, int flags,
 	    bus_dma_segment_t *segs, int *segp);
 	void	(*dm_dmamap_waitok)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    bus_dmamap_callback_t *callback, void *callback_arg);
+	    bus_dma_memory_t mem, bus_dmamap_callback_t *callback,
+	    void *callback_arg);
 	bus_dma_segment_t *(*dm_dmamap_complete)(bus_dma_tag_t dmat,
 	    bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, int error);
 	void	(*dm_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
@@ -128,7 +129,7 @@ struct bus_dma_tag {
 #define	bus_dmamap_destroy(t, p)					\
 	((t)->dt_mt->dm_dmamap_destroy((t), (p)))
 #define	_bus_dmamap_load_phys(t, m, b, l, f, s, sp)			\
-	((t)->dt_mt->dm_dmamap_load_buffer((t), (m), (b), (l),		\
+	((t)->dt_mt->dm_dmamap_load_phys((t), (m), (b), (l),		\
 	    (f), (s), (sp)))
 #define	_bus_dmamap_load_buffer(t, m, b, l, p, f, s, sp)		\
 	((t)->dt_mt->dm_dmamap_load_buffer((t), (m), (b), (l), (p),	\

Modified: projects/physbio/sys/sparc64/sparc64/iommu.c
==============================================================================
--- projects/physbio/sys/sparc64/sparc64/iommu.c	Sun Dec 30 17:54:25 2012	(r244869)
+++ projects/physbio/sys/sparc64/sparc64/iommu.c	Sun Dec 30 21:07:21 2012	(r244870)
@@ -851,7 +851,7 @@ iommu_dvmamap_destroy(bus_dma_tag_t dt, 
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
-iommu_dvmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
+iommu_dvmamap_load_phys(bus_dma_tag_t dt, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags, bus_dma_segment_t *segs, int *segp)
 {
 	bus_addr_t amask, dvmaddr, dvmoffs;