From patchwork Fri Oct 2 10:31:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1F8A3B7B8F for ; Fri, 2 Oct 2009 21:00:43 +1000 (EST) Received: from localhost ([127.0.0.1]:57061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtfsO-0003oe-3O for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2009 07:00:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtfSc-0001E4-Fk for qemu-devel@nongnu.org; Fri, 02 Oct 2009 06:34:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtfSV-0001AV-46 for qemu-devel@nongnu.org; Fri, 02 Oct 2009 06:34:00 -0400 Received: from [199.232.76.173] (port=51010 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtfSU-00019G-0U for qemu-devel@nongnu.org; Fri, 02 Oct 2009 06:33:54 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:39077) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtfSS-0004OQ-G0 for qemu-devel@nongnu.org; Fri, 02 Oct 2009 06:33:52 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 9579949CFC; Fri, 2 Oct 2009 19:33:36 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MtfQc-0006kO-Rb; Fri, 02 Oct 2009 19:31:59 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Fri, 2 Oct 2009 19:31:55 +0900 Message-Id: <1254479517-25845-24-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254479517-25845-1-git-send-email-yamahata@valinux.co.jp> References: <1254479517-25845-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 23/25] pci: add helper function to initialize wmask. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org add helper function to initialize wmask. This will be used later. Signed-off-by: Isaku Yamahata --- hw/pci.c | 25 +++++++++++++++++++++++++ hw/pci.h | 4 ++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 2b3591b..13506d4 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -415,6 +415,31 @@ static void pci_config_alloc(PCIDevice *pci_dev) PCI_CONFIG_ALLOC(pci_dev, used, config_size); } +static void pci_conf_init(PCIDevice *d, uint32_t addr, uint32_t wmask, int len) +{ + int i; + + for (i = 0; i < len; i++) { + d->wmask[addr + i] = wmask & 0xff; + wmask >>= 8; + } +} + +void pci_conf_initb(PCIDevice *d, uint32_t addr, uint32_t wmask) +{ + pci_conf_init(d, addr, wmask, 1); +} + +void pci_conf_initw(PCIDevice *d, uint32_t addr, uint32_t wmask) +{ + pci_conf_init(d, addr, wmask, 2); +} + +void pci_conf_initl(PCIDevice *d, uint32_t addr, uint32_t wmask) +{ + pci_conf_init(d, addr, wmask, 4); +} + /* -1 for devfn means auto assign */ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, const char *name, int devfn, diff --git a/hw/pci.h b/hw/pci.h index be241b4..56285e2 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -255,6 +255,10 @@ struct PCIDevice { target_phys_addr_t msix_page_size; }; +void pci_conf_initb(PCIDevice *d, uint32_t addr, uint32_t wmask); +void pci_conf_initw(PCIDevice *d, uint32_t addr, uint32_t wmask); +void pci_conf_initl(PCIDevice *d, uint32_t addr, uint32_t wmask); + PCIDevice *pci_register_device(PCIBus *bus, const char *name, int instance_size, int devfn, PCIConfigReadFunc *config_read,