diff options
| author | Niclas Zeising <zeising@daemonic.se> | 2019-06-13 17:36:35 +0200 |
|---|---|---|
| committer | Niclas Zeising <zeising@daemonic.se> | 2019-07-10 18:52:20 +0200 |
| commit | 735c8a5f6649d1b13fdc932f1b0b1e9e94512949 (patch) | |
| tree | 26157c131a5740ac58ff896792e5d205c2e24d5a | |
| parent | 4fef4d2978619e9f198a17176afc88ba27ff6ab7 (diff) | |
| download | xorg-lib-libpciaccess-735c8a5f6649d1b13fdc932f1b0b1e9e94512949.tar.gz | |
Don't check for struct pci_io.pi_sel.pc_domain
Autoconf has a check that pci_io.pi_sel.pc_domain exists. This is only
used on FreeBSD. pc_domain was added to pci_io.pi_sel on FreeBSD many
many releases ago, and exists on all current FreeBSD releases.
Remove the check, and the corresponding HAVE_PCI_IO_PC_DOMAIN, and
update the code to take into account that #ifdef HAVE_PCI_IO_PC_DOMAIN
is now always true.
Signed-off-by: Niclas Zeising <zeising@daemonic.se>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/freebsd_pci.c | 10 |
2 files changed, 0 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index e67623e..96f46a7 100644 --- a/configure.ac +++ b/configure.ac @@ -133,14 +133,6 @@ if test "x$have_mtrr_h" = xyes; then AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings]) fi -# check for the pci_io.pi_sel.pc_domain -AC_CHECK_MEMBER([struct pci_io.pi_sel.pc_domain], - [AC_DEFINE(HAVE_PCI_IO_PC_DOMAIN,1,[Have the pci_io.pi_sel.pc_domain member.])], - [], - [ #include <sys/types.h> - #include <sys/pciio.h> - ]) - AC_SUBST(PCIACCESS_CFLAGS) AC_SUBST(PCIACCESS_LIBS) diff --git a/src/freebsd_pci.c b/src/freebsd_pci.c index 6b660b1..c1f8e1e 100644 --- a/src/freebsd_pci.c +++ b/src/freebsd_pci.c @@ -187,9 +187,7 @@ pci_device_freebsd_read( struct pci_device * dev, void * data, { struct pci_io io; -#if HAVE_PCI_IO_PC_DOMAIN io.pi_sel.pc_domain = dev->domain; -#endif io.pi_sel.pc_bus = dev->bus; io.pi_sel.pc_dev = dev->dev; io.pi_sel.pc_func = dev->func; @@ -227,9 +225,7 @@ pci_device_freebsd_write( struct pci_device * dev, const void * data, { struct pci_io io; -#if HAVE_PCI_IO_PC_DOMAIN io.pi_sel.pc_domain = dev->domain; -#endif io.pi_sel.pc_bus = dev->bus; io.pi_sel.pc_dev = dev->dev; io.pi_sel.pc_func = dev->func; @@ -351,9 +347,7 @@ pci_device_freebsd_probe( struct pci_device * dev ) uint8_t irq; int err, i; -#if HAVE_PCI_IO_PC_DOMAIN bar.pbi_sel.pc_domain = dev->domain; -#endif bar.pbi_sel.pc_bus = dev->bus; bar.pbi_sel.pc_dev = dev->dev; bar.pbi_sel.pc_func = dev->func; @@ -789,11 +783,7 @@ pci_system_freebsd_create( void ) for ( i = 0; i < pciconfio.num_matches; i++ ) { struct pci_conf *p = &pciconf[ i ]; -#if HAVE_PCI_IO_PC_DOMAIN pci_sys->devices[ i ].base.domain = p->pc_sel.pc_domain; -#else - pci_sys->devices[ i ].base.domain = 0; -#endif pci_sys->devices[ i ].base.bus = p->pc_sel.pc_bus; pci_sys->devices[ i ].base.dev = p->pc_sel.pc_dev; pci_sys->devices[ i ].base.func = p->pc_sel.pc_func; |