Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git

[pciutils.git] / lib / i386-ports.c

diff --git a/lib/i386-ports.c b/lib/i386-ports.c
index f225d248179958ae10c1580c5872f4a6ca743128..4b51c8818f097e67bbbe4e864fc82156c67e461e 100644 (file)
--- a/lib/i386-ports.c
+++ b/lib/i386-ports.c
@@ -1,38 +1,51 @@
 /*
  *     The PCI Library -- Direct Configuration access via i386 Ports
  *
- *     Copyright (c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *     Copyright (c) 1997--2006 Martin Mares <mj@ucw.cz>
  *
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#include <unistd.h>
+#define _GNU_SOURCE
 
 #include "internal.h"
 
-#if defined(OS_LINUX)
+#include <unistd.h>
+
+#if defined(PCI_OS_LINUX)
 #include "i386-io-linux.h"
-#elif defined(OS_GNU)
+#elif defined(PCI_OS_GNU)
 #include "i386-io-hurd.h"
-#elif defined(OS_SUNOS)
+#elif defined(PCI_OS_SUNOS)
 #include "i386-io-sunos.h"
-#elif defined(OS_WINDOWS)
+#elif defined(PCI_OS_WINDOWS)
 #include "i386-io-windows.h"
 #else
 #error Do not know how to access I/O ports on this OS.
 #endif
 
+static int conf12_io_enabled = -1;             /* -1=haven't tried, 0=failed, 1=succeeded */
+
+static int
+conf12_setup_io(struct pci_access *a)
+{
+  if (conf12_io_enabled < 0)
+    conf12_io_enabled = intel_setup_io(a);
+  return conf12_io_enabled;
+}
+
 static void
 conf12_init(struct pci_access *a)
 {
-  if (!intel_setup_io())
-    a->error("You need to be root to have access to I/O ports.");
+  if (!conf12_setup_io(a))
+    a->error("No permission to access I/O ports (you probably have to be root).");
 }
 
 static void
 conf12_cleanup(struct pci_access *a UNUSED)
 {
-  intel_cleanup_io();
+  if (conf12_io_enabled > 0)
+    conf12_io_enabled = intel_cleanup_io(a);
 }
 
 /*
@@ -82,7 +95,7 @@ conf1_detect(struct pci_access *a)
   unsigned int tmp;
   int res = 0;
 
-  if (!intel_setup_io())
+  if (!conf12_setup_io(a))
     {
       a->debug("...no I/O permission");
       return 0;
@@ -159,7 +172,7 @@ conf1_write(struct pci_dev *d, int pos, byte *buf, int len)
 static int
 conf2_detect(struct pci_access *a)
 {
-  if (!intel_setup_io())
+  if (!conf12_setup_io(a))
     {
       a->debug("...no I/O permission");
       return 0;