From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHn-0003B2-L5 for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDpHj-0001bF-Ij for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:39 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:17784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHj-0001at-Cs for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:35 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 29 Dec 2015 09:04:39 +0100 Message-Id: <1451376295-28834-3-git-send-email-hpoussin@reactos.org> In-Reply-To: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> References: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , Mark Cave-Ayland , Blue Swirl , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Leon Alrae , Aurelien Jarno , Richard Henderson i8257 DMA controller exists on one ISA bus, so let's specify it at initia= lization. Signed-off-by: Herv=C3=A9 Poussineau --- 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); =20 - DMA_init(1); + DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); memset(s->commands, 0, sizeof(s->commands)); } =20 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 =3D { } }; =20 -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 ? 0x4= 80 : -1); dma_init2(&dma_controllers[1], 0xc0, 1, 0x88, high_page_enable ? 0x4= 88 : -1); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 459260b..130d0c5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1543,7 +1543,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq= *gsi, port92 =3D isa_create_simple(isa_bus, "port92"); port92_init(port92, &a20_line[1]); =20 - DMA_init(0); + DMA_init(isa_bus, 0); =20 for(i =3D 0; i < MAX_FD; i++) { fd[i] =3D drive_get(IF_FLOPPY, 0, i); diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 5988a88..ea59a61 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -365,7 +365,7 @@ static void mips_fulong2e_init(MachineState *machine) =20 /* init other devices */ pit =3D pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(0); + DMA_init(isa_bus, 0); =20 /* Super I/O */ isa_create_simple(isa_bus, "i8042"); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1ab885b..64a0de2 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -224,7 +224,7 @@ static void mips_jazz_init(MachineState *machine, /* ISA devices */ i8259 =3D i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); - DMA_init(0); + DMA_init(isa_bus, 0); pit =3D pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(isa_bus, pit); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 91c36ba..2acca4d 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1165,7 +1165,7 @@ void mips_malta_init(MachineState *machine) smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); pit =3D pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(0); + DMA_init(isa_bus, 0); =20 /* 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) {} =20 -void DMA_init(int high_page_enable) +void DMA_init(ISABus *bus, int high_page_enable) { } =20 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index d6b929c..df98b3b 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) {} =20 -void DMA_init(int high_page_enable) +void DMA_init(ISABus *bus, int high_page_enable) { } =20 diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index d758b39..d84852b 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); --=20 2.1.4