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

hw/net/smc91c111: Convert away from old_mmio

Browse Source 
Convert the smc91c111 device away from using the old_mmio field of
MemoryRegionOps. This device is used by several Arm board models.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180427173611.10281-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-05-04 18:05:50 +01:00
parent a22cadbefd
commit 50a22d0de8
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
hw/net/smc91c111.c
View File

@ -625,37 +625,33 @@ static uint32_t smc91c111_readb(void *opaque, hwaddr offset)
return 0; return 0;
} }
static void smc91c111_writew(void *opaque, hwaddr offset, static uint64_t smc91c111_readfn(void *opaque, hwaddr addr, unsigned size)
uint32_t value)
{ {
smc91c111_writeb(opaque, offset, value & 0xff); int i;
smc91c111_writeb(opaque, offset + 1, value >> 8); uint32_t val = 0;
for (i = 0; i < size; i++) {
val |= smc91c111_readb(opaque, addr + i) << (i * 8);
}
return val;
} }
static void smc91c111_writel(void *opaque, hwaddr offset, static void smc91c111_writefn(void *opaque, hwaddr addr,
uint32_t value) uint64_t value, unsigned size)
{ {
int i = 0;
/* 32-bit writes to offset 0xc only actually write to the bank select /* 32-bit writes to offset 0xc only actually write to the bank select
register (offset 0xe) */ * register (offset 0xe), so skip the first two bytes we would write.
if (offset != 0xc) */
smc91c111_writew(opaque, offset, value & 0xffff); if (addr == 0xc && size == 4) {
smc91c111_writew(opaque, offset + 2, value >> 16); i += 2;
} }
static uint32_t smc91c111_readw(void *opaque, hwaddr offset) for (; i < size; i++) {
{ smc91c111_writeb(opaque, addr + i,
uint32_t val; extract32(value, i * 8, 8));
val = smc91c111_readb(opaque, offset); }
val |= smc91c111_readb(opaque, offset + 1) << 8;
return val;
}
static uint32_t smc91c111_readl(void *opaque, hwaddr offset)
{
uint32_t val;
val = smc91c111_readw(opaque, offset);
val |= smc91c111_readw(opaque, offset + 2) << 16;
return val;
} }
static int smc91c111_can_receive_nc(NetClientState *nc) static int smc91c111_can_receive_nc(NetClientState *nc)
@ -747,10 +743,10 @@ static const MemoryRegionOps smc91c111_mem_ops = {
/* The special case for 32 bit writes to 0xc means we can't just /* The special case for 32 bit writes to 0xc means we can't just
* set .impl.min/max_access_size to 1, unfortunately * set .impl.min/max_access_size to 1, unfortunately
*/ */
.old_mmio = { .read = smc91c111_readfn,
.read = { smc91c111_readb, smc91c111_readw, smc91c111_readl, }, .write = smc91c111_writefn,
.write = { smc91c111_writeb, smc91c111_writew, smc91c111_writel, }, .valid.min_access_size = 1,
}, .valid.max_access_size = 4,
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };