[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH microblaze/ppc v3 4/8] xilinx: Inline usages of xili
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH microblaze/ppc v3 4/8] xilinx: Inline usages of xilinx_intc_create() |
Date: |
Tue, 25 Feb 2014 16:40:04 -0800 |
Inline these usages. Converts these init to at least a semi-recent QOM
styling.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/microblaze/petalogix_ml605_mmu.c | 8 ++++++--
hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +++++++--
hw/ppc/virtex_ml507.c | 6 +++++-
include/hw/xilinx.h | 13 -------------
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c
b/hw/microblaze/petalogix_ml605_mmu.c
index 48a0a3e..0dee46c 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -119,8 +119,12 @@ petalogix_ml605_init(QEMUMachineInitArgs *args)
2, 0x89, 0x18, 0x0000, 0x0, 0);
- dev = xilinx_intc_create(INTC_BASEADDR, qdev_get_gpio_in(DEVICE(cpu),
- MB_CPU_IRQ), 4);
+ dev = qdev_create(NULL, "xlnx.xps-intc");
+ qdev_prop_set_uint32(dev, "kind-of-intr", 1 << TIMER_IRQ);
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+ qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ));
for (i = 0; i < 32; i++) {
irq[i] = qdev_get_gpio_in(dev, i);
}
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c
b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index a4877a6..cb8e334 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -97,8 +97,13 @@ petalogix_s3adsp1800_init(QEMUMachineInitArgs *args)
FLASH_SIZE >> 16,
1, 0x89, 0x18, 0x0000, 0x0, 1);
- dev = xilinx_intc_create(INTC_BASEADDR, qdev_get_gpio_in(DEVICE(cpu),
- MB_CPU_IRQ), 0xA);
+ dev = qdev_create(NULL, "xlnx.xps-intc");
+ qdev_prop_set_uint32(dev, "kind-of-intr",
+ 1 << ETHLITE_IRQ | 1 << UARTLITE_IRQ);
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+ qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ));
for (i = 0; i < 32; i++) {
irq[i] = qdev_get_gpio_in(dev, i);
}
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 88312f8..1e2f532 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -218,7 +218,11 @@ static void virtex_init(QEMUMachineInitArgs *args)
1, 0x89, 0x18, 0x0000, 0x0, 1);
cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];
- dev = xilinx_intc_create(0x81800000, cpu_irq[0], 0);
+ dev = qdev_create(NULL, "xlnx.xps-intc");
+ qdev_prop_set_uint32(dev, "kind-of-intr", 0);
+ qdev_init_nofail(dev);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]);
for (i = 0; i < 32; i++) {
irq[i] = qdev_get_gpio_in(dev, i);
}
diff --git a/include/hw/xilinx.h b/include/hw/xilinx.h
index 9d6debe..02400cd 100644
--- a/include/hw/xilinx.h
+++ b/include/hw/xilinx.h
@@ -7,19 +7,6 @@
#include "hw/stream.h"
#include "net/net.h"
-static inline DeviceState *
-xilinx_intc_create(hwaddr base, qemu_irq irq, int kind_of_intr)
-{
- DeviceState *dev;
-
- dev = qdev_create(NULL, "xlnx.xps-intc");
- qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr);
- qdev_init_nofail(dev);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
- return dev;
-}
-
/* OPB Timer/Counter. */
static inline DeviceState *
xilinx_timer_create(hwaddr base, qemu_irq irq, int oto, int freq)
--
1.9.0.1.g4196000
- [Qemu-devel] [PATCH microblaze/ppc v3 0/8] Remove include/hw/xilinx.h, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 1/8] microblaze/s3adsp_1800: Define macros for irq map, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 2/8] ppc/virtex_ml507: Define macros for irq/memory maps, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 3/8] microblaze/ml605: Define macros for irq/memory maps, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 4/8] xilinx: Inline usages of xilinx_intc_create(),
Peter Crosthwaite <=
- [Qemu-devel] [PATCH microblaze/ppc v3 5/8] xilinx: Inline usages of xilinx_timer_create(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 6/8] xilinx: Inline usage of xilinx_ethlite_create(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 7/8] xilinx: Inline usages of xilinx_axi*_init(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 8/8] xilinx: Delete hw/include/xilinx.h, Peter Crosthwaite, 2014/02/25
- Re: [Qemu-devel] [PATCH microblaze/ppc v3 0/8] Remove include/hw/xilinx.h, Edgar E. Iglesias, 2014/02/26