Commit bd36a618 authored by Markus Armbruster's avatar Markus Armbruster Committed by Paolo Bonzini
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8a98ecad

hw/dma/i8257.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/hw/isa/i8257.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/hw/isa/isa.h

+4 −1
Original line number Diff line number Diff line
@@ -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;

include/qemu-common.h

+0 −2
Original line number Diff line number Diff line
@@ -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);