Commit 735c8a5f authored by Niclas Zeising's avatar Niclas Zeising
Browse files

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's avatarNiclas Zeising <zeising@daemonic.se>
parent 4fef4d29
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment