SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/smc91c111: Convert to MemoryRegion

Browse Source 
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Peter Maydell 2011-08-24 18:28:21 +01:00 committed by Avi Kivity
parent 38bc50f7e2
commit 5a95b51dd8
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/smc91c111.c
View File

@ -43,7 +43,7 @@ typedef struct {
uint8_t data[NUM_PACKETS][2048]; uint8_t data[NUM_PACKETS][2048];
uint8_t int_level; uint8_t int_level;
uint8_t int_mask; uint8_t int_mask;
int mmio_index; MemoryRegion mmio;
} smc91c111_state; } smc91c111_state;
static const VMStateDescription vmstate_smc91c111 = { static const VMStateDescription vmstate_smc91c111 = {
@ -717,16 +717,15 @@ static ssize_t smc91c111_receive(VLANClientState *nc, const uint8_t *buf, size_t
return size; return size;
} }
static CPUReadMemoryFunc * const smc91c111_readfn[] = { static const MemoryRegionOps smc91c111_mem_ops = {
smc91c111_readb, /* The special case for 32 bit writes to 0xc means we can't just
smc91c111_readw, * set .impl.min/max_access_size to 1, unfortunately
smc91c111_readl */
}; .old_mmio = {
.read = { smc91c111_readb, smc91c111_readw, smc91c111_readl, },
static CPUWriteMemoryFunc * const smc91c111_writefn[] = { .write = { smc91c111_writeb, smc91c111_writew, smc91c111_writel, },
smc91c111_writeb, },
smc91c111_writew, .endianness = DEVICE_NATIVE_ENDIAN,
smc91c111_writel
}; };
static void smc91c111_cleanup(VLANClientState *nc) static void smc91c111_cleanup(VLANClientState *nc)
@ -747,11 +746,9 @@ static NetClientInfo net_smc91c111_info = {
static int smc91c111_init1(SysBusDevice *dev) static int smc91c111_init1(SysBusDevice *dev)
{ {
smc91c111_state *s = FROM_SYSBUS(smc91c111_state, dev); smc91c111_state *s = FROM_SYSBUS(smc91c111_state, dev);
memory_region_init_io(&s->mmio, &smc91c111_mem_ops, s,
s->mmio_index = cpu_register_io_memory(smc91c111_readfn, "smc91c111-mmio", 16);
smc91c111_writefn, s, sysbus_init_mmio_region(dev, &s->mmio);
DEVICE_NATIVE_ENDIAN);
sysbus_init_mmio(dev, 16, s->mmio_index);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_smc91c111_info, &s->conf, s->nic = qemu_new_nic(&net_smc91c111_info, &s->conf,