Commit 50a22d0d authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/net/smc91c111: Convert away from old_mmio 



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20180427173611.10281-3-peter.maydell@linaro.org
parent a22cadbe

hw/net/smc91c111.c

+25 −29
Original line number Diff line number Diff line
@@ -625,37 +625,33 @@ static uint32_t smc91c111_readb(void *opaque, hwaddr offset) 
    return 0;

}



static void smc91c111_writew(void *opaque, hwaddr offset,

                             uint32_t value)

static uint64_t smc91c111_readfn(void *opaque, hwaddr addr, unsigned size)

{

    smc91c111_writeb(opaque, offset, value & 0xff);

    smc91c111_writeb(opaque, offset + 1, value >> 8);

    int i;

    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,

                             uint32_t value)

static void smc91c111_writefn(void *opaque, hwaddr addr,

                               uint64_t value, unsigned size)

{

    int i = 0;



    /* 32-bit writes to offset 0xc only actually write to the bank select

       register (offset 0xe)  */

    if (offset != 0xc)

        smc91c111_writew(opaque, offset, value & 0xffff);

    smc91c111_writew(opaque, offset + 2, value >> 16);

     * register (offset 0xe), so skip the first two bytes we would write.

     */

    if (addr == 0xc && size == 4) {

        i += 2;

    }



static uint32_t smc91c111_readw(void *opaque, hwaddr offset)

{

    uint32_t val;

    val = smc91c111_readb(opaque, offset);

    val |= smc91c111_readb(opaque, offset + 1) << 8;

    return val;

    for (; i < size; i++) {

        smc91c111_writeb(opaque, addr + i,

                         extract32(value, i * 8, 8));

    }



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)
@@ -747,10 +743,10 @@ 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, },

    },

    .read = smc91c111_readfn,

    .write = smc91c111_writefn,

    .valid.min_access_size = 1,

    .valid.max_access_size = 4,

    .endianness = DEVICE_NATIVE_ENDIAN,

};