- define HAS_STREAM_METHODS correctly

- dmamap_load_mbuf/load_uio prototypes

Submitted partly by:  Hiten Pandya <hiten@unixdaemons.com>

1 files changed, 25 insertions, 2 deletions

diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h
index 561ee28..5b8f9b3 100644
--- a/sys/powerpc/include/bus.h
+++ b/sys/powerpc/include/bus.h
@@ -87,7 +87,7 @@
  * Values for the macppc bus space tag, not to be used directly by MI code.
  */
 
-#define	__BUS_SPACE_HAS_STREAM_METHODS
+#define	__BUS_SPACE_HAS_STREAM_METHODS 1
 
 /*
  * Values for the ppc bus space tag, not to be used directly by MI code.
@@ -193,7 +193,7 @@ bus_space_map(t, addr, size, flags, bshp) ! not implemented !
 #define	bus_space_read_stream_2(t, h, o)	(in16(__ppc_ba(t, h, o)))
 #define	bus_space_read_stream_4(t, h, o)	(in32(__ppc_ba(t, h, o)))
 #if 0	/* Cause a link error for bus_space_read_stream_8 */
-#define	bus_space_read_8(t, h, o)	!!! unimplemented !!!
+#define	bus_space_read_stream_8(t, h, o)	!!! unimplemented !!!
 #endif
 
 /*
@@ -756,6 +756,29 @@ int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
 		    void *callback_arg, int flags);
 
 /*
+ * Like bus_dmamap_callback but includes map size in bytes.  This is
+ * defined as a separate interface to maintain compatiiblity for users
+ * of bus_dmamap_callback_t--at some point these interfaces should be merged.
+ */
+typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int);
+/*
+ * Like bus_dmamap_load but for mbufs.  Note the use of the
+ * bus_dmamap_callback2_t interface.
+ */
+int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map,
+			 struct mbuf *mbuf,
+			 bus_dmamap_callback2_t *callback, void *callback_arg,
+			 int flags);
+/*
+ * Like bus_dmamap_load but for uios.  Note the use of the
+ * bus_dmamap_callback2_t interface.
+ */
+int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map,
+			struct uio *ui,
+			bus_dmamap_callback2_t *callback, void *callback_arg,
+			int flags);
+
+/*
  * Perform a syncronization operation on the given map.
  */
 void bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);