[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/32] qdev/prop: convert slavio_intctl.c to helper
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 15/32] qdev/prop: convert slavio_intctl.c to helper macros. |
Date: |
Mon, 3 Aug 2009 17:35:31 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/slavio_intctl.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 188511e..01a7624 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -68,6 +68,7 @@ typedef struct SLAVIO_INTCTLState {
#endif
qemu_irq cpu_irqs[MAX_CPUS][MAX_PILS];
const uint32_t *intbit_to_level;
+ void *i_to_l;
uint32_t cputimer_lbit, cputimer_mbit;
uint32_t cputimer_bit;
uint32_t pil_out[MAX_CPUS];
@@ -392,6 +393,7 @@ static void slavio_intctl_init1(SysBusDevice *dev)
int io_memory;
unsigned int i, j;
+ s->intbit_to_level = s->i_to_l; /* hack alert: ptr property */
qdev_init_gpio_in(&dev->qdev, slavio_set_irq_all, 32 + MAX_CPUS);
io_memory = cpu_register_io_memory(slavio_intctlm_mem_read,
slavio_intctlm_mem_write, s);
@@ -450,17 +452,9 @@ static SysBusDeviceInfo slavio_intctl_info = {
.qdev.name = "slavio_intctl",
.qdev.size = sizeof(SLAVIO_INTCTLState),
.qdev.props = (Property[]) {
- {
- .name = "intbit_to_level",
- .info = &qdev_prop_ptr,
- .offset = offsetof(SLAVIO_INTCTLState, intbit_to_level),
- },
- {
- .name = "cputimer_bit",
- .info = &qdev_prop_uint32,
- .offset = offsetof(SLAVIO_INTCTLState, cputimer_bit),
- },
- {/* end of property list */}
+ DEFINE_PROP_PTR("intbit_to_level", SLAVIO_INTCTLState, i_to_l),
+ DEFINE_PROP_UINT32("cputimer_bit", SLAVIO_INTCTLState, cputimer_bit,
0),
+ DEFINE_PROP_END_OF_LIST(),
}
};
--
1.6.2.5
- [Qemu-devel] [PATCH 24/32] qdev/prop: convert syborg_pointer.c to helper macros., (continued)
- [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, 2009/08/03
- [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 <=
- [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
- [Qemu-devel] [PATCH 25/32] qdev/prop: convert syborg_serial.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 17/32] qdev/prop: convert smbus_eeprom.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 26/32] qdev/prop: convert syborg_timer.c to helper macros., Gerd Hoffmann, 2009/08/03