OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

dma: remove now useless DMA_* functions 

Keep only DMA_init function as a wrapper around DMA controllers creation.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Message-id: 1453843944-26833-20-git-send-email-hpoussin@reactos.org
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Hervé Poussineau 2016-02-03 11:28:58 -05:00 committed by John Snow
parent f203c16ea2
commit ba0a71022c
4 changed files with 1 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
hw/dma/i8257.c
View File

@ -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;
}

22
hw/sparc/sun4m.c
View File

@ -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)
{

22
hw/sparc64/sun4u.c
View File

@ -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)
{

11
include/hw/isa/isa.h
View File

@ -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