pci: pci.h cleanup: move out stuff not in pci.c
PATCH 1/1 pci: pci.h cleanup: move out stuff not in pci.c
pci.h declares some functions/macros which aren't defined in pci.h. Clean up, moving things to appropriate headers, and update all users.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/apb_pci.c | 1 + hw/apb_pci.h | 9 +++++++++ hw/lsi53c895a.c | 2 ++ hw/mips_malta.c | 2 ++ hw/pc.c | 5 +++++ hw/pci.h | 25 ------------------------- hw/ppc_newworld.c | 1 + hw/ppc_oldworld.c | 1 + hw/ppc_prep.c | 2 ++ hw/prep_pci.c | 1 + hw/prep_pci.h | 8 ++++++++ hw/r2d.c | 1 + hw/realview.c | 1 + hw/sh_pci.c | 1 + hw/sh_pci.h | 9 +++++++++ hw/sun4u.c | 1 + hw/usb-ohci.c | 1 + hw/usb-ohci.h | 9 +++++++++ hw/usb-uhci.c | 1 + hw/usb-uhci.h | 9 +++++++++ hw/versatilepb.c | 1 + hw/vmware_vga.c | 1 + hw/vmware_vga.h | 9 +++++++++ 23 files changed, 76 insertions(+), 25 deletions(-) create mode 100644 hw/apb_pci.h create mode 100644 hw/prep_pci.h create mode 100644 hw/sh_pci.h create mode 100644 hw/usb-ohci.h create mode 100644 hw/usb-uhci.h create mode 100644 hw/vmware_vga.h
hw/apb_pci.c +1 -0
@@ -29,6 +29,7 @@#include "sysbus.h" #include "pci.h" #include "pci_host.h" +#include "apb_pci.h" /* debug APB */ //#define DEBUG_APB
hw/apb_pci.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef APB_PCI_H +#define APB_PCI_H + +#include "qemu-common.h" + +PCIBus *pci_apb_init (target_phys_addr_t special_base, +target_phys_addr_t mem_base, +qemu_irq *pic,PCIBus **bus2,PCIBus **bus3); +#endif
hw/lsi53c895a.c +2 -0
@@ -31,6 +31,8 @@ do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__); exit(1);} while do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__);} while (0)#endif +#define LSI_MAX_DEVS 7 +#define LSI_SCNTL0_TRG 0x01#define LSI_SCNTL0_AAP 0x02#define LSI_SCNTL0_EPC 0x08
hw/mips_malta.c +2 -0
@@ -32,6 +32,8 @@#include "flash.h" #include "mips.h" #include "pci.h" +#include "usb-uhci.h" +#include "vmware_vga.h" #include "qemu-char.h" #include "sysemu.h" #include "audio/audio.h"
hw/pc.c +5 -0
@@ -25,6 +25,11 @@#include "pc.h" #include "fdc.h" #include "pci.h" +#include "vmware_vga.h" +#include "usb-uhci.h" +#include "usb-ohci.h" +#include "prep_pci.h" +#include "apb_pci.h" #include "block.h" #include "sysemu.h" #include "audio/audio.h"
hw/pci.h +0 -25
@@ -414,31 +414,6 @@ static inline uint32_t pci_config_size(PCIDevice *d)return pci_is_express (d) ?PCIE_CONFIG_SPACE_SIZE :PCI_CONFIG_SPACE_SIZE ; } -/* lsi53c895a.c */ -#define LSI_MAX_DEVS 7 - -/* vmware_vga.c */ -void pci_vmsvga_init (PCIBus *bus); - -/* usb-uhci.c */ -void usb_uhci_piix3_init (PCIBus *bus,int devfn); -void usb_uhci_piix4_init (PCIBus *bus,int devfn); - -/* usb-ohci.c */ -void usb_ohci_init_pci (struct PCIBus *bus,int devfn); - -/* prep_pci.c */ -PCIBus *pci_prep_init (qemu_irq *pic); - -/* apb_pci.c */ -PCIBus *pci_apb_init (target_phys_addr_t special_base, -target_phys_addr_t mem_base, -qemu_irq *pic,PCIBus **bus2,PCIBus **bus3); - -/* sh_pci.c */ -PCIBus *sh_pci_register_bus (pci_set_irq_fn set_irq,pci_map_irq_fn map_irq, -void *pic,int devfn_min,int nirq); -/* These are not pci specific. Should move into a separate header. * Only pci.c uses them, so keep them here for now. */
hw/ppc_newworld.c +1 -0
@@ -29,6 +29,7 @@#include "nvram.h" #include "pc.h" #include "pci.h" +#include "usb-ohci.h" #include "net.h" #include "sysemu.h" #include "boards.h"
hw/ppc_oldworld.c +1 -0
@@ -32,6 +32,7 @@#include "net.h" #include "isa.h" #include "pci.h" +#include "usb-ohci.h" #include "boards.h" #include "fw_cfg.h" #include "escc.h"
hw/ppc_prep.c +2 -0
@@ -29,6 +29,8 @@#include "sysemu.h" #include "isa.h" #include "pci.h" +#include "prep_pci.h" +#include "usb-ohci.h" #include "ppc.h" #include "boards.h" #include "qemu-log.h"
hw/prep_pci.c +1 -0
@@ -25,6 +25,7 @@#include "hw.h" #include "pci.h" #include "pci_host.h" +#include "prep_pci.h" typedef PCIHostState PREPPCIState ;
hw/prep_pci.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef QEMU_PREP_PCI_H +#define QEMU_PREP_PCI_H + +#include "qemu-common.h" + +PCIBus *pci_prep_init (qemu_irq *pic); + +#endif
hw/r2d.c +1 -0
@@ -29,6 +29,7 @@#include "sysemu.h" #include "boards.h" #include "pci.h" +#include "sh_pci.h" #include "net.h" #include "sh7750_regs.h" #include "ide.h"
hw/realview.c +1 -0
@@ -12,6 +12,7 @@#include "primecell.h" #include "devices.h" #include "pci.h" +#include "usb-ohci.h" #include "net.h" #include "sysemu.h" #include "boards.h"
hw/sh_pci.c +1 -0
@@ -24,6 +24,7 @@#include "hw.h" #include "sh.h" #include "pci.h" +#include "sh_pci.h" #include "bswap.h" typedef struct {
hw/sh_pci.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef QEMU_SH_PCI_H +#define QEMU_SH_PCI_H + +#include "qemu-common.h" + +PCIBus *sh_pci_register_bus (pci_set_irq_fn set_irq,pci_map_irq_fn map_irq, +void *pic,int devfn_min,int nirq); + +#endif
hw/sun4u.c +1 -0
@@ -23,6 +23,7 @@*/ #include "hw.h" #include "pci.h" +#include "apb_pci.h" #include "pc.h" #include "nvram.h" #include "fdc.h"
hw/usb-ohci.c +1 -0
@@ -32,6 +32,7 @@#include "pci.h" #include "pxa.h" #include "devices.h" +#include "usb-ohci.h" //#define DEBUG_OHCI /* Dump packet contents. */
hw/usb-ohci.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef QEMU_USB_OHCI_H +#define QEMU_USB_OHCI_H + +#include "qemu-common.h" + +void usb_ohci_init_pci (struct PCIBus *bus,int devfn); + +#endif +
hw/usb-uhci.c +1 -0
@@ -29,6 +29,7 @@#include "usb.h" #include "pci.h" #include "qemu-timer.h" +#include "usb-uhci.h" //#define DEBUG //#define DEBUG_DUMP_DATA
hw/usb-uhci.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef QEMU_USB_UHCI_H +#define QEMU_USB_UHCI_H + +#include "qemu-common.h" + +void usb_uhci_piix3_init (PCIBus *bus,int devfn); +void usb_uhci_piix4_init (PCIBus *bus,int devfn); + +#endif
hw/versatilepb.c +1 -0
@@ -14,6 +14,7 @@#include "net.h" #include "sysemu.h" #include "pci.h" +#include "usb-ohci.h" #include "boards.h" /* Primary interrupt controller. */
hw/vmware_vga.c +1 -0
@@ -24,6 +24,7 @@#include "hw.h" #include "console.h" #include "pci.h" +#include "vmware_vga.h" #define VERBOSE #undef DIRECT_VRAM
hw/vmware_vga.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef QEMU_VMWARE_VGA_H +#define QEMU_VMWARE_VGA_H + +#include "qemu-common.h" + +/* vmware_vga.c */ +void pci_vmsvga_init (PCIBus *bus); + +#endif
Signature · 1 line
1.6.5.2.143.g8cc62