/*
* 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);
}
/*
unsigned int tmp;
int res = 0;
- if (!intel_setup_io())
+ if (!conf12_setup_io(a))
{
a->debug("...no I/O permission");
return 0;
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;
}
struct pci_methods pm_intel_conf1 = {
- "Intel-conf1",
+ "intel-conf1",
+ "Raw I/O port access using Intel conf1 interface",
NULL, /* config */
conf1_detect,
conf12_init,
};
struct pci_methods pm_intel_conf2 = {
- "Intel-conf2",
+ "intel-conf2",
+ "Raw I/O port access using Intel conf2 interface",
NULL, /* config */
conf2_detect,
conf12_init,