From patchwork Fri Jan 13 03:09:23 2012 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: 135706 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5B2FB6FA4 for ; Fri, 13 Jan 2012 14:11:54 +1100 (EST) Received: from localhost ([::1]:55417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlXYV-00006i-D3 for incoming@patchwork.ozlabs.org; Thu, 12 Jan 2012 22:11:51 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlXYE-0008GJ-IJ for qemu-devel@nongnu.org; Thu, 12 Jan 2012 22:11:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RlXYD-0006ZD-DC for qemu-devel@nongnu.org; Thu, 12 Jan 2012 22:11:34 -0500 Received: from mout.web.de ([212.227.15.4]:64504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlXY6-0006X0-26; Thu, 12 Jan 2012 22:11:26 -0500 Received: from localhost.localdomain ([84.148.23.44]) by smtp.web.de (mrweb002) with ESMTPA (Nemesis) id 0M5Oql-1ScZja2vCZ-00zJ6o; Fri, 13 Jan 2012 04:11:22 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2012 04:09:23 +0100 Message-Id: <1326424168-15705-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1326424168-15705-1-git-send-email-andreas.faerber@web.de> References: <1325894809-17322-1-git-send-email-andreas.faerber@web.de> <1326424168-15705-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:wUfBzPgAdP8qeJHGMlTu0JoLXPhy64M1b0/LK1z4SZ0 HFr0mr/mw1tuUXrKCMCAGZ/jnuq6yCau7VzSsICESbUbOo9/ul +s47qGsX9Y7n9mSAlgk8OgcO4PH8XLOoBFAXvHTWFLNTpsVuDx z1PK8FAl0dkA6KkRBHO3eWTGgnLR+fXG/sbKjMmBJCBDldD28S LtaYdTzIn6LI5TRbymjtw== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.4 Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , "Michael S. Tsirkin" , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Avi Kivity Subject: [Qemu-devel] [PATCH v3 3/8] prep_pci: Update I/O to MemoryRegion ops 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 Convert to new-style read/write callbacks. Signed-off-by: Andreas Färber Cc: Michael S. Tsirkin Cc: Alexander Graf Cc: Avi Kivity Cc: Benoît Canet --- hw/prep_pci.c | 61 +++++++++++++++++++++----------------------------------- 1 files changed, 23 insertions(+), 38 deletions(-) diff --git a/hw/prep_pci.c b/hw/prep_pci.c index edfb25d..5970196 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -44,53 +44,38 @@ static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr) return (addr & 0x7ff) | (i << 11); } -static void PPC_PCIIO_writeb (void *opaque, target_phys_addr_t addr, uint32_t val) +static void ppc_pci_io_write(void *opaque, target_phys_addr_t addr, + uint64_t val, unsigned int size) { PREPPCIState *s = opaque; - pci_data_write(s->bus, PPC_PCIIO_config(addr), val, 1); -} - -static void PPC_PCIIO_writew (void *opaque, target_phys_addr_t addr, uint32_t val) -{ - PREPPCIState *s = opaque; - pci_data_write(s->bus, PPC_PCIIO_config(addr), val, 2); -} - -static void PPC_PCIIO_writel (void *opaque, target_phys_addr_t addr, uint32_t val) -{ - PREPPCIState *s = opaque; - pci_data_write(s->bus, PPC_PCIIO_config(addr), val, 4); -} - -static uint32_t PPC_PCIIO_readb (void *opaque, target_phys_addr_t addr) -{ - PREPPCIState *s = opaque; - uint32_t val; - val = pci_data_read(s->bus, PPC_PCIIO_config(addr), 1); - return val; -} - -static uint32_t PPC_PCIIO_readw (void *opaque, target_phys_addr_t addr) -{ - PREPPCIState *s = opaque; - uint32_t val; - val = pci_data_read(s->bus, PPC_PCIIO_config(addr), 2); - return val; + switch (size) { + case 1: + case 2: + case 4: + pci_data_write(s->bus, PPC_PCIIO_config(addr), val, size); + break; + default: + abort(); + } } -static uint32_t PPC_PCIIO_readl (void *opaque, target_phys_addr_t addr) +static uint64_t ppc_pci_io_read(void *opaque, target_phys_addr_t addr, + unsigned int size) { PREPPCIState *s = opaque; - uint32_t val; - val = pci_data_read(s->bus, PPC_PCIIO_config(addr), 4); - return val; + switch (size) { + case 1: + case 2: + case 4: + return pci_data_read(s->bus, PPC_PCIIO_config(addr), size); + default: + abort(); + } } static const MemoryRegionOps PPC_PCIIO_ops = { - .old_mmio = { - .read = { PPC_PCIIO_readb, PPC_PCIIO_readw, PPC_PCIIO_readl, }, - .write = { PPC_PCIIO_writeb, PPC_PCIIO_writew, PPC_PCIIO_writel, }, - }, + .read = ppc_pci_io_read, + .write = ppc_pci_io_write, .endianness = DEVICE_LITTLE_ENDIAN, };