From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyQ-0002Co-Tk for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIQyI-0001YO-DX for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:15 -0400 Received: from smtp23.services.sfr.fr ([93.17.128.19]:57973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyH-0001Y3-Ux for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:10 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 24 Oct 2011 22:18:19 +0200 Message-Id: <1319487505-5915-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> References: <1319487505-5915-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 05/11] alpha: give ISA bus to ISA methods List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/alpha_dp264.c | 4 ++-- hw/alpha_sys.h | 3 ++- hw/alpha_typhoon.c | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index a87d6ef..455f380 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -68,8 +68,8 @@ static void clipper_init(ram_addr_t ram_size, cpus[0]->trap_arg2 =3D smp_cpus; =20 /* Init the chipset. */ - pci_bus =3D typhoon_init(ram_size, &rtc_irq, cpus, clipper_pci_map_i= rq); - isa_bus =3D NULL; + pci_bus =3D typhoon_init(ram_size, &isa_bus, &rtc_irq, cpus, + clipper_pci_map_irq); =20 rtc_init(isa_bus, 1980, rtc_irq); pit_init(isa_bus, 0x40, 0); diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h index 13f0177..d54b18f 100644 --- a/hw/alpha_sys.h +++ b/hw/alpha_sys.h @@ -12,7 +12,8 @@ #include "irq.h" =20 =20 -PCIBus *typhoon_init(ram_addr_t, qemu_irq *, CPUState *[4], pci_map_irq_= fn); +PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, CPUState *[4], + pci_map_irq_fn); =20 /* alpha_pci.c. */ extern const MemoryRegionOps alpha_pci_bw_io_ops; diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index 113837d..adf7382 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -691,7 +691,8 @@ static void typhoon_alarm_timer(void *opaque) cpu_interrupt(s->cchip.cpu[cpu], CPU_INTERRUPT_TIMER); } =20 -PCIBus *typhoon_init(ram_addr_t ram_size, qemu_irq *p_rtc_irq, +PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, + qemu_irq *p_rtc_irq, CPUState *cpus[4], pci_map_irq_fn sys_map_irq) { const uint64_t MB =3D 1024 * 1024; @@ -791,12 +792,11 @@ PCIBus *typhoon_init(ram_addr_t ram_size, qemu_irq = *p_rtc_irq, /* ??? Technically there should be a cy82c693ub pci-isa bridge. */ { qemu_irq isa_pci_irq, *isa_irqs; - ISABus *isa_bus; =20 - isa_bus =3D isa_bus_new(NULL, addr_space_io); + *isa_bus =3D isa_bus_new(NULL, addr_space_io); isa_pci_irq =3D *qemu_allocate_irqs(typhoon_set_isa_irq, s, 1); - isa_irqs =3D i8259_init(isa_bus, isa_pci_irq); - isa_bus_irqs(isa_bus, isa_irqs); + isa_irqs =3D i8259_init(*isa_bus, isa_pci_irq); + isa_bus_irqs(*isa_bus, isa_irqs); } =20 return b; --=20 1.7.6.3