From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:32791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGy5-0007ui-8J for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQGxy-0000L9-Mr for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:21 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:37244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGxy-0000KS-Ib for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:14 -0500 Received: by mail-wy0-f173.google.com with SMTP id 34so1821973wyg.4 for ; Tue, 15 Nov 2011 03:14:14 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 15 Nov 2011 12:13:55 +0100 Message-Id: <1321355644-1982-6-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> References: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH 05/14] slavio_misc: convert leds to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoit Canet --- hw/slavio_misc.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 9110c64..db266ba 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -39,6 +39,7 @@ typedef struct MiscState { MemoryRegion cfg_iomem; MemoryRegion diag_iomem; MemoryRegion mdm_iomem; + MemoryRegion led_iomem; qemu_irq irq; qemu_irq fdc_tc; uint32_t dummy; @@ -345,7 +346,8 @@ static CPUWriteMemoryFunc * const slavio_sysctrl_mem_write[3] = { slavio_sysctrl_mem_writel, }; -static uint32_t slavio_led_mem_readw(void *opaque, target_phys_addr_t addr) +static uint64_t slavio_led_mem_readw(void *opaque, target_phys_addr_t addr, + unsigned size) { MiscState *s = opaque; uint32_t ret = 0; @@ -362,7 +364,7 @@ static uint32_t slavio_led_mem_readw(void *opaque, target_phys_addr_t addr) } static void slavio_led_mem_writew(void *opaque, target_phys_addr_t addr, - uint32_t val) + uint64_t val, unsigned size) { MiscState *s = opaque; @@ -376,16 +378,14 @@ static void slavio_led_mem_writew(void *opaque, target_phys_addr_t addr, } } -static CPUReadMemoryFunc * const slavio_led_mem_read[3] = { - NULL, - slavio_led_mem_readw, - NULL, -}; - -static CPUWriteMemoryFunc * const slavio_led_mem_write[3] = { - NULL, - slavio_led_mem_writew, - NULL, +static const MemoryRegionOps slavio_led_mem_ops = { + .read = slavio_led_mem_readw, + .write = slavio_led_mem_writew, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 2, + .max_access_size = 2, + }, }; static const VMStateDescription vmstate_misc = { @@ -444,10 +444,9 @@ static int slavio_misc_init1(SysBusDevice *dev) /* 16 bit registers */ /* ss600mp diag LEDs */ - io = cpu_register_io_memory(slavio_led_mem_read, - slavio_led_mem_write, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, MISC_SIZE, io); + memory_region_init_io(&s->led_iomem, &slavio_led_mem_ops, s, + "leds", MISC_SIZE); + sysbus_init_mmio_region(dev, &s->led_iomem); /* 32 bit registers */ /* System control */ -- 1.7.5.4