From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiN7l-0004V8-Eg for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiN7k-0006cy-Be for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiN7k-0006cq-6U for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:32 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E4C3246208 for ; Tue, 22 Mar 2016 14:17:31 +0000 (UTC) From: Paolo Bonzini Date: Tue, 22 Mar 2016 15:16:51 +0100 Message-Id: <1458656229-32043-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1458656229-32043-1-git-send-email-pbonzini@redhat.com> References: <1458656229-32043-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 11/29] isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster From: Markus Armbruster 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 Signed-off-by: Paolo Bonzini --- 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.5.0