[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/25] hw/smc91c111: Convert to MemoryRegion
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 15/25] hw/smc91c111: Convert to MemoryRegion |
Date: |
Sun, 2 Oct 2011 16:26:46 +0200 |
From: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/smc91c111.c | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index 3a8a85c..fc8c498 100644
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -43,7 +43,7 @@
uint8_t data[NUM_PACKETS][2048];
uint8_t int_level;
uint8_t int_mask;
- int mmio_index;
+ MemoryRegion mmio;
} smc91c111_state;
static const VMStateDescription vmstate_smc91c111 = {
@@ -717,16 +717,15 @@ static ssize_t smc91c111_receive(VLANClientState *nc,
const uint8_t *buf, size_t
return size;
}
-static CPUReadMemoryFunc * const smc91c111_readfn[] = {
- smc91c111_readb,
- smc91c111_readw,
- smc91c111_readl
-};
-
-static CPUWriteMemoryFunc * const smc91c111_writefn[] = {
- smc91c111_writeb,
- smc91c111_writew,
- smc91c111_writel
+static const MemoryRegionOps smc91c111_mem_ops = {
+ /* The special case for 32 bit writes to 0xc means we can't just
+ * set .impl.min/max_access_size to 1, unfortunately
+ */
+ .old_mmio = {
+ .read = { smc91c111_readb, smc91c111_readw, smc91c111_readl, },
+ .write = { smc91c111_writeb, smc91c111_writew, smc91c111_writel, },
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void smc91c111_cleanup(VLANClientState *nc)
@@ -747,11 +746,9 @@ static void smc91c111_cleanup(VLANClientState *nc)
static int smc91c111_init1(SysBusDevice *dev)
{
smc91c111_state *s = FROM_SYSBUS(smc91c111_state, dev);
-
- s->mmio_index = cpu_register_io_memory(smc91c111_readfn,
- smc91c111_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 16, s->mmio_index);
+ memory_region_init_io(&s->mmio, &smc91c111_mem_ops, s,
+ "smc91c111-mmio", 16);
+ sysbus_init_mmio_region(dev, &s->mmio);
sysbus_init_irq(dev, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_smc91c111_info, &s->conf,
--
1.7.6.3
- [Qemu-devel] [PULL 00/25] Memory API conversion, batch 10, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 01/25] etrax-pic: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 02/25] etrax-ser: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 15/25] hw/smc91c111: Convert to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [PATCH 10/25] ppc405: Pass in address_space_mem to ppc405{cr, ep}_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 25/25] milkymist-{minimac2, softusb}: rename memory names, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 08/25] serial: Remove ioregister parameter from serial_mm_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 05/25] etrax-eth: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 19/25] milkymist-memcard: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 24/25] milkymist-vgafb: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 23/25] milkymist-uart: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 07/25] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 18/25] milkymist-hpdmc: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 11/25] ppc440: Pass in address_space_mem to ppc440ep_init, Avi Kivity, 2011/10/02