[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/19] i8257: pass ISA bus to DMA_init() function
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 02/19] i8257: pass ISA bus to DMA_init() function |
Date: |
Tue, 26 Jan 2016 22:32:07 +0100 |
i8257 DMA controller exists on one ISA bus, so let's specify it at
initialization.
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/dma/i82374.c | 2 +-
hw/dma/i8257.c | 2 +-
hw/i386/pc.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
include/hw/isa/isa.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index daa8042..96a7a48 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -122,7 +122,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 1398424..4d0b49d 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -588,7 +588,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);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 78cf8fa..5975b70 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1541,7 +1541,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
port92 = isa_create_simple(isa_bus, "port92");
port92_init(port92, &a20_line[1]);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
for(i = 0; i < MAX_FD; i++) {
fd[i] = drive_get(IF_FLOPPY, 0, i);
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 6748d89..184c404 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -366,7 +366,7 @@ static void mips_fulong2e_init(MachineState *machine)
/* init other devices */
pit = pit_init(isa_bus, 0x40, 0, NULL);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 62527fd..a199b9d 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -225,7 +225,7 @@ static void mips_jazz_init(MachineState *machine,
/* ISA devices */
i8259 = i8259_init(isa_bus, env->irq[4]);
isa_bus_irqs(isa_bus, i8259);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
pit = pit_init(isa_bus, 0x40, 0, NULL);
pcspk_init(isa_bus, pit);
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index c5da83f..c04aa2b 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1166,7 +1166,7 @@ void mips_malta_init(MachineState *machine)
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf);
pit = pit_init(isa_bus, 0x40, 0, NULL);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 230dac9..bf6a7da 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -111,7 +111,7 @@ void DMA_hold_DREQ (int nchan) {}
void DMA_release_DREQ (int nchan) {}
void DMA_schedule(void) {}
-void DMA_init(int high_page_enable)
+void DMA_init(ISABus *bus, int high_page_enable)
{
}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 861727f..77812c8 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -114,7 +114,7 @@ void DMA_hold_DREQ (int nchan) {}
void DMA_release_DREQ (int nchan) {}
void DMA_schedule(void) {}
-void DMA_init(int high_page_enable)
+void DMA_init(ISABus *bus, int high_page_enable)
{
}
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index de3cd3d..4af8730 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -113,7 +113,7 @@ 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);
-void DMA_init(int high_page_enable);
+void DMA_init(ISABus *bus, int high_page_enable);
void DMA_register_channel (int nchan,
DMA_transfer_handler transfer_handler,
void *opaque);
--
2.1.4
- [Qemu-devel] [PATCH v3 00/19] ISA DMA controllers cleanup (i8257, i82374), Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 01/19] i82374: device only existed as ISA device, so simplify device, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 05/19] i8257: rename functions to start with i8257_ prefix, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 11/19] i8257: implement the IsaDma interface, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 16/19] cs4231a: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 12/19] magnum: disable floppy DMA for now, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 07/19] i8257: add missing const, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 04/19] i8257: rename struct dma_regs to I8257Regs, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 09/19] i8257: move state definition to new independent header, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 02/19] i8257: pass ISA bus to DMA_init() function,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 08/19] i8257: QOM'ify, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 19/19] dma: remove now useless DMA_* functions, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 15/19] fdc: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 10/19] isa: add an ISA DMA interface, and store it within the ISA bus, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 03/19] i8257: rename struct dma_cont to I8257State, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 14/19] sparc64: disable floppy DMA, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 06/19] i8257: make the DMA running method per controller, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 13/19] sparc: disable floppy DMA, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 18/19] sb16: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/26
- [Qemu-devel] [PATCH v3 17/19] gus: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/26