[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/11] alpha: give ISA bus to ISA methods
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 05/11] alpha: give ISA bus to ISA methods |
Date: |
Mon, 24 Oct 2011 22:18:19 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
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 = smp_cpus;
/* Init the chipset. */
- pci_bus = typhoon_init(ram_size, &rtc_irq, cpus, clipper_pci_map_irq);
- isa_bus = NULL;
+ pci_bus = typhoon_init(ram_size, &isa_bus, &rtc_irq, cpus,
+ clipper_pci_map_irq);
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"
-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);
/* 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);
}
-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 = 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;
- isa_bus = isa_bus_new(NULL, addr_space_io);
+ *isa_bus = isa_bus_new(NULL, addr_space_io);
isa_pci_irq = *qemu_allocate_irqs(typhoon_set_isa_irq, s, 1);
- isa_irqs = i8259_init(isa_bus, isa_pci_irq);
- isa_bus_irqs(isa_bus, isa_irqs);
+ isa_irqs = i8259_init(*isa_bus, isa_pci_irq);
+ isa_bus_irqs(*isa_bus, isa_irqs);
}
return b;
--
1.7.6.3
- [Qemu-devel] [PATCH 00/11] isa: preliminary work for multiple buses, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 02/11] isa: move ISABus structure definition to header file, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 04/11] pc: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 08/11] malta: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 07/11] fulong2e: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 06/11] sun4u: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 05/11] alpha: give ISA bus to ISA methods,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 03/11] i8259: give ISA device to isa_register_ioport(), Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 09/11] isa: always use provided ISA bus when creating an isa device, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 01/11] isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 11/11] audio: remove unused parameter isa_pic, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 10/11] isa: always use provided ISA bus in isa_bus_irqs(), Hervé Poussineau, 2011/10/24
- Re: [Qemu-devel] [PATCH 00/11] isa: preliminary work for multiple buses, Hervé Poussineau, 2011/10/28