mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
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>
This commit is contained in:
parent
b3b1169731
commit
4f5e19e6c5
12 changed files with 208 additions and 217 deletions
|
@ -24,8 +24,6 @@
|
|||
|
||||
#include "hw.h"
|
||||
#include "pci.h"
|
||||
|
||||
typedef uint32_t pci_addr_t;
|
||||
#include "pci_host.h"
|
||||
|
||||
typedef PCIHostState PREPPCIState;
|
||||
|
@ -144,12 +142,7 @@ PCIBus *pci_prep_init(qemu_irq *pic)
|
|||
register_ioport_write(0xcf8, 4, 4, pci_prep_addr_writel, s);
|
||||
register_ioport_read(0xcf8, 4, 4, pci_prep_addr_readl, s);
|
||||
|
||||
register_ioport_write(0xcfc, 4, 1, pci_host_data_writeb, s);
|
||||
register_ioport_write(0xcfc, 4, 2, pci_host_data_writew, s);
|
||||
register_ioport_write(0xcfc, 4, 4, pci_host_data_writel, s);
|
||||
register_ioport_read(0xcfc, 4, 1, pci_host_data_readb, s);
|
||||
register_ioport_read(0xcfc, 4, 2, pci_host_data_readw, s);
|
||||
register_ioport_read(0xcfc, 4, 4, pci_host_data_readl, s);
|
||||
pci_host_data_register_ioport(0xcfc, s);
|
||||
|
||||
PPC_io_memory = cpu_register_io_memory(PPC_PCIIO_read,
|
||||
PPC_PCIIO_write, s);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue