We need an MI vga driver. The alpha one was most MI. Not entirely yet though.

Some files were move behind CVS back.

5 files changed, 17 insertions, 10 deletions

diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 1891f8a18f4..b9bc16a5353 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vga.c,v 1.8 1997/08/25 08:26:43 deraadt Exp $	*/
+/*	$OpenBSD: vga.c,v 1.9 1997/11/06 02:53:41 niklas Exp $	*/
 /*	$NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
 #include <machine/bus.h>
 
 #include <alpha/wscons/wsconsvar.h>
-#include <alpha/dev/vgavar.h>
+#include <dev/ic/vgavar.h>
 
 #define	VGA_IO_D_6845_ADDR	0x4
 #define	VGA_IO_D_6845_DATA	0x5
@@ -248,7 +248,7 @@ vgammap(v, offset, prot)
 		return (-1);
 
 	port = (u_int32_t *)(h << 5);
-	return alpha_btop(port);
+	return alpha_btop(port);		/* XXX */
 }
 
 /*
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 9a80ce6adb6..b3a2a64f75d 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.34 1997/09/11 21:30:48 gene Exp $
+#	$OpenBSD: files.isa,v 1.35 1997/11/06 02:53:42 niklas Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config.new file and device description for machine-independent ISA code.
@@ -68,6 +68,10 @@ file	dev/isa/cy_isa.c		cy_isa
 attach	lpt at isa with lpt_isa
 file	dev/isa/lpt_isa.c		lpt_isa needs-flag
 
+# Generic VGA
+attach	vga at isa with vga_isa
+file	dev/isa/vga_isa.c		vga_isa	needs-flag
+
 #
 # SCSI host adapters
 #
diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c
index 0c16194a3d6..19890274ef7 100644
--- a/sys/dev/isa/vga_isa.c
+++ b/sys/dev/isa/vga_isa.c
@@ -37,9 +37,8 @@
 #include <machine/pte.h>
 
 #include <dev/isa/isavar.h>
-
-#include <alpha/dev/vgavar.h>
-#include <alpha/isa/vga_isavar.h>
+#include <dev/ic/vgavar.h>
+#include <dev/isa/vga_isavar.h>
 
 struct vga_isa_softc {
 	struct device sc_dev; 
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index cd7478d2c7e..16c07abb977 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.11 1997/07/03 07:22:54 deraadt Exp $
+#	$OpenBSD: files.pci,v 1.12 1997/11/06 02:53:43 niklas Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config.new file and device description for machine-independent PCI code.
@@ -10,6 +10,10 @@ attach	pci at pcibus
 file	dev/pci/pci.c			pci needs-flag
 file	dev/pci/pci_subr.c		pci
 
+# Generic VGA
+attach	vga at pci with vga_pci
+file	dev/pci/vga_pci.c		vga_pci	needs-flag
+
 # Adaptec 3940, 2940, and aic78[5678]0 SCSI controllers
 # device declaration in sys/conf/files
 attach	ahc at pci with ahc_pci
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 270751d482e..1b6c0be351d 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -42,8 +42,8 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <alpha/dev/vgavar.h>
-#include <alpha/pci/vga_pcivar.h>
+#include <dev/ic/vgavar.h>
+#include <dev/pci/vga_pcivar.h>
 
 struct vga_pci_softc {
 	struct device sc_dev;