From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46c-0006uM-Fy for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aR46a-0005hp-AU for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46a-0005he-3X for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:48 -0500 From: John Snow Date: Wed, 3 Feb 2016 15:32:35 -0500 Message-Id: <1454531555-32022-21-git-send-email-jsnow@redhat.com> In-Reply-To: <1454531555-32022-1-git-send-email-jsnow@redhat.com> References: <1454531555-32022-1-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 20/20] dma: remove now useless DMA_* functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= From: Herv=C3=A9 Poussineau Keep only DMA_init function as a wrapper around DMA controllers creation. Signed-off-by: Herv=C3=A9 Poussineau Message-id: 1453843944-26833-20-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- 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 c413c9a..5a52707 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -596,70 +596,6 @@ static void i8257_class_init(ObjectClass *klass, voi= d *data) idc->register_channel =3D i8257_dma_register_channel; } =20 -static ISABus *i8257_bus; - -int DMA_get_channel_mode(int nchan) -{ - IsaDma *dma =3D isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k =3D ISADMA_GET_CLASS(dma); - uint8_t res =3D 0; - - res |=3D k->has_autoinitialization(dma, nchan) ? 0 : 0x10; - res |=3D k->get_transfer_mode(dma, nchan) << 2; - - return res; -} - -int DMA_read_memory(int nchan, void *buf, int pos, int size) -{ - IsaDma *dma =3D isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k =3D 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 =3D isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k =3D ISADMA_GET_CLASS(dma); - return k->write_memory(dma, nchan, buf, pos, size); -} - -void DMA_hold_DREQ(int nchan) -{ - IsaDma *dma =3D isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k =3D ISADMA_GET_CLASS(dma); - k->hold_DREQ(dma, nchan); -} - -void DMA_release_DREQ(int nchan) -{ - IsaDma *dma =3D isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k =3D ISADMA_GET_CLASS(dma); - k->release_DREQ(dma, nchan); -} - -void DMA_schedule(void) -{ - IsaDma *dma; - IsaDmaClass *k; - int i; - - for (i =3D 0; i < 2; i++) { - dma =3D isa_get_dma(i8257_bus, i << 2); - k =3D ISADMA_GET_CLASS(dma); - k->schedule(dma); - } -} - -void DMA_register_channel(int nchan, - DMA_transfer_handler transfer_handler, - void *opaque) -{ - IsaDma *dma =3D isa_get_dma(i8257_bus, nchan); - IsaDmaClass *k =3D ISADMA_GET_CLASS(dma); - k->register_channel(dma, nchan, transfer_handler, opaque); -} - static const TypeInfo i8257_info =3D { .name =3D TYPE_I8257, .parent =3D TYPE_ISA_DEVICE, @@ -700,5 +636,4 @@ void DMA_init(ISABus *bus, int high_page_enable) qdev_init_nofail(d); =20 isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2)); - i8257_bus =3D bus; } diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 9c078d5..20dc341 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -96,32 +96,10 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; =20 -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) { } =20 -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 371f5bc..add1e75 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -99,32 +99,10 @@ typedef struct EbusState { MemoryRegion bar1; } EbusState; =20 -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) { } =20 -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 8de439c..0bbe21c 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))); } =20 -/* 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 --=20 2.4.3