diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-10-30 21:21:06 +0900 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-11-09 08:43:07 -0600 |
| commit | 4f5e19e6c570459cd524b29b24374f03860f5149 (patch) | |
| tree | b49d6991170252767b1dff4673197f9e7b90f6d4 /hw/apb_pci.c | |
| parent | b3b1169731c976dfe8dc5b4b121cfc670abc84c9 (diff) | |
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 <yamahata@valinux.co.jp>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/apb_pci.c')
| -rw-r--r-- | hw/apb_pci.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 1ea3e0dc42..560617a1ae 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -28,6 +28,7 @@ #include "sysbus.h" #include "pci.h" +#include "pci_host.h" /* debug APB */ //#define DEBUG_APB @@ -48,9 +49,6 @@ do { printf("APB: " fmt , ## __VA_ARGS__); } while (0) * http://www.sun.com/processors/manuals/805-1251.pdf */ -typedef target_phys_addr_t pci_addr_t; -#include "pci_host.h" - typedef struct APBState { SysBusDevice busdev; PCIHostState host_state; @@ -145,18 +143,6 @@ static CPUReadMemoryFunc * const apb_config_read[] = { &apb_config_readl, }; -static CPUWriteMemoryFunc * const pci_apb_write[] = { - &pci_host_data_writeb, - &pci_host_data_writew, - &pci_host_data_writel, -}; - -static CPUReadMemoryFunc * const pci_apb_read[] = { - &pci_host_data_readb, - &pci_host_data_readw, - &pci_host_data_readl, -}; - static void pci_apb_iowriteb (void *opaque, target_phys_addr_t addr, uint32_t val) { @@ -293,8 +279,7 @@ static int pci_pbm_init_device(SysBusDevice *dev) pci_apb_config_write, s); sysbus_init_mmio(dev, 0x10ULL, pci_mem_config); /* mem_data */ - pci_mem_data = cpu_register_io_memory(pci_apb_read, - pci_apb_write, &s->host_state); + pci_mem_data = pci_host_data_register_io_memory(&s->host_state); sysbus_init_mmio(dev, 0x10000000ULL, pci_mem_data); return 0; } |