ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

milkymist-minimac2: convert to memory API 

Reviewed-by: Richard Henderson  <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-08-08 21:32:25 +03:00
parent c378b364ee
commit 8a53d56fdc
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/milkymist-minimac2.c
View File

@ -97,6 +97,8 @@ struct MilkymistMinimac2State {
NICConf conf; NICConf conf;
char *phy_model; char *phy_model;
target_phys_addr_t buffers_base; target_phys_addr_t buffers_base;
MemoryRegion buffers;
MemoryRegion regs_region;
qemu_irq rx_irq; qemu_irq rx_irq;
qemu_irq tx_irq; qemu_irq tx_irq;
@ -320,8 +322,8 @@ static ssize_t minimac2_rx(VLANClientState *nc, const uint8_t *buf, size_t size)
return size; return size;
} }
static uint32_t static uint64_t
minimac2_read(void *opaque, target_phys_addr_t addr) minimac2_read(void *opaque, target_phys_addr_t addr, unsigned size)
{ {
MilkymistMinimac2State *s = opaque; MilkymistMinimac2State *s = opaque;
uint32_t r = 0; uint32_t r = 0;
@ -350,7 +352,8 @@ minimac2_read(void *opaque, target_phys_addr_t addr)
} }
static void static void
minimac2_write(void *opaque, target_phys_addr_t addr, uint32_t value) minimac2_write(void *opaque, target_phys_addr_t addr, uint64_t value,
unsigned size)
{ {
MilkymistMinimac2State *s = opaque; MilkymistMinimac2State *s = opaque;
@ -395,16 +398,14 @@ minimac2_write(void *opaque, target_phys_addr_t addr, uint32_t value)
} }
} }
static CPUReadMemoryFunc * const minimac2_read_fn[] = { static const MemoryRegionOps minimac2_ops = {
NULL, .read = minimac2_read,
NULL, .write = minimac2_write,
&minimac2_read, .valid = {
}; .min_access_size = 4,
.max_access_size = 4,
static CPUWriteMemoryFunc * const minimac2_write_fn[] = { },
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
NULL,
&minimac2_write,
}; };
static int minimac2_can_rx(VLANClientState *nc) static int minimac2_can_rx(VLANClientState *nc)
@ -457,25 +458,23 @@ static NetClientInfo net_milkymist_minimac2_info = {
static int milkymist_minimac2_init(SysBusDevice *dev) static int milkymist_minimac2_init(SysBusDevice *dev)
{ {
MilkymistMinimac2State *s = FROM_SYSBUS(typeof(*s), dev); MilkymistMinimac2State *s = FROM_SYSBUS(typeof(*s), dev);
int regs;
ram_addr_t buffers;
size_t buffers_size = TARGET_PAGE_ALIGN(3 * MINIMAC2_BUFFER_SIZE); size_t buffers_size = TARGET_PAGE_ALIGN(3 * MINIMAC2_BUFFER_SIZE);
sysbus_init_irq(dev, &s->rx_irq); sysbus_init_irq(dev, &s->rx_irq);
sysbus_init_irq(dev, &s->tx_irq); sysbus_init_irq(dev, &s->tx_irq);
regs = cpu_register_io_memory(minimac2_read_fn, minimac2_write_fn, s, memory_region_init_io(&s->regs_region, &minimac2_ops, s,
DEVICE_NATIVE_ENDIAN); "minimac2-mmio", R_MAX * 4);
sysbus_init_mmio(dev, R_MAX * 4, regs); sysbus_init_mmio_region(dev, &s->regs_region);
/* register buffers memory */ /* register buffers memory */
buffers = qemu_ram_alloc(NULL, "milkymist_minimac2.buffers", buffers_size); memory_region_init_ram(&s->buffers, NULL, "milkymist_minimac2.buffers",
s->rx0_buf = qemu_get_ram_ptr(buffers); buffers_size);
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;
s->tx_buf = s->rx1_buf + MINIMAC2_BUFFER_SIZE; s->tx_buf = s->rx1_buf + MINIMAC2_BUFFER_SIZE;
cpu_register_physical_memory(s->buffers_base, buffers_size, sysbus_add_memory(dev, s->buffers_base, &s->buffers);
buffers | IO_MEM_RAM);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf, s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf,