Revision 20cf850c
| b/hw/milkymist-hw.h | ||
|---|---|---|
| 177 | 177 |
|
| 178 | 178 |
qemu_check_nic_model(&nd_table[0], "minimac2"); |
| 179 | 179 |
dev = qdev_create(NULL, "milkymist-minimac2"); |
| 180 |
qdev_prop_set_taddr(dev, "buffers_base", buffers_base); |
|
| 181 | 180 |
qdev_set_nic_properties(dev, &nd_table[0]); |
| 182 | 181 |
qdev_init_nofail(dev); |
| 183 | 182 |
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); |
| 183 |
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, buffers_base); |
|
| 184 | 184 |
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq); |
| 185 | 185 |
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq); |
| 186 | 186 |
|
| b/hw/milkymist-minimac2.c | ||
|---|---|---|
| 96 | 96 |
NICState *nic; |
| 97 | 97 |
NICConf conf; |
| 98 | 98 |
char *phy_model; |
| 99 |
hwaddr buffers_base; |
|
| 100 | 99 |
MemoryRegion buffers; |
| 101 | 100 |
MemoryRegion regs_region; |
| 102 | 101 |
|
| ... | ... | |
| 475 | 474 |
s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE; |
| 476 | 475 |
s->tx_buf = s->rx1_buf + MINIMAC2_BUFFER_SIZE; |
| 477 | 476 |
|
| 478 |
sysbus_add_memory(dev, s->buffers_base, &s->buffers);
|
|
| 477 |
sysbus_init_mmio(dev, &s->buffers);
|
|
| 479 | 478 |
|
| 480 | 479 |
qemu_macaddr_default_if_unset(&s->conf.macaddr); |
| 481 | 480 |
s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf, |
| ... | ... | |
| 517 | 516 |
}; |
| 518 | 517 |
|
| 519 | 518 |
static Property milkymist_minimac2_properties[] = {
|
| 520 |
DEFINE_PROP_TADDR("buffers_base", MilkymistMinimac2State,
|
|
| 521 |
buffers_base, 0), |
|
| 522 | 519 |
DEFINE_NIC_PROPERTIES(MilkymistMinimac2State, conf), |
| 523 | 520 |
DEFINE_PROP_STRING("phy_model", MilkymistMinimac2State, phy_model),
|
| 524 | 521 |
DEFINE_PROP_END_OF_LIST(), |
Also available in: Unified diff