#include "i386-io-sunos.h"
#elif defined(PCI_OS_WINDOWS)
#include "i386-io-windows.h"
+#elif defined(PCI_OS_CYGWIN)
+#include "i386-io-cygwin.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(void)
+conf12_setup_io(struct pci_access *a)
{
if (conf12_io_enabled < 0)
- conf12_io_enabled = intel_setup_io();
+ conf12_io_enabled = intel_setup_io(a);
return conf12_io_enabled;
}
static void
conf12_init(struct pci_access *a)
{
- if (!conf12_setup_io())
+ if (!conf12_setup_io(a))
a->error("No permission to access I/O ports (you probably have to be root).");
}
conf12_cleanup(struct pci_access *a UNUSED)
{
if (conf12_io_enabled > 0)
- conf12_io_enabled = intel_cleanup_io();
+ conf12_io_enabled = intel_cleanup_io(a);
}
/*
a->debug("...sanity check");
d.bus = 0;
d.func = 0;
- for(d.dev = 0; d.dev < 32; d.dev++)
+ for (d.dev = 0; d.dev < 32; d.dev++)
{
u16 class, vendor;
if (m->read(&d, PCI_CLASS_DEVICE, (byte *) &class, sizeof(class)) &&
unsigned int tmp;
int res = 0;
- if (!conf12_setup_io())
+ if (!conf12_setup_io(a))
{
a->debug("...no I/O permission");
return 0;
static int
conf2_detect(struct pci_access *a)
{
- if (!conf12_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,
pci_generic_fill_info,
conf1_read,
conf1_write,
+ NULL, /* read_vpd */
NULL, /* init_dev */
NULL /* cleanup_dev */
};
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,
pci_generic_fill_info,
conf2_read,
conf2_write,
+ NULL, /* read_vpd */
NULL, /* init_dev */
NULL /* cleanup_dev */
};