Revision a77d90e6 hw/arm/musicpal.c
| b/hw/arm/musicpal.c | ||
|---|---|---|
| 146 | 146 |
uint32_t next; |
| 147 | 147 |
} mv88w8618_rx_desc; |
| 148 | 148 |
|
| 149 |
#define TYPE_MV88W8618_ETH "mv88w8618_eth" |
|
| 150 |
#define MV88W8618_ETH(obj) \ |
|
| 151 |
OBJECT_CHECK(mv88w8618_eth_state, (obj), TYPE_MV88W8618_ETH) |
|
| 152 |
|
|
| 149 | 153 |
typedef struct mv88w8618_eth_state {
|
| 150 |
SysBusDevice busdev; |
|
| 154 |
/*< private >*/ |
|
| 155 |
SysBusDevice parent_obj; |
|
| 156 |
/*< public >*/ |
|
| 157 |
|
|
| 151 | 158 |
MemoryRegion iomem; |
| 152 | 159 |
qemu_irq irq; |
| 153 | 160 |
uint32_t smir; |
| ... | ... | |
| 382 | 389 |
.cleanup = eth_cleanup, |
| 383 | 390 |
}; |
| 384 | 391 |
|
| 385 |
static int mv88w8618_eth_init(SysBusDevice *dev)
|
|
| 392 |
static int mv88w8618_eth_init(SysBusDevice *sbd)
|
|
| 386 | 393 |
{
|
| 387 |
mv88w8618_eth_state *s = FROM_SYSBUS(mv88w8618_eth_state, dev); |
|
| 394 |
DeviceState *dev = DEVICE(sbd); |
|
| 395 |
mv88w8618_eth_state *s = MV88W8618_ETH(dev); |
|
| 388 | 396 |
|
| 389 |
sysbus_init_irq(dev, &s->irq);
|
|
| 397 |
sysbus_init_irq(sbd, &s->irq);
|
|
| 390 | 398 |
s->nic = qemu_new_nic(&net_mv88w8618_info, &s->conf, |
| 391 |
object_get_typename(OBJECT(dev)), dev->qdev.id, s);
|
|
| 399 |
object_get_typename(OBJECT(dev)), dev->id, s); |
|
| 392 | 400 |
memory_region_init_io(&s->iomem, OBJECT(s), &mv88w8618_eth_ops, s, |
| 393 | 401 |
"mv88w8618-eth", MP_ETH_SIZE); |
| 394 |
sysbus_init_mmio(dev, &s->iomem);
|
|
| 402 |
sysbus_init_mmio(sbd, &s->iomem);
|
|
| 395 | 403 |
return 0; |
| 396 | 404 |
} |
| 397 | 405 |
|
| ... | ... | |
| 429 | 437 |
} |
| 430 | 438 |
|
| 431 | 439 |
static const TypeInfo mv88w8618_eth_info = {
|
| 432 |
.name = "mv88w8618_eth",
|
|
| 440 |
.name = TYPE_MV88W8618_ETH,
|
|
| 433 | 441 |
.parent = TYPE_SYS_BUS_DEVICE, |
| 434 | 442 |
.instance_size = sizeof(mv88w8618_eth_state), |
| 435 | 443 |
.class_init = mv88w8618_eth_class_init, |
| ... | ... | |
| 1627 | 1635 |
sysbus_create_simple("mv88w8618_flashcfg", MP_FLASHCFG_BASE, NULL);
|
| 1628 | 1636 |
|
| 1629 | 1637 |
qemu_check_nic_model(&nd_table[0], "mv88w8618"); |
| 1630 |
dev = qdev_create(NULL, "mv88w8618_eth");
|
|
| 1638 |
dev = qdev_create(NULL, TYPE_MV88W8618_ETH);
|
|
| 1631 | 1639 |
qdev_set_nic_properties(dev, &nd_table[0]); |
| 1632 | 1640 |
qdev_init_nofail(dev); |
| 1633 | 1641 |
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, MP_ETH_BASE); |
Also available in: Unified diff