X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fi386-io-windows.h;h=6e3dec009afc2061f8e1497c3975a959305ed13a;hb=c4cf2d1c17594d333ccd819212756e3afb8b9924;hp=c875a7d1dcb8e29c6d94a6cedcce08f37d3b6c93;hpb=1c5cc9b5b323c84179cad9d90e86600d3c0cdfb6;p=pciutils.git

diff --git a/lib/i386-io-windows.h b/lib/i386-io-windows.h
index c875a7d..6e3dec0 100644
--- a/lib/i386-io-windows.h
+++ b/lib/i386-io-windows.h
@@ -2,14 +2,25 @@
  *	The PCI Library -- Access to i386 I/O ports on Windows
  *
  *	Copyright (c) 2004 Alexander Stock <stock.alexander@gmx.de>
+ *	Copyright (c) 2006 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
 #include <io.h>
-#include <conio.h>
 #include <windows.h>
 
+#ifndef __GNUC__
+#include <conio.h>
+#else
+int _outp(unsigned short port, int databyte);
+unsigned short _outpw(unsigned short port, unsigned short dataword);
+unsigned long _outpd(unsigned short port, unsigned long dataword);
+int _inp(unsigned short port);
+unsigned short _inpw(unsigned short port);
+unsigned long _inpd(unsigned short port);
+#endif
+
 #define outb(x,y) _outp(y,x)
 #define outw(x,y) _outpw(y,x)
 #define outl(x,y) _outpd(y,x)
@@ -18,49 +29,41 @@
 #define inw(x) _inpw(x)
 #define inl(x) _inpd(x)
 
-static int intel_iopl_set = -1;
-
 static int
-intel_setup_io(void)
+intel_setup_io(struct pci_access *a)
 {
-  if (intel_iopl_set < 0)
-    {
-      typedef int (*MYPROC)(void);
-      MYPROC InitializeWinIo;
-      HMODULE lib;
-
-      intel_iopl_set = 0;
-
-      lib = LoadLibrary("WinIo.dll");
-      if (!lib)
-	{
-	  fprintf(stderr, "libpci: Couldn't load WinIo.dll.\n");
-	  return 0;
-	}
-      /* XXX: Is this really needed? --mj */
-      GetProcAddress(lib, "InitializeWinIo");
+  typedef int (*MYPROC)(void);
+  MYPROC InitializeWinIo;
+  HMODULE lib;
 
-      InitializeWinIo = (MYPROC) GetProcAddress(lib, "InitializeWinIo");
-      if (!InitializeWinIo)
-	{
-	  fprintf(stderr, "libpci: Couldn't find InitializeWinIo function.\n");
-	  return 0;
-	}
+  lib = LoadLibrary("WinIo.dll");
+  if (!lib)
+    {
+      a->warning("i386-io-windows: Couldn't load WinIo.dll.");
+      return 0;
+    }
+  /* XXX: Is this really needed? --mj */
+  GetProcAddress(lib, "InitializeWinIo");
 
-      if (!InitializeWinIo())
-	{
-	  fprintf(stderr, "libpci: InitializeWinIo() failed.\n");
-	  return 0;
-	}
+  InitializeWinIo = (MYPROC) GetProcAddress(lib, "InitializeWinIo");
+  if (!InitializeWinIo)
+    {
+      a->warning("i386-io-windows: Couldn't find InitializeWinIo function.");
+      return 0;
+    }
 
-      intel_iopl_set = 1;
+  if (!InitializeWinIo())
+    {
+      a->warning("i386-io-windows: InitializeWinIo() failed.");
+      return 0;
     }
-  return intel_iopl_set;
+
+  return 1;
 }
 
-static inline void
-intel_cleanup_io(void)
+static inline int
+intel_cleanup_io(struct pci_access *a UNUSED)
 {
   //TODO: DeInitializeWinIo!
-  //intel_iopl_set = -1;
+  return 1;
 }