Fix versioned symbol aliases when used with link-time optimization

[pciutils.git] / lib / pci.h

diff --git a/lib/pci.h b/lib/pci.h
index 328a468a7bf918c13beccb30881a4b85d07cb3ca..5895dbcbb46062479fbd45b0e3de493c116075b3 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -16,7 +16,7 @@
 #include "header.h"
 #include "types.h"
 
-#define PCI_LIB_VERSION 0x030700
+#define PCI_LIB_VERSION 0x030900
 
 #ifndef PCI_ABI
 #define PCI_ABI
@@ -43,6 +43,11 @@ enum pci_access_type {
   PCI_ACCESS_DARWIN,                   /* Darwin */
   PCI_ACCESS_SYLIXOS_DEVICE,           /* SylixOS pci */
   PCI_ACCESS_HURD,                     /* GNU/Hurd */
+  PCI_ACCESS_WIN32_CFGMGR32,           /* Win32 cfgmgr32.dll */
+  PCI_ACCESS_WIN32_KLDBG,              /* Win32 kldbgdrv.sys */
+  PCI_ACCESS_WIN32_SYSDBG,             /* Win32 NT SysDbg */
+  PCI_ACCESS_MMIO_TYPE1,               /* MMIO ports, type 1 */
+  PCI_ACCESS_MMIO_TYPE1_EXT,           /* MMIO ports, type 1 extended */
   PCI_ACCESS_MAX
 };
 
@@ -82,6 +87,7 @@ struct pci_access {
   int fd_pos;                          /* proc/sys: current position */
   int fd_vpd;                          /* sys: fd for VPD */
   struct pci_dev *cached_dev;          /* proc/sys: device the fds are for */
+  void *aux;                           /* Auxiliary data for use by the back-end */
 };
 
 /* Initialize PCI access */
@@ -142,6 +148,13 @@ struct pci_dev {
   pciaddr_t flags[6];                  /* PCI_IORESOURCE_* flags for regions */
   pciaddr_t rom_flags;                 /* PCI_IORESOURCE_* flags for expansion ROM */
   int domain;                          /* PCI domain (host bridge) */
+  pciaddr_t bridge_base_addr[4];       /* Bridge base addresses (without flags) */
+  pciaddr_t bridge_size[4];            /* Bridge sizes */
+  pciaddr_t bridge_flags[4];           /* PCI_IORESOURCE_* flags for bridge addresses */
+  u8 prog_if, rev_id;                  /* Programming interface for device_class and revision id */
+  u16 subsys_vendor_id, subsys_id;     /* Subsystem vendor id and subsystem id */
+  struct pci_dev *parent;              /* Parent device, does not have to be always accessible */
+  int no_config_access;                        /* No access to config space for this device */
 
   /* Fields used internally */
   struct pci_access *access;
@@ -205,7 +218,12 @@ char *pci_get_string_property(struct pci_dev *d, u32 prop) PCI_ABI;
 #define PCI_FILL_IO_FLAGS      0x1000
 #define PCI_FILL_DT_NODE       0x2000          /* Device tree node */
 #define PCI_FILL_IOMMU_GROUP   0x4000
+#define PCI_FILL_BRIDGE_BASES  0x8000
 #define PCI_FILL_RESCAN                0x00010000
+#define PCI_FILL_CLASS_EXT     0x00020000      /* prog_if and rev_id */
+#define PCI_FILL_SUBSYS                0x00040000      /* subsys_vendor_id and subsys_id */
+#define PCI_FILL_PARENT                0x00080000
+#define PCI_FILL_DRIVER                0x00100000      /* OS driver currently in use (string property) */
 
 void pci_setup_cache(struct pci_dev *, u8 *cache, int len) PCI_ABI;
 
@@ -233,8 +251,11 @@ struct pci_cap *pci_find_cap_nr(struct pci_dev *, unsigned int id, unsigned int
 
 struct pci_filter {
   int domain, bus, slot, func;                 /* -1 = ANY */
-  int vendor, device, device_class;
-  int rfu[3];
+  int vendor, device;
+  int device_class;
+  unsigned int device_class_mask;              /* Which bits of the device_class are compared, default=all */
+  int prog_if;
+  int rfu[1];
 };
 
 void pci_filter_init(struct pci_access *, struct pci_filter *) PCI_ABI;