From patchwork Tue Dec 29 08:04:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 561491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E6299140BF4 for ; Tue, 29 Dec 2015 19:12:52 +1100 (AEDT) Received: from localhost ([::1]:47677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpOk-0000pA-T4 for incoming@patchwork.ozlabs.org; Tue, 29 Dec 2015 03:12:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHr-0003Bq-BN for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDpHo-0001ea-1G for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:43 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:18175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHn-0001du-Nw for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:39 -0500 Received: from localhost.localdomain (unknown [78.230.185.200]) by smtp5-g21.free.fr (Postfix) with ESMTP id 7AAA3D48147; Tue, 29 Dec 2015 09:05:04 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Tue, 29 Dec 2015 09:04:55 +0100 Message-Id: <1451376295-28834-19-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> References: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.5 Cc: Blue Swirl , Paolo Bonzini , Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 17/17] dma: remove now useless DMA_* functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Keep only DMA_init function as a wrapper around DMA controllers creation. Signed-off-by: Hervé Poussineau --- hw/dma/i8257.c | 65 ---------------------------------------------------- hw/sparc/sun4m.c | 22 ------------------ hw/sparc64/sun4u.c | 22 ------------------ include/hw/isa/isa.h | 11 +-------- 4 files changed, 1 insertion(+), 119 deletions(-) diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index cf4b0a7..fc8aeb1 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -628,70 +628,6 @@ static void i8257_class_init(ObjectClass *klass, void *data) idc->register_channel = i8257_dma_register_channel; } -static ISABus *i8257_bus; - -int DMA_get_channel_mode(int nchan) -{ - IsaDma *dma = isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k = ISADMA_GET_CLASS(dma); - uint8_t res = 0; - - res |= k->has_autoinitialization(dma, nchan) ? 0 : 0x10; - res |= k->get_transfer_mode(dma, nchan) << 2; - - return res; -} - -int DMA_read_memory(int nchan, void *buf, int pos, int size) -{ - IsaDma *dma = isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k = ISADMA_GET_CLASS(dma); - return k->read_memory(dma, nchan, buf, pos, size); -} - -int DMA_write_memory(int nchan, void *buf, int pos, int size) -{ - IsaDma *dma = isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k = ISADMA_GET_CLASS(dma); - return k->write_memory(dma, nchan, buf, pos, size); -} - -void DMA_hold_DREQ(int nchan) -{ - IsaDma *dma = isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k = ISADMA_GET_CLASS(dma); - k->hold_DREQ(dma, nchan); -} - -void DMA_release_DREQ(int nchan) -{ - IsaDma *dma = isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k = ISADMA_GET_CLASS(dma); - k->release_DREQ(dma, nchan); -} - -void DMA_schedule(void) -{ - IsaDma *dma; - IsaDmaClass *k; - int i; - - for (i = 0; i < 2; i++) { - dma = isa_get_dma(i8257_bus, i << 2); - k = ISADMA_GET_CLASS(dma); - k->schedule(dma); - } -} - -void DMA_register_channel(int nchan, - DMA_transfer_handler transfer_handler, - void *opaque) -{ - IsaDma *dma = isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k = ISADMA_GET_CLASS(dma); - k->register_channel(dma, nchan, transfer_handler, opaque); -} - static const TypeInfo i8257_info = { .name = TYPE_I8257, .parent = TYPE_ISA_DEVICE, @@ -732,5 +668,4 @@ void DMA_init(ISABus *bus, int high_page_enable) qdev_init_nofail(d); isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2)); - i8257_bus = bus; } diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index bf6a7da..420d26b 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -95,32 +95,10 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; -int DMA_get_channel_mode (int nchan) -{ - return 0; -} -int DMA_read_memory (int nchan, void *buf, int pos, int size) -{ - return 0; -} -int DMA_write_memory (int nchan, void *buf, int pos, int size) -{ - return 0; -} -void DMA_hold_DREQ (int nchan) {} -void DMA_release_DREQ (int nchan) {} -void DMA_schedule(void) {} - void DMA_init(ISABus *bus, int high_page_enable) { } -void DMA_register_channel (int nchan, - DMA_transfer_handler transfer_handler, - void *opaque) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 6fc3104..e5b51a2 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -98,32 +98,10 @@ typedef struct EbusState { MemoryRegion bar1; } EbusState; -int DMA_get_channel_mode (int nchan) -{ - return 0; -} -int DMA_read_memory (int nchan, void *buf, int pos, int size) -{ - return 0; -} -int DMA_write_memory (int nchan, void *buf, int pos, int size) -{ - return 0; -} -void DMA_hold_DREQ (int nchan) {} -void DMA_release_DREQ (int nchan) {} -void DMA_schedule(void) {} - void DMA_init(ISABus *bus, int high_page_enable) { } -void DMA_register_channel (int nchan, - DMA_transfer_handler transfer_handler, - void *opaque) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 193ceb2..dd224df 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -144,15 +144,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *d) return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); } -/* dma.c */ -int DMA_get_channel_mode (int nchan); -int DMA_read_memory (int nchan, void *buf, int pos, int size); -int DMA_write_memory (int nchan, void *buf, int pos, int size); -void DMA_hold_DREQ (int nchan); -void DMA_release_DREQ (int nchan); -void DMA_schedule(void); +/* i8257.c */ void DMA_init(ISABus *bus, int high_page_enable); -void DMA_register_channel (int nchan, - DMA_transfer_handler transfer_handler, - void *opaque); #endif