david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

milkymist-{minimac2,softusb}: rename memory names

Browse Source 
Be consistent with other milkymist models.

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Michael Walle 2011-08-31 16:48:47 +02:00 committed by Avi Kivity
parent 883abf8d2c
commit 306f66b42f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/milkymist-minimac2.c
View File

@ -464,11 +464,11 @@ static int milkymist_minimac2_init(SysBusDevice *dev)
sysbus_init_irq(dev, &s->tx_irq); sysbus_init_irq(dev, &s->tx_irq);
memory_region_init_io(&s->regs_region, &minimac2_ops, s, memory_region_init_io(&s->regs_region, &minimac2_ops, s,
"minimac2-mmio", R_MAX * 4); "milkymist-minimac2", R_MAX * 4);
sysbus_init_mmio_region(dev, &s->regs_region); sysbus_init_mmio_region(dev, &s->regs_region);
/* register buffers memory */ /* register buffers memory */
memory_region_init_ram(&s->buffers, NULL, "milkymist_minimac2.buffers", memory_region_init_ram(&s->buffers, NULL, "milkymist-minimac2.buffers",
buffers_size); buffers_size);
s->rx0_buf = memory_region_get_ram_ptr(&s->buffers); s->rx0_buf = memory_region_get_ram_ptr(&s->buffers);
s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE; s->rx1_buf = s->rx0_buf + MINIMAC2_BUFFER_SIZE;

4
hw/milkymist-softusb.c
View File

@ -267,10 +267,10 @@ static int milkymist_softusb_init(SysBusDevice *dev)
sysbus_init_mmio_region(dev, &s->regs_region); sysbus_init_mmio_region(dev, &s->regs_region);
/* register pmem and dmem */ /* register pmem and dmem */
memory_region_init_ram(&s->pmem, NULL, "milkymist_softusb.pmem", memory_region_init_ram(&s->pmem, NULL, "milkymist-softusb.pmem",
s->pmem_size); s->pmem_size);
sysbus_add_memory(dev, s->pmem_base, &s->pmem); sysbus_add_memory(dev, s->pmem_base, &s->pmem);
memory_region_init_ram(&s->dmem, NULL, "milkymist_softusb.dmem", memory_region_init_ram(&s->dmem, NULL, "milkymist-softusb.dmem",
s->dmem_size); s->dmem_size);
sysbus_add_memory(dev, s->dmem_base, &s->dmem); sysbus_add_memory(dev, s->dmem_base, &s->dmem);