From patchwork Sat Jun 22 06:07:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 253343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BDBBB2C0410 for ; Sat, 22 Jun 2013 16:09:42 +1000 (EST) Received: from localhost ([::1]:39066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqH12-0001zt-HA for incoming@patchwork.ozlabs.org; Sat, 22 Jun 2013 02:09:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqGzB-0007cU-4P for qemu-devel@nongnu.org; Sat, 22 Jun 2013 02:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqGz9-0004ul-TP for qemu-devel@nongnu.org; Sat, 22 Jun 2013 02:07:45 -0400 Received: from mout.web.de ([212.227.17.11]:57958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqGz9-0004uW-JB for qemu-devel@nongnu.org; Sat, 22 Jun 2013 02:07:43 -0400 Received: from localhost.localdomain ([95.157.58.223]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0Le4Lg-1UVRpK0dH2-00psK3; Sat, 22 Jun 2013 08:07:26 +0200 From: Jan Kiszka To: qemu-devel Date: Sat, 22 Jun 2013 08:07:07 +0200 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K0:2k0xvkiS4NW1jPLkurivPKUk6f4P/oun1rgO0xPZPBnwsYMJzAC JAk1z4Li6NuNZawRFiv6andGq0iWaLwcLyrSk9rmoWJgmtMIRUkbu7rTe2OIvouKAK0lj2k T+RifZvT/ZsOerGyy9suJ4S/kDaPindjxgaHnP+SxMdv0y+QrRN5kKY4bN55WRi+GGdiX6E n3ZlxVE6MicFtg4pN7QNA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.11 Cc: Paolo Bonzini , Liu Ping Fan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Jan Kiszka Subject: [Qemu-devel] [PATCH v3 14/14] ioport: Move portio types to ioport.h 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 From: Jan Kiszka This decouples memory.h from ioport.h, concentrating all portio related types in a single header. Signed-off-by: Jan Kiszka --- include/exec/ioport.h | 17 +++++++++++------ include/exec/memory.h | 13 ------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/include/exec/ioport.h b/include/exec/ioport.h index ba3ebb8..6fb237d 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -25,6 +25,7 @@ #define IOPORT_H #include "qemu-common.h" +#include "exec/memory.h" typedef uint32_t pio_addr_t; #define FMT_pioaddr PRIx32 @@ -32,9 +33,16 @@ typedef uint32_t pio_addr_t; #define MAX_IOPORTS (64 * 1024) #define IOPORTS_MASK (MAX_IOPORTS - 1) -/* These should really be in isa.h, but are here to make pc.h happy. */ -typedef void (IOPortWriteFunc)(void *opaque, uint32_t address, uint32_t data); -typedef uint32_t (IOPortReadFunc)(void *opaque, uint32_t address); +typedef struct MemoryRegionPortio { + uint32_t offset; + uint32_t len; + unsigned size; + uint32_t (*read)(void *opaque, uint32_t address); + void (*write)(void *opaque, uint32_t address, uint32_t data); + uint32_t base; /* private field */ +} MemoryRegionPortio; + +#define PORTIO_END_OF_LIST() { } void cpu_outb(pio_addr_t addr, uint8_t val); void cpu_outw(pio_addr_t addr, uint16_t val); @@ -43,9 +51,6 @@ uint8_t cpu_inb(pio_addr_t addr); uint16_t cpu_inw(pio_addr_t addr); uint32_t cpu_inl(pio_addr_t addr); -struct MemoryRegion; -struct MemoryRegionPortio; - typedef struct PortioList { const struct MemoryRegionPortio *ports; struct MemoryRegion *address_space; diff --git a/include/exec/memory.h b/include/exec/memory.h index 8c1373e..84b3eef 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -22,7 +22,6 @@ #include "exec/cpu-common.h" #include "exec/hwaddr.h" #include "qemu/queue.h" -#include "exec/ioport.h" #include "qemu/int128.h" #include "qemu/notify.h" @@ -30,7 +29,6 @@ #define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1) typedef struct MemoryRegionOps MemoryRegionOps; -typedef struct MemoryRegionPortio MemoryRegionPortio; typedef struct MemoryRegionMmio MemoryRegionMmio; /* Must match *_DIRTY_FLAGS in cpu-all.h. To be replaced with dynamic @@ -164,17 +162,6 @@ struct MemoryRegion { NotifierList iommu_notify; }; -struct MemoryRegionPortio { - uint32_t offset; - uint32_t len; - unsigned size; - IOPortReadFunc *read; - IOPortWriteFunc *write; - uint32_t base; /* private field */ -}; - -#define PORTIO_END_OF_LIST() { } - /** * AddressSpace: describes a mapping of addresses to #MemoryRegion objects */