[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/12] ide: export needed ide-pci functions for spli
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 06/12] ide: export needed ide-pci functions for split |
Date: |
Wed, 7 Oct 2009 16:56:23 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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
--
1.6.2.5
- [Qemu-devel] [PATCH 00/12] PCI IDE cleanup, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 01/12] ide: change cast to DO_UPCAST, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 02/12] ide: Remove cast in pci_register_bar, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 03/12] ide: Remove duplicated definitions, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 04/12] ide: remove uselsess casts from void *, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 06/12] ide: export needed ide-pci functions for split,
Juan Quintela <=
- [Qemu-devel] [PATCH 05/12] ide: create ide/pci.h for common ide pci definitions, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 07/12] ide: split cmd646 and piix from pci.c, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 08/12] ide: PCIIDEState type field is not needed anymore, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 09/12] ide: 'secondary' field is only used by cmd646, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 10/12] ide: cmd646 we can get the pci device with container_of, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 12/12] ide: BMDMAState don't need a pci_dev field anymore, Juan Quintela, 2009/10/07
- [Qemu-devel] [PATCH 11/12] ide: cmd646 ->unit has just the value that we want, Juan Quintela, 2009/10/07