The AGP ioctl interface is gone; remove the header file as well.

ok matthieu@

10 files changed, 35 insertions, 21 deletions

diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 8f079e27ab2..517e4b3b7ef 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agp.c,v 1.41 2014/03/17 04:10:59 jsg Exp $ */
+/* $OpenBSD: agp.c,v 1.42 2014/03/17 22:01:56 kettenis Exp $ */
 /*-
  * Copyright (c) 2000 Doug Rabson
  * All rights reserved.
@@ -29,9 +29,6 @@
 
 #include <sys/param.h>
 #include <sys/malloc.h>
-#include <sys/agpio.h>
-#include <sys/fcntl.h>
-#include <sys/ioctl.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index e41091d7d02..21b0a64ae60 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_ali.c,v 1.12 2010/08/07 18:15:38 oga Exp $	*/
+/*	$OpenBSD: agp_ali.c,v 1.13 2014/03/17 22:01:56 kettenis Exp $	*/
 /*	$NetBSD: agp_ali.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $	*/
 
 
@@ -37,7 +37,6 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/lock.h>
-#include <sys/agpio.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 2256fd2798e..1be5cff0bbc 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_amd.c,v 1.16 2010/08/07 19:32:44 oga Exp $	*/
+/*	$OpenBSD: agp_amd.c,v 1.17 2014/03/17 22:01:56 kettenis Exp $	*/
 /*	$NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 #include <sys/lock.h>
 #include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/agpio.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_apple.c b/sys/dev/pci/agp_apple.c
index 07662c72c86..ffb5db02336 100644
--- a/sys/dev/pci/agp_apple.c
+++ b/sys/dev/pci/agp_apple.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_apple.c,v 1.2 2012/12/22 19:17:36 mpi Exp $	*/
+/*	$OpenBSD: agp_apple.c,v 1.3 2014/03/17 22:01:56 kettenis Exp $	*/
 
 /*
  * Copyright (c) 2012 Martin Pieuchot <mpi@openbsd.org>
@@ -22,7 +22,6 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/agpio.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 80a14c8cfac..fb7339a660a 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_i810.c,v 1.83 2014/03/11 14:29:07 kettenis Exp $	*/
+/*	$OpenBSD: agp_i810.c,v 1.84 2014/03/17 22:01:56 kettenis Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -35,7 +35,6 @@
 #include <sys/lock.h>
 #include <sys/device.h>
 #include <sys/conf.h>
-#include <sys/agpio.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index 9cda91e0a14..5d6905ab898 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_sis.c,v 1.15 2010/08/07 18:09:09 oga Exp $	*/
+/*	$OpenBSD: agp_sis.c,v 1.16 2014/03/17 22:01:56 kettenis Exp $	*/
 /*	$NetBSD: agp_sis.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 #include <sys/lock.h>
 #include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/agpio.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index 33fab817af4..eb60a6a0d44 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_via.c,v 1.17 2011/10/16 01:11:31 dhill Exp $	*/
+/*	$OpenBSD: agp_via.c,v 1.18 2014/03/17 22:01:56 kettenis Exp $	*/
 /*	$NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 #include <sys/lock.h>
 #include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/agpio.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/agpreg.h b/sys/dev/pci/agpreg.h
index f8269c9292a..1d8924d58de 100644
--- a/sys/dev/pci/agpreg.h
+++ b/sys/dev/pci/agpreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agpreg.h,v 1.17 2012/12/22 19:17:36 mpi Exp $	*/
+/*	$OpenBSD: agpreg.h,v 1.18 2014/03/17 22:01:56 kettenis Exp $	*/
 /*	$NetBSD: agpreg.h,v 1.1 2001/09/10 10:01:02 fvdl Exp $	*/
 
 /*-
@@ -33,6 +33,12 @@
 #define _PCI_AGPREG_H_
 
 /*
+ * The AGP gatt uses 4k pages irrespective of the host page size.
+ */
+#define AGP_PAGE_SIZE		4096
+#define AGP_PAGE_SHIFT		12
+
+/*
  * Offsets for various AGP configuration registers.
  */
 #define AGP_APBASE			0x10
@@ -50,6 +56,25 @@
 #define AGP_COMMAND			0x8
 
 /*
+ * Macros to manipulate AGP mode words.
+ */
+#define AGP_MODE_GET_RQ(x)		(((x) & 0xff000000U) >> 24)
+#define AGP_MODE_GET_SBA(x)		(((x) & 0x00000200U) >> 9)
+#define AGP_MODE_GET_AGP(x)		(((x) & 0x00000100U) >> 8)
+#define AGP_MODE_GET_4G(x)		(((x) & 0x00000020U) >> 5)
+#define AGP_MODE_GET_FW(x)		(((x) & 0x00000010U) >> 4)
+#define AGP_MODE_GET_RATE(x)		((x) & 0x00000007U)
+#define AGP_MODE_SET_RQ(x,v)		(((x) & ~0xff000000U) | ((v) << 24))
+#define AGP_MODE_SET_SBA(x,v)		(((x) & ~0x00000200U) | ((v) << 9))
+#define AGP_MODE_SET_AGP(x,v)		(((x) & ~0x00000100U) | ((v) << 8))
+#define AGP_MODE_SET_4G(x,v)		(((x) & ~0x00000020U) | ((v) << 5))
+#define AGP_MODE_SET_FW(x,v)		(((x) & ~0x00000010U) | ((v) << 4))
+#define AGP_MODE_SET_RATE(x,v)		(((x) & ~0x00000007U) | (v))
+#define AGP_MODE_RATE_1x		0x00000001
+#define AGP_MODE_RATE_2x		0x00000002
+#define AGP_MODE_RATE_4x		0x00000004
+
+/*
  * Config offsets for Intel AGP chipsets.
  */
 /* i840/850/850E */
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 2de65ae06e6..fe97d0a8d87 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: drmP.h,v 1.170 2014/03/13 12:45:04 kettenis Exp $ */
+/* $OpenBSD: drmP.h,v 1.171 2014/03/17 22:01:56 kettenis Exp $ */
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
  */
@@ -58,7 +58,6 @@
 #include <sys/endian.h>
 #include <sys/mman.h>
 #include <sys/stdint.h>
-#include <sys/agpio.h>
 #include <sys/memrange.h>
 #include <sys/extent.h>
 #include <sys/vnode.h>
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index cedad32b2df..e8ae8f734c1 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_pci.c,v 1.74 2013/12/06 21:03:04 deraadt Exp $ */
+/* $OpenBSD: vga_pci.c,v 1.75 2014/03/17 22:01:56 kettenis Exp $ */
 /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
 
 /*
@@ -73,7 +73,6 @@
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/agpio.h>
 
 #include <uvm/uvm.h>