[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/15] isa: Move DMA_transfer_handler from qemu-comm
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 12/15] isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h |
Date: |
Tue, 15 Mar 2016 16:03:38 +0100 |
DMA_transfer_handler is actually an ISA thing, and as such has no
business in qemu-common.h. Move it to hw/isa/isa.h, and rename it to
IsaDmaTransferHandler.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/dma/i8257.c | 2 +-
include/hw/isa/i8257.h | 2 +-
include/hw/isa/isa.h | 5 ++++-
include/qemu-common.h | 2 --
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 6078893..f345c54 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -381,7 +381,7 @@ out:
}
static void i8257_dma_register_channel(IsaDma *obj, int nchan,
- DMA_transfer_handler transfer_handler,
+ IsaDmaTransferHandler transfer_handler,
void *opaque)
{
I8257State *d = I8257(obj);
diff --git a/include/hw/isa/i8257.h b/include/hw/isa/i8257.h
index 8d34ed1..8c44d36 100644
--- a/include/hw/isa/i8257.h
+++ b/include/hw/isa/i8257.h
@@ -11,7 +11,7 @@ typedef struct I8257Regs {
uint8_t pageh;
uint8_t dack;
uint8_t eop;
- DMA_transfer_handler transfer_handler;
+ IsaDmaTransferHandler transfer_handler;
void *opaque;
} I8257Regs;
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 0bbe21c..ffb2ea7 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -54,6 +54,9 @@ typedef enum {
ISADMA_TRANSFER_ILLEGAL,
} IsaDmaTransferMode;
+typedef int (*IsaDmaTransferHandler)(void *opaque, int nchan, int pos,
+ int size);
+
typedef struct IsaDmaClass {
InterfaceClass parent;
@@ -65,7 +68,7 @@ typedef struct IsaDmaClass {
void (*release_DREQ)(IsaDma *obj, int nchan);
void (*schedule)(IsaDma *obj);
void (*register_channel)(IsaDma *obj, int nchan,
- DMA_transfer_handler transfer_handler,
+ IsaDmaTransferHandler transfer_handler,
void *opaque);
} IsaDmaClass;
diff --git a/include/qemu-common.h b/include/qemu-common.h
index e7bd1f8..bbb45b2 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -294,8 +294,6 @@ int qemu_openpty_raw(int *aslave, char *pty_name);
sendto(sockfd, buf, len, flags, destaddr, addrlen)
#endif
-typedef int (*DMA_transfer_handler) (void *opaque, int nchan, int pos, int
size);
-
void tcg_exec_init(unsigned long tb_size);
bool tcg_enabled(void);
--
2.4.3
- [Qemu-devel] [PATCH 04/15] Clean up includes some more, (continued)
- [Qemu-devel] [PATCH 04/15] Clean up includes some more, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 02/15] Use scripts/clean-includes to drop redundant qemu/typedefs.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 10/15] Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 09/15] Move HOST_LONG_BITS from qemu-common.h to qemu/osdep.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 05/15] fw_cfg: Split fw_cfg_keys.h off fw_cfg.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 13/15] include/crypto: Include qapi-types.h instead of qemu-common.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 11/15] Move ParallelIOArg from qemu-common.h to sysemu/char.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 07/15] include/hw/hw.h: Don't include qemu-common.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 12/15] isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h,
Markus Armbruster <=
- [Qemu-devel] [PATCH 08/15] hw/pci/pci.h: Don't include qemu-common.h, Markus Armbruster, 2016/03/15
- [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Markus Armbruster, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Daniel P. Berrange, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Paolo Bonzini, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Markus Armbruster, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Paolo Bonzini, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Peter Maydell, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Paolo Bonzini, 2016/03/15
- Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers, Peter Maydell, 2016/03/15