From 18e08a55292a57b988df7fa14af2b4dd282a6486 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 11 Nov 2009 14:59:56 +0200 Subject: pci: pci.h cleanup: move out stuff not in pci.c pci.h declares some functions which aren't defined in pci.h. Clean up moving things to appropriate headers, and update all users. Signed-off-by: Michael S. Tsirkin --- hw/sh_pci.c | 1 + 1 file changed, 1 insertion(+) (limited to 'hw/sh_pci.c') diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 4277b01c9f..52dc02e1e7 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -24,6 +24,7 @@ #include "hw.h" #include "sh.h" #include "pci.h" +#include "sh_pci.h" #include "bswap.h" typedef struct { -- cgit 1.4.1 From b6243d991a4d073b2c8c16737fec9ee74274bfeb Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 12 Nov 2009 14:58:30 +0900 Subject: pci: move pci_data_{read, write}() declaration from pci.h to pci_host.h Now pci host stuff has been moved from pci.[hc] to pci_host.[hc] so the declaration of pci_data_{read, write}() should be in pci_host.h This patch moves them from pci.h to pci_host.h for consistency. Signed-off-by: Isaku Yamahata Signed-off-by: Michael S. Tsirkin --- hw/pci.h | 2 -- hw/pci_host.h | 3 +++ hw/sh_pci.c | 1 + hw/versatile_pci.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) (limited to 'hw/sh_pci.c') diff --git a/hw/pci.h b/hw/pci.h index 560da5074e..2f213524c5 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -293,8 +293,6 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, const char *default_devaddr); -void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); -uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); int pci_bus_num(PCIBus *s); void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDevice *d)); PCIBus *pci_find_host_bus(int domain); diff --git a/hw/pci_host.h b/hw/pci_host.h index e5e877f4cd..7cfa693563 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -36,6 +36,9 @@ typedef struct { PCIBus *bus; } PCIHostState; +void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); +uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); + /* for mmio */ int pci_host_config_register_io_memory(PCIHostState *s); int pci_host_config_register_io_memory_noswap(PCIHostState *s); diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 52dc02e1e7..abe4c7568b 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -24,6 +24,7 @@ #include "hw.h" #include "sh.h" #include "pci.h" +#include "pci_host.h" #include "sh_pci.h" #include "bswap.h" diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index a0d7d07ad2..153c6514f7 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -9,6 +9,7 @@ #include "sysbus.h" #include "pci.h" +#include "pci_host.h" typedef struct { SysBusDevice busdev; -- cgit 1.4.1