[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/32] qdev/prop: convert slavio_timer.c to helper m
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 16/32] qdev/prop: convert slavio_timer.c to helper macros. |
Date: |
Mon, 3 Aug 2009 17:35:32 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/slavio_timer.c | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index 69c9f3b..131e903 100644
--- a/hw/slavio_timer.c
+++ b/hw/slavio_timer.c
@@ -61,6 +61,7 @@ typedef struct SLAVIO_TIMERState {
// processor only
uint32_t running;
struct SLAVIO_TIMERState *master;
+ void *m;
uint32_t slave_index;
// system only
uint32_t num_slaves;
@@ -395,6 +396,7 @@ static void slavio_timer_init1(SysBusDevice *dev)
sysbus_init_irq(dev, &s->irq);
+ s->master = s->m; /* hack alert: ptr property */
if (!s->master || s->slave_index < s->master->num_slaves) {
bh = qemu_bh_new(slavio_timer_irq, s);
s->timer = ptimer_init(bh);
@@ -436,22 +438,10 @@ static SysBusDeviceInfo slavio_timer_info = {
.qdev.name = "slavio_timer",
.qdev.size = sizeof(SLAVIO_TIMERState),
.qdev.props = (Property[]) {
- {
- .name = "num_slaves",
- .info = &qdev_prop_uint32,
- .offset = offsetof(SLAVIO_TIMERState, num_slaves),
- },
- {
- .name = "slave_index",
- .info = &qdev_prop_uint32,
- .offset = offsetof(SLAVIO_TIMERState, slave_index),
- },
- {
- .name = "master",
- .info = &qdev_prop_ptr,
- .offset = offsetof(SLAVIO_TIMERState, master),
- },
- {/* end of property list */}
+ DEFINE_PROP_UINT32("num_slaves", SLAVIO_TIMERState, num_slaves, 0),
+ DEFINE_PROP_UINT32("slave_index", SLAVIO_TIMERState, slave_index, 0),
+ DEFINE_PROP_PTR("master", SLAVIO_TIMERState, m),
+ DEFINE_PROP_END_OF_LIST(),
}
};
--
1.6.2.5
- [Qemu-devel] [PATCH 01/32] qdev/prop: macros for creating typechecked properties., (continued)
- [Qemu-devel] [PATCH 01/32] qdev/prop: macros for creating typechecked properties., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 06/32] qdev/prop: convert eccmemctl.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 10/32] qdev/prop: convert integratorcp.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 24/32] qdev/prop: convert syborg_pointer.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 08/32] qdev/prop: convert etraxfs_pic.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 11/32] qdev/prop: convert iommu.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 09/32] qdev/prop: convert i2c.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 04/32] qdev/prop: convert arm_sysctl.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 22/32] qdev/prop: convert syborg_interrupt.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 18/32] qdev/prop: convert sparc32_dma.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 16/32] qdev/prop: convert slavio_timer.c to helper macros.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 19/32] qdev/prop: convert sun4m.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 28/32] qdev/prop: convert vga.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 15/32] qdev/prop: convert slavio_intctl.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 12/32] qdev/prop: convert m48t59.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 07/32] qdev/prop: convert escc.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 23/32] qdev/prop: convert syborg_keyboard.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 31/32] qdev/prop: convert xilinx_intc.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 21/32] qdev/prop: convert syborg_fb.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 20/32] qdev/prop: convert sun4u.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 29/32] qdev/prop: convert virtio-pci.c to helper macros., Gerd Hoffmann, 2009/08/03