Revision dada5c7e

b/hw/petalogix_ml605_mmu.c
129 129
    xilinx_timer_create(TIMER_BASEADDR, irq[2], 0, 100 * 1000000);
130 130

  
131 131
    /* axi ethernet and dma initialization. */
132
    qemu_check_nic_model(&nd_table[0], "xlnx.axi-ethernet");
133
    eth0 = qdev_create(NULL, "xlnx.axi-ethernet");
132 134
    dma = qdev_create(NULL, "xlnx.axi-dma");
133 135

  
134 136
    /* FIXME: attach to the sysbus instead */
135 137
    object_property_add_child(container_get(qdev_get_machine(), "/unattached"),
136 138
                                  "xilinx-dma", OBJECT(dma), NULL);
137 139

  
138
    eth0 = xilinx_axiethernet_create(&nd_table[0], STREAM_SLAVE(dma),
139
                                     0x82780000, irq[3], 0x1000, 0x1000);
140
    xilinx_axiethernet_init(eth0, &nd_table[0], STREAM_SLAVE(dma),
141
                                   0x82780000, irq[3], 0x1000, 0x1000);
140 142

  
141 143
    xilinx_axiethernetdma_init(dma, STREAM_SLAVE(eth0),
142 144
                               0x84600000, irq[1], irq[0], 100 * 1000000);
b/hw/xilinx.h
53 53
    return dev;
54 54
}
55 55

  
56
static inline DeviceState *
57
xilinx_axiethernet_create(NICInfo *nd, StreamSlave *peer,
58
                          hwaddr base, qemu_irq irq,
59
                          int txmem, int rxmem)
56
static inline void
57
xilinx_axiethernet_init(DeviceState *dev, NICInfo *nd, StreamSlave *peer,
58
                        hwaddr base, qemu_irq irq, int txmem, int rxmem)
60 59
{
61
    DeviceState *dev;
62 60
    Error *errp = NULL;
63 61

  
64
    qemu_check_nic_model(nd, "xlnx.axi-ethernet");
65

  
66
    dev = qdev_create(NULL, "xlnx.axi-ethernet");
67 62
    qdev_set_nic_properties(dev, nd);
68 63
    qdev_prop_set_uint32(dev, "rxmem", rxmem);
69 64
    qdev_prop_set_uint32(dev, "txmem", txmem);
......
73 68
    qdev_init_nofail(dev);
74 69
    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
75 70
    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
76

  
77
    return dev;
78 71
}
79 72

  
80 73
static inline void

Also available in: Unified diff