[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/24] stellaris_enet: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 14/24] stellaris_enet: convert to memory API |
Date: |
Mon, 15 Aug 2011 17:17:28 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/stellaris_enet.c | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c
index 1291931..9f1f37a 100644
--- a/hw/stellaris_enet.c
+++ b/hw/stellaris_enet.c
@@ -69,7 +69,7 @@ typedef struct {
NICState *nic;
NICConf conf;
qemu_irq irq;
- int mmio_index;
+ MemoryRegion mmio;
} stellaris_enet_state;
static void stellaris_enet_update(stellaris_enet_state *s)
@@ -130,7 +130,8 @@ static int stellaris_enet_can_receive(VLANClientState *nc)
return (s->np < 31);
}
-static uint32_t stellaris_enet_read(void *opaque, target_phys_addr_t offset)
+static uint64_t stellaris_enet_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
stellaris_enet_state *s = (stellaris_enet_state *)opaque;
uint32_t val;
@@ -198,7 +199,7 @@ static uint32_t stellaris_enet_read(void *opaque,
target_phys_addr_t offset)
}
static void stellaris_enet_write(void *opaque, target_phys_addr_t offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
stellaris_enet_state *s = (stellaris_enet_state *)opaque;
@@ -303,17 +304,12 @@ static void stellaris_enet_write(void *opaque,
target_phys_addr_t offset,
}
}
-static CPUReadMemoryFunc * const stellaris_enet_readfn[] = {
- stellaris_enet_read,
- stellaris_enet_read,
- stellaris_enet_read
+static const MemoryRegionOps stellaris_enet_ops = {
+ .read = stellaris_enet_read,
+ .write = stellaris_enet_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
-static CPUWriteMemoryFunc * const stellaris_enet_writefn[] = {
- stellaris_enet_write,
- stellaris_enet_write,
- stellaris_enet_write
-};
static void stellaris_enet_reset(stellaris_enet_state *s)
{
s->mdv = 0x80;
@@ -391,7 +387,7 @@ static void stellaris_enet_cleanup(VLANClientState *nc)
unregister_savevm(&s->busdev.qdev, "stellaris_enet", s);
- cpu_unregister_io_memory(s->mmio_index);
+ memory_region_destroy(&s->mmio);
qemu_free(s);
}
@@ -408,10 +404,9 @@ static int stellaris_enet_init(SysBusDevice *dev)
{
stellaris_enet_state *s = FROM_SYSBUS(stellaris_enet_state, dev);
- s->mmio_index = cpu_register_io_memory(stellaris_enet_readfn,
- stellaris_enet_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, s->mmio_index);
+ memory_region_init_io(&s->mmio, &stellaris_enet_ops, s, "stellaris_enet",
+ 0x1000);
+ sysbus_init_mmio_region(dev, &s->mmio);
sysbus_init_irq(dev, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr);
--
1.7.5.3
- [Qemu-devel] [PATCH v2 08/24] tusb6010: move declarations to new file tusb6010.h, (continued)
- [Qemu-devel] [PATCH v2 08/24] tusb6010: move declarations to new file tusb6010.h, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 20/24] sysbus: remove sysbus_init_mmio_cb(), Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 21/24] isa: add isa_address_space(), Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 17/24] arm11mpcore: use sysbus_init_mmio_cb2, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 07/24] gt64xxx.c: convert to memory API, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 18/24] versatile_pci: convert to memory API, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 10/24] onenand: convert to memory API, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 04/24] arm_sysctl: convert to memory API, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 24/24] 440fx: fix PAM, PCI holes, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 23/24] vga: drop get_system_memory() from vga devices and derivatives, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 14/24] stellaris_enet: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 19/24] ppce500_pci: convert to sysbus_init_mmio_cb2(), Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 09/24] omap_gpmc/nseries/tusb6010: convert to memory API, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 15/24] sysbus: add a variant of sysbus_init_mmio_cb with an unmap callback, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 13/24] ppc4xx_sdram: convert to memory API, Avi Kivity, 2011/08/15
- [Qemu-devel] [PATCH v2 12/24] ppc405_uc: convert to memory API, Avi Kivity, 2011/08/15
- Re: [Qemu-devel] [PATCH v2 00/24] Memory API batch 4: more conversions, Avi Kivity, 2011/08/22
- Re: [Qemu-devel] [PATCH v2 00/24] Memory API batch 4: more conversions, Anthony Liguori, 2011/08/22