[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 02/15] etraxfs_pic: QOM cast cleanu
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 02/15] etraxfs_pic: QOM cast cleanup |
Date: |
Fri, 26 Jul 2013 20:54:01 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/intc/etraxfs_pic.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
index ce3a3f6..e02da53 100644
--- a/hw/intc/etraxfs_pic.c
+++ b/hw/intc/etraxfs_pic.c
@@ -36,9 +36,14 @@
#define R_R_GURU 4
#define R_MAX 5
+#define TYPE_ETRAX_FS_PIC "etraxfs,pic"
+#define ETRAX_FS_PIC(obj) \
+ OBJECT_CHECK(struct etrax_pic, (obj), TYPE_ETRAX_FS_PIC)
+
struct etrax_pic
{
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion mmio;
void *interrupt_vector;
qemu_irq parent_irq;
@@ -138,17 +143,18 @@ static void irq_handler(void *opaque, int irq, int level)
pic_update(fs);
}
-static int etraxfs_pic_init(SysBusDevice *dev)
+static int etraxfs_pic_init(SysBusDevice *sbd)
{
- struct etrax_pic *s = FROM_SYSBUS(typeof (*s), dev);
+ DeviceState *dev = DEVICE(sbd);
+ struct etrax_pic *s = ETRAX_FS_PIC(dev);
- qdev_init_gpio_in(&dev->qdev, irq_handler, 32);
- sysbus_init_irq(dev, &s->parent_irq);
- sysbus_init_irq(dev, &s->parent_nmi);
+ qdev_init_gpio_in(dev, irq_handler, 32);
+ sysbus_init_irq(sbd, &s->parent_irq);
+ sysbus_init_irq(sbd, &s->parent_nmi);
memory_region_init_io(&s->mmio, OBJECT(s), &pic_ops, s,
"etraxfs-pic", R_MAX * 4);
- sysbus_init_mmio(dev, &s->mmio);
+ sysbus_init_mmio(sbd, &s->mmio);
return 0;
}
@@ -167,7 +173,7 @@ static void etraxfs_pic_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo etraxfs_pic_info = {
- .name = "etraxfs,pic",
+ .name = TYPE_ETRAX_FS_PIC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct etrax_pic),
.class_init = etraxfs_pic_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 00/15] intc: QOM cast cleanups, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 01/15] arm_gic: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 02/15] etraxfs_pic: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next for-1.6 03/15] exynos4210_combiner: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 04/15] exynos4210_gic: QOM cast cleanup for exynos4210.gic, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 05/15] exynos4210_gic: QOM cast cleanup for exynos4210.irq_gate, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 06/15] grlib_irqmp: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 07/15] imx_avic: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 08/15] lm32_pic: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 11/15] pl190: QOM cast cleanup, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 10/15] pl190: Rename pl190_state to PL190State, Andreas Färber, 2013/07/26
- [Qemu-devel] [PATCH qom-next for-1.6 12/15] puv3_intc: QOM cast cleanup, Andreas Färber, 2013/07/26