From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0n-0007Fy-FV for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAN0e-0008CZ-QN for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0e-0008BY-9j for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:16 -0400 From: Avi Kivity Date: Sun, 2 Oct 2011 16:26:48 +0200 Message-Id: <1317565616-12997-18-git-send-email-avi@redhat.com> In-Reply-To: <1317565616-12997-1-git-send-email-avi@redhat.com> References: <1317565616-12997-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 17/25] milkymist-ac97: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori From: Michael Walle Signed-off-by: Michael Walle Signed-off-by: Avi Kivity --- hw/milkymist-ac97.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c index 6104732..5c5ed27 100644 --- a/hw/milkymist-ac97.c +++ b/hw/milkymist-ac97.c @@ -53,6 +53,7 @@ enum { struct MilkymistAC97State { SysBusDevice busdev; + MemoryRegion regs_region; QEMUSoundCard card; SWVoiceIn *voice_in; @@ -82,7 +83,8 @@ static void update_voices(MilkymistAC97State *s) } } -static uint32_t ac97_read(void *opaque, target_phys_addr_t addr) +static uint64_t ac97_read(void *opaque, target_phys_addr_t addr, + unsigned size) { MilkymistAC97State *s = opaque; uint32_t r = 0; @@ -113,7 +115,8 @@ static uint32_t ac97_read(void *opaque, target_phys_addr_t addr) return r; } -static void ac97_write(void *opaque, target_phys_addr_t addr, uint32_t value) +static void ac97_write(void *opaque, target_phys_addr_t addr, uint64_t value, + unsigned size) { MilkymistAC97State *s = opaque; @@ -159,16 +162,14 @@ static void ac97_write(void *opaque, target_phys_addr_t addr, uint32_t value) } -static CPUReadMemoryFunc * const ac97_read_fn[] = { - NULL, - NULL, - &ac97_read, -}; - -static CPUWriteMemoryFunc * const ac97_write_fn[] = { - NULL, - NULL, - &ac97_write, +static const MemoryRegionOps ac97_mmio_ops = { + .read = ac97_read, + .write = ac97_write, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, + .endianness = DEVICE_NATIVE_ENDIAN, }; static void ac97_in_cb(void *opaque, int avail_b) @@ -280,7 +281,6 @@ static int ac97_post_load(void *opaque, int version_id) static int milkymist_ac97_init(SysBusDevice *dev) { MilkymistAC97State *s = FROM_SYSBUS(typeof(*s), dev); - int ac97_regs; struct audsettings as; sysbus_init_irq(dev, &s->crrequest_irq); @@ -300,9 +300,9 @@ static int milkymist_ac97_init(SysBusDevice *dev) s->voice_out = AUD_open_out(&s->card, s->voice_out, "mm_ac97.out", s, ac97_out_cb, &as); - ac97_regs = cpu_register_io_memory(ac97_read_fn, ac97_write_fn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, ac97_regs); + memory_region_init_io(&s->regs_region, &ac97_mmio_ops, s, + "milkymist-ac97", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->regs_region); return 0; } -- 1.7.6.3