diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-05-24 14:14:01 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-05-24 14:14:01 +0000 |
commit | 0f1aba46fc25a15bcbc53898548b85ff8b5f8455 (patch) | |
tree | 05b115425a1a111e8076e7bcd284d1284d1be2a6 /lib/libpciaccess/src/common_init.c | |
parent | f091cb11ce9394593383465493467b328134bc42 (diff) |
Merge libpciaccess 0.10.2, including kettenis@ OpenBSD port.
Diffstat (limited to 'lib/libpciaccess/src/common_init.c')
-rw-r--r-- | lib/libpciaccess/src/common_init.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libpciaccess/src/common_init.c b/lib/libpciaccess/src/common_init.c index c16f98ada..ff241838b 100644 --- a/lib/libpciaccess/src/common_init.c +++ b/lib/libpciaccess/src/common_init.c @@ -35,7 +35,7 @@ #include "pciaccess.h" #include "pciaccess_private.h" -struct pci_system * pci_sys; +_pci_hidden struct pci_system * pci_sys; /** * Initialize the PCI subsystem for access. @@ -54,17 +54,24 @@ pci_system_init( void ) #ifdef linux err = pci_system_linux_sysfs_create(); -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) err = pci_system_freebsd_create(); #elif defined(__OpenBSD__) err = pci_system_openbsd_create(); #elif defined(__sun) - err = pci_system_solx_devfs_create(); + err = pci_system_solx_devfs_create(); #endif return err; } +void +pci_system_init_dev_mem(int fd) +{ +#ifdef __OpenBSD__ + pci_system_openbsd_init_dev_mem(fd); +#endif +} /** * Shutdown all access to the PCI subsystem. |