X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fi386-io-windows.h;h=e2492df71a73e6c4f1c1b53f3332065aca928ee9;hb=8e6f2fcd2580894419c2807f8c1c5a8630a7d644;hp=7006aa5cc1ceee33fda661e8cd304605bfe42f0c;hpb=837511b78ce0f1831353ac67f6a6b9a918aa4015;p=pciutils.git

diff --git a/lib/i386-io-windows.h b/lib/i386-io-windows.h
index 7006aa5..e2492df 100644
--- a/lib/i386-io-windows.h
+++ b/lib/i386-io-windows.h
@@ -2,64 +2,87 @@
  *	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)
-  
+
 #define inb(x) _inp(x)
 #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;
+  typedef int (*MYPROC)(void);
+  MYPROC InitializeWinIo;
+  HMODULE lib;
 
-      intel_iopl_set = 0;
+#ifndef _WIN64
+  /* 16/32-bit non-NT systems allow applications to access PCI I/O ports without any special setup. */
+  OSVERSIONINFOA version;
+  version.dwOSVersionInfoSize = sizeof(version);
+  if (GetVersionExA(&version) && version.dwPlatformId < VER_PLATFORM_WIN32_NT)
+    {
+      a->debug("Detected 16/32-bit non-NT system, skipping NT setup...");
+      return 1;
+    }
+#endif
 
-      lib = LoadLibrary("WinIo.dll");
-      if (!lib)
-	{
-	  fprintf(stderr, "libpci: Couldn't load WinIo.dll.\n");
-	  return 0;
-	}
-      GetProcAddress(lib, "InitializeWinIo");
-  
-      InitializeWinIo = (MYPROC) GetProcAddress(lib, "InitializeWinIo");
-      if (!InitializeWinIo)
-	{
-	  fprintf(stderr, "libpci: Couldn't find InitialieWinIo 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;
+}
+
+static inline void intel_io_lock(void)
+{
+}
+
+static inline void intel_io_unlock(void)
+{
 }