$NetBSD: patch-aa,v 1.1.1.1 2006/06/11 14:03:58 markd Exp $

--- 915resolution.c.orig	2006-06-06 22:55:58.000000000 +1200
+++ 915resolution.c
@@ -22,7 +22,18 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <fcntl.h>
+#ifdef __linux__
 #include <sys/io.h>
+#define OUTL(a, b)     outl(a, b)
+#define OUTB(a, b)     outb(a, b)
+#endif
+#ifdef __NetBSD__
+#include <machine/pio.h>
+#include <machine/sysarch.h>
+#define iopl(a) i386_iopl(a)
+#define OUTL(a, b)     outl(b, a)
+#define OUTB(a, b)     outb(b, a)
+#endif
 #include <unistd.h>
 #include <assert.h>
 
@@ -169,7 +180,7 @@ void initialize_system(char * filename) 
 }
 
 cardinal get_chipset_id(void) {
-    outl(0x80000000, 0xcf8);
+    OUTL(0x80000000, 0xcf8);
     return inl(0xcfc);
 }
 
@@ -476,11 +487,11 @@ void unlock_vbios(vbios_map * map) {
         case CT_UNKWN:
             break;
         case CT_855GM:
-            outl(0x8000005a, 0xcf8);
+            OUTL(0x8000005a, 0xcf8);
             map->b1 = inb(0xcfe);
             
-            outl(0x8000005a, 0xcf8);
-            outb(0x33, 0xcfe);
+            OUTL(0x8000005a, 0xcf8);
+            OUTB(0x33, 0xcfe);
             break;
         case CT_845G:
         case CT_865G:
@@ -488,13 +499,13 @@ void unlock_vbios(vbios_map * map) {
         case CT_915GM:
         case CT_945G:
         case CT_945GM:
-            outl(0x80000090, 0xcf8);
+            OUTL(0x80000090, 0xcf8);
             map->b1 = inb(0xcfd);
             map->b2 = inb(0xcfe);
             
-            outl(0x80000090, 0xcf8);
-            outb(0x33, 0xcfd);
-            outb(0x33, 0xcfe);
+            OUTL(0x80000090, 0xcf8);
+            OUTB(0x33, 0xcfd);
+            OUTB(0x33, 0xcfe);
             break;
         }
     }
@@ -526,8 +537,8 @@ void relock_vbios(vbios_map * map) {
         case CT_UNKWN:
             break;
         case CT_855GM:
-            outl(0x8000005a, 0xcf8);
-            outb(map->b1, 0xcfe);
+            OUTL(0x8000005a, 0xcf8);
+            OUTB(map->b1, 0xcfe);
             break;
         case CT_845G:
         case CT_865G:
@@ -535,9 +546,9 @@ void relock_vbios(vbios_map * map) {
         case CT_915GM:
         case CT_945G:
         case CT_945GM:
-            outl(0x80000090, 0xcf8);
-            outb(map->b1, 0xcfd);
-            outb(map->b2, 0xcfe);
+            OUTL(0x80000090, 0xcf8);
+            OUTB(map->b1, 0xcfd);
+            OUTB(map->b2, 0xcfe);
             break;
         }
     }
