Move PCI_DEVFN(), PCI_BUS(), PCI_SLOT(), and PCI_FUNC() to pci.h. Signed-off-by: Jason Thorpe <thor...@me.com> --- pci.c | 4 ---- pci.h | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pci.c b/pci.c index 87a101c..ba05adb 100644 --- a/pci.c +++ b/pci.c @@ -31,10 +31,6 @@ #include "pci_regs.h" -#define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) -#define PCI_BUS(devfn) ((devfn) >> 8) -#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) -#define PCI_FUNC(devfn) ((devfn) & 0x07) #define PCI_SLOT_MAX 32 #define PCI_FUNC_MAX 8 #define PCI_REGION_ROM 6 diff --git a/pci.h b/pci.h index b751c6f..b4a4f80 100644 --- a/pci.h +++ b/pci.h @@ -60,6 +60,11 @@ extern void pci_config_maskw(int bdf, int addr, uint16_t off, uint16_t on); extern int pci_next(int bdf, int *pmax); +#define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) +#define PCI_BUS(devfn) ((devfn) >> 8) +#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) +#define PCI_FUNC(devfn) ((devfn) & 0x07) + #define foreachpci(BDF, MAX) \ for (MAX = 0x0100, BDF = pci_next(0, &MAX); \ BDF >= 0; \ -- 2.30.2