From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45444)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <th.huth@gmail.com>) id 1fP0BF-0005Ck-NF
	for qemu-devel@nongnu.org; Sat, 02 Jun 2018 02:38:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <th.huth@gmail.com>) id 1fP0BE-00035G-JY
	for qemu-devel@nongnu.org; Sat, 02 Jun 2018 02:38:25 -0400
References: <20180601141223.26630-1-peter.maydell@linaro.org>
	<20180601141223.26630-3-peter.maydell@linaro.org>
From: Thomas Huth <huth@tuxfamily.org>
Message-ID: <616a7583-c7bb-68d6-7611-f058d07e0147@tuxfamily.org>
Date: Sat, 2 Jun 2018 08:38:16 +0200
MIME-Version: 1.0
In-Reply-To: <20180601141223.26630-3-peter.maydell@linaro.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/6] hw/m68k/mcf5206: Convert away from
 old_mmio
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: patches@linaro.org, Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Thomas Huth <huth@tuxfamily.org>, Aurelien Jarno <aurelien@aurel32.net>, qemu-block@nongnu.org, Yongbok Kim <yongbok.kim@mips.com>

On 01.06.2018 16:12, Peter Maydell wrote:
> Convert the mcf5206 device away from using the old_mmio field
> of MemoryRegionOps. This device is used by the an5206 board.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/m68k/mcf5206.c | 48 +++++++++++++++++++++++++++++++++++------------
>  1 file changed, 36 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
> index 6ad1e4bd2d..0962911837 100644
> --- a/hw/m68k/mcf5206.c
> +++ b/hw/m68k/mcf5206.c
> @@ -513,19 +513,43 @@ static void m5206_mbar_writel(void *opaque, hwaddr offset,
>      m5206_mbar_write(s, offset, value, 4);
>  }
>  
> +static uint64_t m5206_mbar_readfn(void *opaque, hwaddr addr, unsigned size)
> +{
> +    switch (size) {
> +    case 1:
> +        return m5206_mbar_readb(opaque, addr);
> +    case 2:
> +        return m5206_mbar_readw(opaque, addr);
> +    case 4:
> +        return m5206_mbar_readl(opaque, addr);
> +    default:
> +        g_assert_not_reached();
> +    }
> +}
> +
> +static void m5206_mbar_writefn(void *opaque, hwaddr addr,
> +                               uint64_t value, unsigned size)
> +{
> +    switch (size) {
> +    case 1:
> +        m5206_mbar_writeb(opaque, addr, value);
> +        break;
> +    case 2:
> +        m5206_mbar_writew(opaque, addr, value);
> +        break;
> +    case 4:
> +        m5206_mbar_writel(opaque, addr, value);
> +        break;
> +    default:
> +        g_assert_not_reached();
> +    }
> +}
> +
>  static const MemoryRegionOps m5206_mbar_ops = {
> -    .old_mmio = {
> -        .read = {
> -            m5206_mbar_readb,
> -            m5206_mbar_readw,
> -            m5206_mbar_readl,
> -        },
> -        .write = {
> -            m5206_mbar_writeb,
> -            m5206_mbar_writew,
> -            m5206_mbar_writel,
> -        },
> -    },
> +    .read = m5206_mbar_readfn,
> +    .write = m5206_mbar_writefn,
> +    .valid.min_access_size = 1,
> +    .valid.max_access_size = 4,
>      .endianness = DEVICE_NATIVE_ENDIAN,
>  };

Acked-by: Thomas Huth <huth@tuxfamily.org>