From 4f5e19e6c570459cd524b29b24374f03860f5149 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 30 Oct 2009 21:21:06 +0900 Subject: pci_host.h: move functions in pci_host.h into .c file. split static functions in pci_host.h into pci_host.c and pci_host_template.h. Later a structures declared in pci_host.h, PCIHostState, will be used. However pci_host.h doesn't allow to include itself easily. This patches addresses it. pci_host.h includes functions which are instantiated in .c by including pci_host.h with typedefing pci_addr_t. pci_addr_t is per pci host bridge and is typedef'ed to uint32_t for ioio or target_phys_addr_t for mmio in .c file. That prevents from including pci_host.h to use PCIHostState because of requiring type, pci_addr_t. Its purpose to include is to instantiate io function for mmio or ioio depending on which pci host bridge requires ioio or mmio. To avoid including code, we always instantiate both version. Signed-off-by: Isaku Yamahata Signed-off-by: Anthony Liguori --- hw/grackle_pci.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'hw/grackle_pci.c') diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index 1d522e272..1facdf08e 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -26,6 +26,7 @@ #include "sysbus.h" #include "ppc_mac.h" #include "pci.h" +#include "pci_host.h" /* debug Grackle */ //#define DEBUG_GRACKLE @@ -37,9 +38,6 @@ #define GRACKLE_DPRINTF(fmt, ...) #endif -typedef target_phys_addr_t pci_addr_t; -#include "pci_host.h" - typedef struct GrackleState { SysBusDevice busdev; PCIHostState host_state; @@ -84,18 +82,6 @@ static CPUReadMemoryFunc * const pci_grackle_config_read[] = { &pci_grackle_config_readl, }; -static CPUWriteMemoryFunc * const pci_grackle_write[] = { - &pci_host_data_writeb, - &pci_host_data_writew, - &pci_host_data_writel, -}; - -static CPUReadMemoryFunc * const pci_grackle_read[] = { - &pci_host_data_readb, - &pci_host_data_readw, - &pci_host_data_readl, -}; - /* Don't know if this matches real hardware, but it agrees with OHW. */ static int pci_grackle_map_irq(PCIDevice *pci_dev, int irq_num) { @@ -163,9 +149,7 @@ static int pci_grackle_init_device(SysBusDevice *dev) pci_mem_config = cpu_register_io_memory(pci_grackle_config_read, pci_grackle_config_write, s); - pci_mem_data = cpu_register_io_memory(pci_grackle_read, - pci_grackle_write, - &s->host_state); + pci_mem_data = pci_host_data_register_io_memory(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); @@ -184,9 +168,7 @@ static int pci_dec_21154_init_device(SysBusDevice *dev) pci_mem_config = cpu_register_io_memory(pci_grackle_config_read, pci_grackle_config_write, s); - pci_mem_data = cpu_register_io_memory(pci_grackle_read, - pci_grackle_write, - &s->host_state); + pci_mem_data = pci_host_data_register_io_memory(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); return 0; -- cgit v1.2.3