diff options
| author | Hervé Poussineau <hpoussin@reactos.org> | 2016-02-03 11:28:55 -0500 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2016-02-03 11:28:55 -0500 |
| commit | 57146941924a4189b14cbc1c87478b2ffef31943 (patch) | |
| tree | 24f08fc2c3b5b3a9a45caa4214c8984c6c9266ca /hw/dma | |
| parent | 449ae7eca922c7bb65730cab60f6c8a23cc47cef (diff) | |
| download | qemu-57146941924a4189b14cbc1c87478b2ffef31943.tar.gz qemu-57146941924a4189b14cbc1c87478b2ffef31943.tar.bz2 qemu-57146941924a4189b14cbc1c87478b2ffef31943.zip | |
i8257: pass ISA bus to DMA_init() function
i8257 DMA controller exists on one ISA bus, so let's specify it at initialization.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Message-id: 1453843944-26833-3-git-send-email-hpoussin@reactos.org
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw/dma')
| -rw-r--r-- | hw/dma/i82374.c | 2 | ||||
| -rw-r--r-- | hw/dma/i8257.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 031a3f566d..6c0f975df0 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -123,7 +123,7 @@ static void i82374_realize(DeviceState *dev, Error **errp) portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), s->iobase); - DMA_init(1); + DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); memset(s->commands, 0, sizeof(s->commands)); } diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 1ff6c4da71..bb6945a2c5 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -589,7 +589,7 @@ static const VMStateDescription vmstate_dma = { } }; -void DMA_init(int high_page_enable) +void DMA_init(ISABus *bus, int high_page_enable) { dma_init2(&dma_controllers[0], 0x00, 0, 0x80, high_page_enable ? 0x480 : -1); dma_init2(&dma_controllers[1], 0xc0, 1, 0x88, high_page_enable ? 0x488 : -1); |