haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h

Browse source 
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>
This commit is contained in:
Markus Armbruster 2016-03-09 12:55:26 +01:00 committed by Paolo Bonzini
parent 8a98ecada3
commit bd36a618cc
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/dma/i8257.c
View file

@ -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);

2
include/hw/isa/i8257.h
View file

@ -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;

5
include/hw/isa/isa.h
View file

@ -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;

2
include/qemu-common.h
View file

@ -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);