X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fi386-ports.c;h=072fac5fa602ffee8c98241c4f290a2caf0a1dfa;hb=c67775bc3e7a00bee392047d65e86218cda17a2c;hp=d491ad68320677c99f48dd42c1e73caafe072e4e;hpb=9007a292f24685d7c1ab51506fae8df22ced007f;p=pciutils.git

diff --git a/lib/i386-ports.c b/lib/i386-ports.c
index d491ad6..072fac5 100644
--- a/lib/i386-ports.c
+++ b/lib/i386-ports.c
@@ -20,6 +20,8 @@
 #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
@@ -27,17 +29,17 @@
 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).");
 }
 
@@ -45,7 +47,7 @@ static void
 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);
 }
 
 /*
@@ -67,7 +69,7 @@ intel_sanity_check(struct pci_access *a, struct pci_methods *m)
   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)) &&
@@ -95,7 +97,7 @@ conf1_detect(struct pci_access *a)
   unsigned int tmp;
   int res = 0;
 
-  if (!conf12_setup_io())
+  if (!conf12_setup_io(a))
     {
       a->debug("...no I/O permission");
       return 0;
@@ -172,7 +174,7 @@ conf1_write(struct pci_dev *d, int pos, byte *buf, int len)
 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;
@@ -253,7 +255,8 @@ conf2_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 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,
@@ -262,12 +265,14 @@ struct pci_methods pm_intel_conf1 = {
   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,
@@ -276,6 +281,7 @@ struct pci_methods pm_intel_conf2 = {
   pci_generic_fill_info,
   conf2_read,
   conf2_write,
+  NULL,					/* read_vpd */
   NULL,					/* init_dev */
   NULL					/* cleanup_dev */
 };