From patchwork Fri Jan 11 21:00:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 211419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A54642C0333 for ; Sat, 12 Jan 2013 08:01:15 +1100 (EST) Received: from localhost ([::1]:47891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttliy-0000lu-7o for incoming@patchwork.ozlabs.org; Fri, 11 Jan 2013 16:01:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttlin-0000kD-EE for qemu-devel@nongnu.org; Fri, 11 Jan 2013 16:01:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ttlil-0006S8-0z for qemu-devel@nongnu.org; Fri, 11 Jan 2013 16:01:01 -0500 Received: from mout.web.de ([212.227.17.11]:59693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ttlib-0006Qz-KG; Fri, 11 Jan 2013 16:00:49 -0500 Received: from localhost.localdomain ([84.148.38.169]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0LtFYd-1SxDxb13KF-0128DI; Fri, 11 Jan 2013 22:00:48 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 11 Jan 2013 22:00:41 +0100 Message-Id: <1357938041-4189-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Provags-ID: V02:K0:HGSd4CQgor2G2KUgX78YifAQ0b36QX96hydBVrnIFU/ Jc5xGx3iRJI02uuTWnA17B5yiKNkAK6hWaeFLI5jTa5Er87BD2 SPZ8sjDGDwiH4YoeB4fQYRfRm5j5HOFTF04KQ6xWLfLWJX/BX4 qXP/FPMLXhw0yZWas9ddk7Ym7lNJ6p7ylXMOXL9s3TgWC5TEvS L0zXuqlb3GTT4sg50eahw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.11 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PATCH] pc87312: Replace register_ioport_*() with MemoryRegion X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Prepare an instance_init function for the MemoryRegion init. Signed-off-by: Andreas Färber Cc: Hervé Poussineau Tested-by: Hervé Poussineau --- hw/pc87312.c | 26 ++++++++++++++++++++++---- hw/pc87312.h | 2 ++ 2 Dateien geändert, 24 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/hw/pc87312.c b/hw/pc87312.c index 6a17afd..97fabfa 100644 --- a/hw/pc87312.c +++ b/hw/pc87312.c @@ -194,7 +194,8 @@ static void pc87312_hard_reset(PC87312State *s) pc87312_soft_reset(s); } -static void pc87312_ioport_write(void *opaque, uint32_t addr, uint32_t val) +static void pc87312_io_write(void *opaque, hwaddr addr, uint64_t val, + unsigned int size) { PC87312State *s = opaque; @@ -213,7 +214,7 @@ static void pc87312_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } -static uint32_t pc87312_ioport_read(void *opaque, uint32_t addr) +static uint64_t pc87312_io_read(void *opaque, hwaddr addr, unsigned int size) { PC87312State *s = opaque; uint32_t val; @@ -241,6 +242,16 @@ static uint32_t pc87312_ioport_read(void *opaque, uint32_t addr) return val; } +static const MemoryRegionOps pc87312_io_ops = { + .read = pc87312_io_read, + .write = pc87312_io_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 1, + .max_access_size = 1, + }, +}; + static int pc87312_post_load(void *opaque, int version_id) { PC87312State *s = opaque; @@ -270,6 +281,7 @@ static int pc87312_init(ISADevice *dev) s = PC87312(dev); bus = isa_bus_from_device(dev); pc87312_hard_reset(s); + isa_register_ioport(dev, &s->io, s->iobase); if (is_parallel_enabled(s)) { chr = parallel_hds[0]; @@ -337,11 +349,16 @@ static int pc87312_init(ISADevice *dev) trace_pc87312_info_ide(get_ide_iobase(s)); } - register_ioport_write(s->iobase, 2, 1, pc87312_ioport_write, s); - register_ioport_read(s->iobase, 2, 1, pc87312_ioport_read, s); return 0; } +static void pc87312_initfn(Object *obj) +{ + PC87312State *s = PC87312(obj); + + memory_region_init_io(&s->io, &pc87312_io_ops, s, "pc87312", 2); +} + static const VMStateDescription vmstate_pc87312 = { .name = "pc87312", .version_id = 1, @@ -376,6 +393,7 @@ static const TypeInfo pc87312_type_info = { .name = TYPE_PC87312, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(PC87312State), + .instance_init = pc87312_initfn, .class_init = pc87312_class_init, }; diff --git a/hw/pc87312.h b/hw/pc87312.h index 7ca7912..7b9e6f6 100644 --- a/hw/pc87312.h +++ b/hw/pc87312.h @@ -56,6 +56,8 @@ typedef struct PC87312State { uint32_t base; } ide; + MemoryRegion io; + uint8_t read_id_step; uint8_t selected_index;