diff options
author | Markus Armbruster <armbru@redhat.com> | 2016-03-09 12:55:26 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-22 22:20:16 +0100 |
commit | bd36a618ccb61ea0fddb92e75f3754c4e1a7fbfe (patch) | |
tree | 1fa1a7045852e753c7f92ff0ea35ea4505ad08b6 /include | |
parent | 8a98ecada310b14b4a2c133822674e070a7ba350 (diff) |
isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h
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 <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/hw/isa/i8257.h | 2 | ||||
-rw-r--r-- | include/hw/isa/isa.h | 5 | ||||
-rw-r--r-- | include/qemu-common.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/hw/isa/i8257.h b/include/hw/isa/i8257.h index 8d34ed17b7..8c44d36282 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 0bbe21cd48..ffb2ea7cdf 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 e7bd1f852f..bbb45b2e64 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); |