[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/20] dma: remove now useless DMA_* functions
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 20/20] dma: remove now useless DMA_* functions |
Date: |
Wed, 3 Feb 2016 15:32:35 -0500 |
From: Hervé Poussineau <address@hidden>
Keep only DMA_init function as a wrapper around DMA controllers creation.
Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
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, 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,
@@ -700,5 +636,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 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;
};
-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 371f5bc..add1e75 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -99,32 +99,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 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)));
}
-/* 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
--
2.4.3
- [Qemu-devel] [PULL 02/20] i82374: device only existed as ISA device, so simplify device, (continued)
- [Qemu-devel] [PULL 02/20] i82374: device only existed as ISA device, so simplify device, John Snow, 2016/02/03
- [Qemu-devel] [PULL 04/20] i8257: rename struct dma_cont to I8257State, John Snow, 2016/02/03
- [Qemu-devel] [PULL 07/20] i8257: make the DMA running method per controller, John Snow, 2016/02/03
- [Qemu-devel] [PULL 11/20] isa: add an ISA DMA interface, and store it within the ISA bus, John Snow, 2016/02/03
- [Qemu-devel] [PULL 14/20] sparc: disable floppy DMA, John Snow, 2016/02/03
- [Qemu-devel] [PULL 15/20] sparc64: disable floppy DMA, John Snow, 2016/02/03
- [Qemu-devel] [PULL 16/20] fdc: use IsaDma interface instead of global DMA_* functions, John Snow, 2016/02/03
- [Qemu-devel] [PULL 17/20] cs4231a: use IsaDma interface instead of global DMA_* functions, John Snow, 2016/02/03
- [Qemu-devel] [PULL 18/20] gus: use IsaDma interface instead of global DMA_* functions, John Snow, 2016/02/03
- [Qemu-devel] [PULL 19/20] sb16: use IsaDma interface instead of global DMA_* functions, John Snow, 2016/02/03
- [Qemu-devel] [PULL 20/20] dma: remove now useless DMA_* functions,
John Snow <=
- Re: [Qemu-devel] [PULL 00/20] FDC patches, Peter Maydell, 2016/02/04