Support ISA VGA for real on DEC AXPPCI 33

3 files changed, 19 insertions, 11 deletions

diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index 29b2fad7f88..4353ae5c120 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dec_axppci_33.c,v 1.6 1997/01/24 19:56:27 niklas Exp $	*/
+/*	$OpenBSD: dec_axppci_33.c,v 1.7 1997/11/04 22:07:42 niklas Exp $	*/
 /*	$NetBSD: dec_axppci_33.c,v 1.16 1996/11/25 03:59:20 cgd Exp $	*/
 
 /*
@@ -106,8 +106,10 @@ dec_axppci_33_cons_init()
 
 	case 3:
 		/* display console ... */
-		/* XXX */
-		if (ctb->ctb_turboslot == 0)
+#if 0
+		printf("turboslot 0x%x\n", ctb->ctb_turboslot);
+#endif
+		if ((ctb->ctb_turboslot & 0xffff) == 0)
 			isa_display_console(lcp->lc_iot, lcp->lc_memt);
 		else
 			pci_display_console(lcp->lc_iot, lcp->lc_memt,
diff --git a/sys/arch/alpha/isa/vga_isa.c b/sys/arch/alpha/isa/vga_isa.c
index 0b389854948..0c16194a3d6 100644
--- a/sys/arch/alpha/isa/vga_isa.c
+++ b/sys/arch/alpha/isa/vga_isa.c
@@ -76,6 +76,11 @@ vga_isa_match(parent, match, aux)
 {
 	struct isa_attach_args *ia = aux;
 	int rv;
+	static int matched;
+
+	/* There can be only one.  */
+	if (matched)
+		return (0);
 
 	/* If values are hardwired to something that they can't be, punt. */
 	if (ia->ia_iobase != IOBASEUNK || /* ia->ia_iosize != 0 || XXX isa.c */
@@ -84,16 +89,14 @@ vga_isa_match(parent, match, aux)
 	    ia->ia_irq != IRQUNK || ia->ia_drq != DRQUNK)
 		return (0);
 
-	if (vga_isa_console_tag)
-		return (1);
-
-	rv = vga_common_probe(ia->ia_iot, ia->ia_memt);
+	rv = vga_isa_console_tag || vga_common_probe(ia->ia_iot, ia->ia_memt);
 
 	if (rv) {
 		ia->ia_iobase = 0x3b0;
 		ia->ia_iosize = 0x30;
 		ia->ia_maddr = 0xb8000;
 		ia->ia_msize = 0x8000;
+		matched = 1;
 	}
 	return (rv);
 }
diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c
index 0b389854948..0c16194a3d6 100644
--- a/sys/dev/isa/vga_isa.c
+++ b/sys/dev/isa/vga_isa.c
@@ -76,6 +76,11 @@ vga_isa_match(parent, match, aux)
 {
 	struct isa_attach_args *ia = aux;
 	int rv;
+	static int matched;
+
+	/* There can be only one.  */
+	if (matched)
+		return (0);
 
 	/* If values are hardwired to something that they can't be, punt. */
 	if (ia->ia_iobase != IOBASEUNK || /* ia->ia_iosize != 0 || XXX isa.c */
@@ -84,16 +89,14 @@ vga_isa_match(parent, match, aux)
 	    ia->ia_irq != IRQUNK || ia->ia_drq != DRQUNK)
 		return (0);
 
-	if (vga_isa_console_tag)
-		return (1);
-
-	rv = vga_common_probe(ia->ia_iot, ia->ia_memt);
+	rv = vga_isa_console_tag || vga_common_probe(ia->ia_iot, ia->ia_memt);
 
 	if (rv) {
 		ia->ia_iobase = 0x3b0;
 		ia->ia_iosize = 0x30;
 		ia->ia_maddr = 0xb8000;
 		ia->ia_msize = 0x8000;
+		matched = 1;
 	}
 	return (rv);
 }