proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-14 15:36:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xilinx_axidma: converted init->realize

Browse Source 
The prescribed transition from SysBusDevice::init to Device::realize. I'm going
with Andreas suggestion to move the sysbus foo to Object::init for early IRQ
visibility.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Peter Crosthwaite 2013-04-16 10:23:20 +10:00 committed by Edgar E. Iglesias
parent 897374db7d
commit e65436634d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/dma/xilinx_axidma.c
View File

@ -27,6 +27,7 @@
#include "hw/ptimer.h" #include "hw/ptimer.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/qdev-addr.h" #include "hw/qdev-addr.h"
#include "qapi/qmp/qerror.h"
#include "hw/stream.h" #include "hw/stream.h"
@ -474,33 +475,33 @@ static const MemoryRegionOps axidma_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static int xilinx_axidma_init(SysBusDevice *dev) static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
{ {
XilinxAXIDMA *s = XILINX_AXI_DMA(dev); XilinxAXIDMA *s = XILINX_AXI_DMA(dev);
int i; int i;
sysbus_init_irq(dev, &s->streams[0].irq);
sysbus_init_irq(dev, &s->streams[1].irq);
memory_region_init_io(&s->iomem, &axidma_ops, s,
"xlnx.axi-dma", R_MAX * 4 * 2);
sysbus_init_mmio(dev, &s->iomem);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
s->streams[i].nr = i; s->streams[i].nr = i;
s->streams[i].bh = qemu_bh_new(timer_hit, &s->streams[i]); s->streams[i].bh = qemu_bh_new(timer_hit, &s->streams[i]);
s->streams[i].ptimer = ptimer_init(s->streams[i].bh); s->streams[i].ptimer = ptimer_init(s->streams[i].bh);
ptimer_set_freq(s->streams[i].ptimer, s->freqhz); ptimer_set_freq(s->streams[i].ptimer, s->freqhz);
} }
return 0;
} }
static void xilinx_axidma_initfn(Object *obj) static void xilinx_axidma_init(Object *obj)
{ {
XilinxAXIDMA *s = XILINX_AXI_DMA(obj); XilinxAXIDMA *s = XILINX_AXI_DMA(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,
(Object **) &s->tx_dev, NULL); (Object **) &s->tx_dev, NULL);
sysbus_init_irq(sbd, &s->streams[0].irq);
sysbus_init_irq(sbd, &s->streams[1].irq);
memory_region_init_io(&s->iomem, &axidma_ops, s,
"xlnx.axi-dma", R_MAX * 4 * 2);
sysbus_init_mmio(sbd, &s->iomem);
} }
static Property axidma_properties[] = { static Property axidma_properties[] = {
@ -511,10 +512,9 @@ static Property axidma_properties[] = {
static void axidma_class_init(ObjectClass *klass, void *data) static void axidma_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
StreamSlaveClass *ssc = STREAM_SLAVE_CLASS(klass); StreamSlaveClass *ssc = STREAM_SLAVE_CLASS(klass);
k->init = xilinx_axidma_init; dc->realize = xilinx_axidma_realize,
dc->reset = xilinx_axidma_reset; dc->reset = xilinx_axidma_reset;
dc->props = axidma_properties; dc->props = axidma_properties;
ssc->push = axidma_push; ssc->push = axidma_push;
@ -525,7 +525,7 @@ static const TypeInfo axidma_info = {
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(XilinxAXIDMA), .instance_size = sizeof(XilinxAXIDMA),
.class_init = axidma_class_init, .class_init = axidma_class_init,
.instance_init = xilinx_axidma_initfn, .instance_init = xilinx_axidma_init,
.interfaces = (InterfaceInfo[]) { .interfaces = (InterfaceInfo[]) {
{ TYPE_STREAM_SLAVE }, { TYPE_STREAM_SLAVE },
{ } { }