Merge remote-tracking branch 'stefanha/trivial-patches' into staging

[qemu.git] / hw / mac_dbdma.h

diff --git a/hw/mac_dbdma.h b/hw/mac_dbdma.h
index 35f65c340a653420ee43aaf2f88a0809b4810e4e..6d1abe6aae969bf749d4c4ef4c9bcec2af5e07b8 100644 (file)
--- a/hw/mac_dbdma.h
+++ b/hw/mac_dbdma.h
@@ -20,8 +20,11 @@
  * THE SOFTWARE.
  */
 
+#include "memory.h"
+
 typedef struct DBDMA_io DBDMA_io;
 
+typedef void (*DBDMA_flush)(DBDMA_io *io);
 typedef void (*DBDMA_rw)(DBDMA_io *io);
 typedef void (*DBDMA_end)(DBDMA_io *io);
 struct DBDMA_io {
@@ -36,7 +39,6 @@ struct DBDMA_io {
 
 
 void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,
-                            DBDMA_rw rw,
+                            DBDMA_rw rw, DBDMA_flush flush,
                             void *opaque);
-void DBDMA_schedule(void);
-void* DBDMA_init (int *dbdma_mem_index);
+void* DBDMA_init (MemoryRegion **dbdma_mem);