#define PCIADDR_PORT_FMT "%04lx"
#else
typedef unsigned long long u64;
-#define PCIADDR_T_FMT "%016Lx"
-#define PCIADDR_PORT_FMT "%04Lx"
+#define PCIADDR_T_FMT "%016llx"
+#define PCIADDR_PORT_FMT "%04llx"
#endif
typedef u64 pciaddr_t;
#else
enum pci_access_type {
/* Known access methods, remember to update access.c as well */
PCI_ACCESS_AUTO, /* Autodetection (params: none) */
+ PCI_ACCESS_SYS_BUS_PCI, /* Linux /sys/bus/pci (params: path) */
PCI_ACCESS_PROC_BUS_PCI, /* Linux /proc/bus/pci (params: path) */
PCI_ACCESS_I386_TYPE1, /* i386 ports, type 1 (params: none) */
PCI_ACCESS_I386_TYPE2, /* i386 ports, type 2 (params: none) */
/* Scanning of devices */
void pci_scan_bus(struct pci_access *acc);
-struct pci_dev *pci_get_dev(struct pci_access *acc, int bus, int dev, int func); /* Raw access to specified device */
+struct pci_dev *pci_get_dev(struct pci_access *acc, int domain, int bus, int dev, int func); /* Raw access to specified device */
void pci_free_dev(struct pci_dev *);
/*
struct pci_dev {
struct pci_dev *next; /* Next device in the chain */
- word bus; /* Higher byte can select host bridges */
- byte dev, func; /* Device and function */
+ u16 domain; /* PCI domain (host bridge) */
+ byte bus, dev, func; /* Bus inside domain, device and function */
/* These fields are set by pci_fill_info() */
int known_fields; /* Set of info fields already known */
/* Fields used internally: */
struct pci_access *access;
struct pci_methods *methods;
- byte *cache; /* Cached information */
+ byte *cache; /* Cached config registers */
int cache_len;
- int hdrtype; /* Direct methods: header type */
+ int hdrtype; /* Cached header type, -1 if unknown */
void *aux; /* Auxillary data */
};
*/
struct pci_filter {
- int bus, slot, func; /* -1 = ANY */
+ int domain, bus, slot, func; /* -1 = ANY */
int vendor, device;
};