From patchwork Wed Oct 7 14:56:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35300 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 86C82B6F2B for ; Thu, 8 Oct 2009 02:14:50 +1100 (EST) Received: from localhost ([127.0.0.1]:34498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvYE3-0002Zm-Ii for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2009 11:14:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvXwt-000305-PW for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:57:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvXwo-0002tK-Go for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:57:02 -0400 Received: from [199.232.76.173] (port=55161 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvXwo-0002sn-2M for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:56:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61467) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvXwn-0003fW-Gp for qemu-devel@nongnu.org; Wed, 07 Oct 2009 10:56:57 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n97Euu3B010724 for ; Wed, 7 Oct 2009 10:56:56 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n97Eulns016943; Wed, 7 Oct 2009 10:56:55 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 7 Oct 2009 16:56:23 +0200 Message-Id: <85180c47321499758ad803cd58fdfdf48e976876.1254927186.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 06/12] ide: export needed ide-pci functions for split 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 Signed-off-by: Juan Quintela --- hw/ide/pci.c | 20 ++++++++++---------- hw/ide/pci.h | 10 ++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 3e1f53b..27d326c 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -71,7 +71,7 @@ static void ide_map(PCIDevice *pci_dev, int region_num, } } -static void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val) +void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val) { BMDMAState *bm = opaque; #ifdef DEBUG_IDE @@ -165,7 +165,7 @@ static void bmdma_writeb(void *opaque, uint32_t addr, uint32_t val) } } -static uint32_t bmdma_addr_readb(void *opaque, uint32_t addr) +uint32_t bmdma_addr_readb(void *opaque, uint32_t addr) { BMDMAState *bm = opaque; uint32_t val; @@ -176,7 +176,7 @@ static uint32_t bmdma_addr_readb(void *opaque, uint32_t addr) return val; } -static void bmdma_addr_writeb(void *opaque, uint32_t addr, uint32_t val) +void bmdma_addr_writeb(void *opaque, uint32_t addr, uint32_t val) { BMDMAState *bm = opaque; int shift = (addr & 3) * 8; @@ -188,7 +188,7 @@ static void bmdma_addr_writeb(void *opaque, uint32_t addr, uint32_t val) bm->cur_addr = bm->addr; } -static uint32_t bmdma_addr_readw(void *opaque, uint32_t addr) +uint32_t bmdma_addr_readw(void *opaque, uint32_t addr) { BMDMAState *bm = opaque; uint32_t val; @@ -199,7 +199,7 @@ static uint32_t bmdma_addr_readw(void *opaque, uint32_t addr) return val; } -static void bmdma_addr_writew(void *opaque, uint32_t addr, uint32_t val) +void bmdma_addr_writew(void *opaque, uint32_t addr, uint32_t val) { BMDMAState *bm = opaque; int shift = (addr & 3) * 8; @@ -211,7 +211,7 @@ static void bmdma_addr_writew(void *opaque, uint32_t addr, uint32_t val) bm->cur_addr = bm->addr; } -static uint32_t bmdma_addr_readl(void *opaque, uint32_t addr) +uint32_t bmdma_addr_readl(void *opaque, uint32_t addr) { BMDMAState *bm = opaque; uint32_t val; @@ -222,7 +222,7 @@ static uint32_t bmdma_addr_readl(void *opaque, uint32_t addr) return val; } -static void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val) +void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val) { BMDMAState *bm = opaque; #ifdef DEBUG_IDE @@ -260,7 +260,7 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num, } } -static void pci_ide_save(QEMUFile* f, void *opaque) +void pci_ide_save(QEMUFile* f, void *opaque) { PCIIDEState *d = opaque; int i; @@ -292,7 +292,7 @@ static void pci_ide_save(QEMUFile* f, void *opaque) } } -static int pci_ide_load(QEMUFile* f, void *opaque, int version_id) +int pci_ide_load(QEMUFile* f, void *opaque, int version_id) { PCIIDEState *d = opaque; int ret, i; @@ -329,7 +329,7 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id) return 0; } -static void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table) +void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table) { PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); static const int bus[4] = { 0, 0, 1, 1 }; diff --git a/hw/ide/pci.h b/hw/ide/pci.h index 7f3f297..063ae96 100644 --- a/hw/ide/pci.h +++ b/hw/ide/pci.h @@ -15,4 +15,14 @@ typedef struct PCIIDEState { uint32_t secondary; } PCIIDEState; +void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val); +uint32_t bmdma_addr_readb(void *opaque, uint32_t addr); +void bmdma_addr_writeb(void *opaque, uint32_t addr, uint32_t val); +uint32_t bmdma_addr_readw(void *opaque, uint32_t addr); +void bmdma_addr_writew(void *opaque, uint32_t addr, uint32_t val); +uint32_t bmdma_addr_readl(void *opaque, uint32_t addr); +void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val); +void pci_ide_save(QEMUFile* f, void *opaque); +int pci_ide_load(QEMUFile* f, void *opaque, int version_id); +void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table); #endif