Working with three different cards now. CL 5434, Diamond Stealth 64, and

Matrox Storm. _should_ be set up to support X, however no server available
yet.

3 files changed, 297 insertions, 184 deletions

diff --git a/sys/dev/ic/vgafb.c b/sys/dev/ic/vgafb.c
index b81d0d5098e..e8e71b761b9 100644
--- a/sys/dev/ic/vgafb.c
+++ b/sys/dev/ic/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.3 1998/09/28 01:10:34 rahnds Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.4 1998/10/09 02:00:51 rahnds Exp $	*/
 /*	$NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $	*/
 
 /*
@@ -76,27 +76,34 @@ int	vgafb_print __P((void *, const char *));
  * and attachment.
  */
 int
-vgafb_common_probe(iot, memt, iobase, membase, memsize)
+vgafb_common_probe(iot, memt, iobase, iosize, membase, memsize, mmiobase, mmiosize)
 	bus_space_tag_t iot, memt;
-	u_int32_t iobase, membase;
-	size_t memsize;
+	u_int32_t iobase, membase, mmiobase;
+	size_t iosize, memsize, mmiosize;
 {
-	bus_space_handle_t ioh_b, ioh_c, ioh_d, memh;
+	bus_space_handle_t ioh_b, ioh_c, ioh_d, memh, mmioh;
 	u_int16_t vgadata;
-	int gotio_b, gotio_c, gotio_d, gotmem, rv;
+	int gotio_b, gotio_c, gotio_d, gotmem, gotmmio, rv;
 	int width;
 
-	gotio_b = gotio_c = gotio_d = gotmem = rv = 0;
-
-	if (bus_space_map(iot, iobase+0x3b0, 0xc, 0, &ioh_b))
-		goto bad;
-	gotio_b = 1;
-	if (bus_space_map(iot, iobase+0x3c0, 0x10, 0, &ioh_c))
-		goto bad;
-	gotio_c = 1;
-	if (bus_space_map(iot, iobase+0x3d0, 0x10, 0, &ioh_d))
-		goto bad;
-	gotio_d = 1;
+	gotio_b = gotio_c = gotio_d = gotmem = gotmmio = rv = 0;
+
+	if (iosize != 0) {
+		if (bus_space_map(iot, iobase+0x3b0, 0xc, 0, &ioh_b))
+			goto bad;
+		gotio_b = 1;
+		if (bus_space_map(iot, iobase+0x3c0, 0x10, 0, &ioh_c))
+			goto bad;
+		gotio_c = 1;
+		if (bus_space_map(iot, iobase+0x3d0, 0x10, 0, &ioh_d))
+			goto bad;
+		gotio_d = 1;
+	}
+	if (mmiosize != 0) {
+		if (bus_space_map(iot, mmiobase, mmiosize, 0, &mmioh))
+			goto bad;
+		gotmmio = 1;
+	}
 	if (bus_space_map(memt, membase, memsize, 0, &memh))
 		goto bad;
 	gotmem = 1;
@@ -126,6 +133,8 @@ bad:
 		bus_space_unmap(iot, ioh_c, 0x10);
 	if (gotio_d)
 		bus_space_unmap(iot, ioh_d, 0x10);
+	if (gotmmio)
+		bus_space_unmap(memt, mmioh, mmiosize);
 	if (gotmem)
 		bus_space_unmap(memt, memh, memsize);
 
@@ -133,11 +142,11 @@ bad:
 }
 
 void
-vgafb_common_setup(iot, memt, vc, iobase, membase, memsize)
+vgafb_common_setup(iot, memt, vc, iobase, iosize, membase, memsize, mmiobase, mmiosize)
 	bus_space_tag_t iot, memt;
 	struct vgafb_config *vc;
-	u_int32_t iobase, membase;
-	size_t memsize;
+	u_int32_t iobase, membase, mmiobase;
+	size_t iosize, memsize, mmiosize;
 {
 	int cpos;
 	int width, height;
@@ -145,53 +154,65 @@ vgafb_common_setup(iot, memt, vc, iobase, membase, memsize)
         vc->vc_iot = iot;
         vc->vc_memt = memt;
 
-        if (bus_space_map(vc->vc_iot, iobase+0x3b0, 0xc, 0, &vc->vc_ioh_b))
-                panic("vgafb_common_setup: couldn't map io b");
-        if (bus_space_map(vc->vc_iot, iobase+0x3c0, 0x10, 0, &vc->vc_ioh_c))
-                panic("vgafb_common_setup: couldn't map io c");
-        if (bus_space_map(vc->vc_iot, iobase+0x3d0, 0x10, 0, &vc->vc_ioh_d))
-                panic("vgafb_common_setup: couldn't map io d");
+	if (iosize != 0) {
+           if (bus_space_map(vc->vc_iot, iobase+0x3b0, 0xc, 0, &vc->vc_ioh_b))
+		panic("vgafb_common_setup: couldn't map io b");
+           if (bus_space_map(vc->vc_iot, iobase+0x3c0, 0x10, 0, &vc->vc_ioh_c))
+		panic("vgafb_common_setup: couldn't map io c");
+           if (bus_space_map(vc->vc_iot, iobase+0x3d0, 0x10, 0, &vc->vc_ioh_d))
+		panic("vgafb_common_setup: couldn't map io d");
+	}
+	if (mmiosize != 0) {
+           if (bus_space_map(vc->vc_memt, mmiobase, mmiosize, 0, &vc->vc_mmioh))
+		panic("vgafb_common_setup: couldn't map mmio");
+	}
         if (bus_space_map(vc->vc_memt, membase, memsize, 0, &vc->vc_memh))
-                panic("vgafb_common_setup: couldn't map memory"); 
-
-	/* CR1 - Horiz. Display End */
-	bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x1);
-	width = bus_space_read_1(iot, vc->vc_ioh_d, 5);
-	/* (stored value + 1) * depth -> pixel width */
-	width = ( width + 1 ) * 8;   
-	vc->vc_ncol = width / FONT_WIDTH;
-
-	/* CR1 - Horiz. Display End */
-	bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x12);
-	{ 
-		u_int8_t t1, t2, t3;
+		panic("vgafb_common_setup: couldn't map memory"); 
+
+	printf("iosize %x\n", iosize);
+	if (iosize != 0) {
+		/* CR1 - Horiz. Display End */
+		bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x1);
+		width = bus_space_read_1(iot, vc->vc_ioh_d, 5);
+		printf (",w %d", width);
+		/* (stored value + 1) * depth -> pixel width */
+		width = ( width + 1 ) * 8;   
+
+		/* CR1 - Horiz. Display End */
 		bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x12);
-		t1 = bus_space_read_1(iot, vc->vc_ioh_d, 5);
-
-		bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x7);
-		t2 = bus_space_read_1(iot, vc->vc_ioh_d, 5);
-		height = t1 + ((t2&0x40) << 3) 
-			    + ((t2&0x02) << 7) + 1; 
-		bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x17);
-		t3 = bus_space_read_1(iot, vc->vc_ioh_d, 5);
-		if (t3 & 0x04) {
-			height *= 2;
+		{ 
+			u_int8_t t1, t2, t3;
+			bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x12);
+			t1 = bus_space_read_1(iot, vc->vc_ioh_d, 5);
+			printf (",t1 %d", t1);
+
+			bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x7);
+			t2 = bus_space_read_1(iot, vc->vc_ioh_d, 5);
+			printf (",t2 %d", t2);
+			height = t1 + ((t2&0x40) << 3) 
+				    + ((t2&0x02) << 7) + 1; 
+			bus_space_write_1(iot, vc->vc_ioh_d, 4, 0x17);
+			t3 = bus_space_read_1(iot, vc->vc_ioh_d, 5);
+			if (t3 & 0x04) {
+				height *= 2;
+			}
+			if (t1 == 0xff && t2 == 0xff && t3 == 0xff) {
+				/* iospace not working??? */
+				/* hope, better guess than 2048x2048 */
+				width = 640;
+				height = 480;
+			}
 		}
+		vc->vc_ncol = width / FONT_WIDTH;
+		vc->vc_nrow = height / FONT_HEIGHT;
+	} else {
+		/* iosize == 0
+		 * default to 640x480 and hope 
+		 */
+		vc->vc_ncol = 640 / FONT_WIDTH;
+		vc->vc_nrow = 480 / FONT_HEIGHT;
 	}
-	vc->vc_nrow = height / FONT_HEIGHT;
-
-#if 0
-	/* assume resolution is 640x480 */
-	vc->vc_nrow = 25;
-	vc->vc_ncol = 80;
-
-	bus_space_write_1(iot, vc->vc_ioh_d, VGA_IO_D_6845_ADDR, 14); 
-	cpos = bus_space_read_1(iot, vc->vc_ioh_d, VGA_IO_D_6845_DATA) << 8;
-	bus_space_write_1(iot, vc->vc_ioh_d, VGA_IO_D_6845_ADDR, 15);
-	cpos |= bus_space_read_1(iot, vc->vc_ioh_d, VGA_IO_D_6845_DATA);
-	vc->vc_crow = cpos / vc->vc_ncol;
-	vc->vc_ccol = cpos % vc->vc_ncol;
-#endif
+	printf(", %dx%d", vc->vc_ncol, vc->vc_nrow);
 
 	vc->vc_crow = vc->vc_ccol = 0; /* Has to be some onscreen value */
 	vc->vc_so = 0;
@@ -294,24 +315,38 @@ vgafbmmap(v, offset, prot)
 	bus_space_handle_t h;
 	u_int32_t *port;
 
-	if (offset >= 0x00000 && offset < 0x100000)	/* 1MB of mem */
+	/* memsize... */
+	if (offset >= 0x00000 && offset < 0x800000)	/* 8MB of mem??? */
 		h = vc->vc_memh + offset;
-	else if (offset >= 0x10000 && offset < 0x140000) /* 256KB of iohb */
+	else if (offset >= 0x10000000 && offset < 0x10040000 )
+		/* 256KB of iohb */
 		h = vc->vc_ioh_b;
-	else if (offset >= 0x140000 && offset < 0x180000) /* 256KB of iohc */
+	else if (offset >= 0x10040000 && offset < 0x10080000)
+		/* 256KB of iohc */
 		h = vc->vc_ioh_c;
-	else if (offset >= 0x180000 && offset < 0x1c0000) /* 256KB of iohd */
+	else if (offset >= 0x18880000 && offset < 0x100c0000)
+		/* 256KB of iohd */
 		h = vc->vc_ioh_d;
+	else if (offset >= 0x20000000 && offset < 0x30000000)
+		/* mmiosize... */
+		h = vc->vc_mmioh + (offset - 0x20000000);
 	else
 		return (-1);
 
-	port = (u_int32_t *)(h << 5);
 #ifdef alpha
+	port = (u_int32_t *)(h << 5);
 	return alpha_btop(port);		/* XXX */
 #elif defined(i386)
+	port = (u_int32_t *)(h << 5);
 	return i386_btop(port);
 #elif defined(__powerpc__)
+	{
+	/* huh ??? */
+	return h;
+	/*
 	return powerpc_btop(port);
+	*/
+	}
 #endif
 }
 
diff --git a/sys/dev/ic/vgafbvar.h b/sys/dev/ic/vgafbvar.h
index 4629a2ac337..9a2562e1452 100644
--- a/sys/dev/ic/vgafbvar.h
+++ b/sys/dev/ic/vgafbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafbvar.h,v 1.1 1998/09/27 03:55:59 rahnds Exp $	*/
+/*	$OpenBSD: vgafbvar.h,v 1.2 1998/10/09 02:00:52 rahnds Exp $	*/
 /*	$NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $	*/
 
 /*
@@ -33,7 +33,7 @@ struct vgafb_config {
 	 * Filled in by front-ends.
 	 */
 	bus_space_tag_t	vc_iot, vc_memt;
-	bus_space_handle_t vc_ioh_b, vc_ioh_c, vc_ioh_d, vc_memh;
+	bus_space_handle_t vc_ioh_b, vc_ioh_c, vc_ioh_d, vc_memh, vc_mmioh;
 
 	/*
 	 * Private to back-end.
@@ -51,10 +51,11 @@ struct vgafb_config {
 	
 };
 
-int	vgafb_common_probe __P((bus_space_tag_t, bus_space_tag_t, u_int32_t, 
-	    u_int32_t, size_t ));
+int	vgafb_common_probe __P((bus_space_tag_t, bus_space_tag_t,
+	u_int32_t, size_t, u_int32_t, size_t, u_int32_t, size_t ));
 void	vgafb_common_setup __P((bus_space_tag_t, bus_space_tag_t,
-	    struct vgafb_config *, u_int32_t, u_int32_t, size_t));
+	    struct vgafb_config *, u_int32_t, size_t, u_int32_t, size_t,
+	    u_int32_t, size_t));
 void	vgafb_wscons_attach __P((struct device *, struct vgafb_config *, int));
 void	vgafb_wscons_console __P((struct vgafb_config *));
 int	vgafbioctl __P((void *, u_long, caddr_t, int, struct proc *));
diff --git a/sys/dev/pci/vgafb_pci.c b/sys/dev/pci/vgafb_pci.c
index aeadf6b5332..5120c9924d8 100644
--- a/sys/dev/pci/vgafb_pci.c
+++ b/sys/dev/pci/vgafb_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb_pci.c,v 1.2 1998/09/27 05:29:59 rahnds Exp $	*/
+/*	$OpenBSD: vgafb_pci.c,v 1.3 1998/10/09 02:00:52 rahnds Exp $	*/
 /*	$NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $	*/
 
 /*
@@ -46,6 +46,9 @@
 #include <dev/ic/vgafbvar.h>
 #include <dev/pci/vgafb_pcivar.h>
 
+#define PCI_VENDORID(x) ((x) & 0xFFFF)
+#define PCI_CHIPID(x)   (((x) >> 16) & 0xFFFF)
+
 struct vgafb_pci_softc {
 	struct device sc_dev; 
  
@@ -70,6 +73,127 @@ struct cfattach vgafb_pci_ca = {
 pcitag_t vgafb_pci_console_tag;
 struct vgafb_config vgafb_pci_console_vc;
 
+#if 0
+#define DEBUG_VGAFB
+#endif
+
+int
+vgafb_pci_probe(pa, id, ioaddr, iosize, memaddr, memsize, cacheable, mmioaddr, mmiosize)
+	struct pci_attach_args *pa;
+	int id;
+	u_int32_t *ioaddr, *iosize;
+	u_int32_t *memaddr, *memsize, *cacheable;
+	u_int32_t *mmioaddr, *mmiosize;
+{
+	u_int32_t addr, size, tcacheable;
+	pci_chipset_tag_t pc = pa->pa_pc;
+	int retval;
+	int i;
+
+	*iosize   = 0x0;
+	*memsize  = 0x0;
+	*mmiosize = 0x0;
+	for (i = 0x10; i < 0x18; i += 4) {
+#ifdef DEBUG_VGAFB
+		printf("vgafb confread %x %x\n",
+			i, pci_conf_read(pc, pa->pa_tag, i));
+#endif
+		/* need to check more than just two base addresses? */
+		if (0x1 & pci_conf_read(pc, pa->pa_tag, i) ) {
+			retval = pci_io_find(pc, pa->pa_tag, i,
+				&addr, &size);
+			if (retval) {
+	printf("vgafb_pci_probe: io %x addr %x size %x\n", i, addr, size);
+				return 0;
+			}
+			if (*iosize == 0) {
+				*ioaddr = addr;
+				*iosize = size;
+			}
+
+		} else {
+			retval = pci_mem_find(pc, pa->pa_tag, i,
+				&addr, &size, &tcacheable);
+#ifdef DEBUG_VGAFB
+	printf("vgafb_pci_probe: mem %x addr %x size %x\n", i, addr, size);
+#endif
+
+			if (retval) {
+	printf("vgafb_pci_probe: mem %x addr %x size %x\n", i, addr, size);
+				return 0;
+			}
+			if (size == 0) {
+				/* ignore this entry */
+			}else if (size <= (64 * 1024)) {
+#ifdef DEBUG_VGAFB
+	printf("vgafb_pci_probe: mem %x addr %x size %x iosize %x\n",
+		i, addr, size, *iosize);
+#endif
+				if (*mmiosize == 0) {
+					/* this is mmio, not memory */
+					*mmioaddr = addr;
+					*mmiosize = size;
+					/* need skew in here for io memspace */
+				}
+			} else {
+				if (*memsize == 0) {
+					*memaddr = addr;
+					*memsize = size;
+					*cacheable = tcacheable;
+				}
+			}
+		}
+	}
+#ifdef DEBUG_VGAFB
+	printf("vgafb_pci_probe: id %x ioaddr %x, iosize %x, memaddr %x,\n memsize %x, mmioaddr %x, mmiosize %x\n",
+		id, *ioaddr, *iosize, *memaddr, *memsize, *mmioaddr, *mmiosize);
+#endif
+	if (*iosize == 0) {
+		if (id == 0) {
+#ifdef powerpc
+			/* this is only used if on openfirmware system and
+			 * the device does not have a iobase config register,
+			 * eg CirrusLogic 5434 VGA.  (they hardcode iobase to 0
+			 * thus giving standard PC addresses for the registers) 
+			 */
+			int s;
+			u_int32_t sizedata;
+
+			/*
+			 * Open Firmware (yuck) shuts down devices before
+			 * entering a program so we need to bring them back
+			 * 'online' to respond to bus accesses... so far
+			 * this is true on the power.4e.
+			 */
+			s = splhigh();
+			sizedata = pci_conf_read(pc, pa->pa_tag,
+				PCI_COMMAND_STATUS_REG);
+			sizedata |= (PCI_COMMAND_MASTER_ENABLE |
+				     PCI_COMMAND_IO_ENABLE |
+				     PCI_COMMAND_PARITY_ENABLE |
+				     PCI_COMMAND_SERR_ENABLE);
+			pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+				sizedata);
+			splx(s);
+
+#endif
+			/* if this is the first card, allow it
+			 * to be accessed in vga iospace
+			 */
+			*ioaddr = 0;
+			*iosize = 0x10000; /* 64k, good as any */
+		} else {
+			/* iospace not available, assume 640x480, pray */
+			*ioaddr = 0;
+			*iosize=0;
+		}
+	}
+#ifdef DEBUG_VGAFB
+	printf("vgafb_pci_probe: id %x ioaddr %x, iosize %x, memaddr %x,\n memsize %x, mmioaddr %x, mmiosize %x\n",
+		id, *ioaddr, *iosize, *memaddr, *memsize, *mmioaddr, *mmiosize);
+#endif
+	return 1;
+}
 int
 vgafb_pci_match(parent, match, aux)
 	struct device *parent;
@@ -81,9 +205,15 @@ vgafb_pci_match(parent, match, aux)
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
-	u_int32_t memaddr, memsize;
+	u_int32_t memaddr, memsize, cacheable;
 	u_int32_t ioaddr, iosize;
+	u_int32_t mmioaddr, mmiosize;
 	int potential;
+	int retval;
+	static int id = 0;
+	int myid;
+
+	myid = id;
 
 	potential = 0;
 
@@ -102,59 +232,41 @@ vgafb_pci_match(parent, match, aux)
 		return (0);
 
 	/* If it's the console, we have a winner! */
-	if (!bcmp(&pa->pa_tag, &vgafb_pci_console_tag, sizeof(pa->pa_tag)))
+	if (!bcmp(&pa->pa_tag, &vgafb_pci_console_tag, sizeof(pa->pa_tag))) {
+		id++;
 		return (1);
+	}
 
-	/*
-	 * If we might match, make sure that the card actually looks OK.
-	 */
-	memaddr=0xb8000; /* default to isa addresses? */
-	ioaddr = 0; 	 /* default to isa addresses? */
-	/* needs to do something like the mem_find
-	 * below in the ifdef powerpc code. 
-	 * should really be done in a machine independant way
-	 */
-#ifdef powerpc
+#ifdef DEBUG_VGAFB
 	{
-		int retval;
-		u_int32_t cacheable;
+	int i;
 		pci_chipset_tag_t pc = pa->pa_pc;
-
-		retval = pci_mem_find(pc, pa->pa_tag, 0x10,
-			&memaddr, &memsize, &cacheable);
-		if (retval) {
-			printf(": couldn't find memory region\n");
-			return 0;
+		for (i = 0x10; i < 0x24; i+=4) {
+			printf("vgafb confread %x %x\n",
+				i, pci_conf_read(pc, pa->pa_tag, i));
 		}
-#if 0
-		printf("vga pci_mem_find returned retval %x A %x S %x C%x\n",
-			retval, memaddr, memsize, cacheable);
+	}
 #endif
 
-{
-	int s;
-	u_int32_t sizedata;
-	/*
-	 * Open Firmware (yuck) shuts down devices before entering a
-	 * program so we need to bring them back 'online' to respond
-         * to bus accesses... so far this is true on the power.4e.
-         */
-	s = splhigh();
-	sizedata = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-	sizedata |= (PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE |
-		     PCI_COMMAND_PARITY_ENABLE | PCI_COMMAND_SERR_ENABLE);
-	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, sizedata);
-	splx(s);
-}
-		ioaddr = 0;
+	memaddr=0xb8000; /* default to isa addresses? */
+	ioaddr = 0; 	 /* default to isa addresses? */
+
+	retval = vgafb_pci_probe(pa, myid, &ioaddr, &iosize,
+		&memaddr, &memsize, &cacheable, &mmioaddr, &mmiosize);
+	if (retval == 0) {
+		return 0;
 	}
+#if 0
+	printf("ioaddr %x, iosize %x, memaddr %x, memsize %x mmioaddr %x mmiosize %x\n",
+		ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize);
 #endif
-	if (!vgafb_common_probe(pa->pa_iot, pa->pa_memt,
-		ioaddr, memaddr, memsize))
+
+	if (!vgafb_common_probe(pa->pa_iot, pa->pa_memt, ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize))
 	{
 		printf("vgafb_pci_match: common_probe failed\n");
 		return (0);
 	}
+	id++;
 
 	return (1);
 }
@@ -167,44 +279,18 @@ vgafb_pci_attach(parent, self, aux)
 	struct pci_attach_args *pa = aux;
 	struct vgafb_pci_softc *sc = (struct vgafb_pci_softc *)self;
 	struct vgafb_config *vc;
-	u_int32_t memaddr, memsize;
+	u_int32_t memaddr, memsize, cacheable;
 	u_int32_t ioaddr, iosize;
+	u_int32_t mmioaddr, mmiosize;
 	int console;
+	static int id = 0;
+	int myid;
 
-	memaddr=0xb8000; /* default to isa addresses? */
-	ioaddr = 0; 	 /* default to isa addresses? */
-#ifdef powerpc
-	{
-		int retval;
-		u_int32_t cacheable;
-		pci_chipset_tag_t pc = pa->pa_pc;
+	myid = id;
+
+	vgafb_pci_probe(pa, myid, &ioaddr, &iosize,
+		&memaddr, &memsize, &cacheable, &mmioaddr, &mmiosize);
 
-		retval = pci_mem_find(pc, pa->pa_tag, 0x10,
-			&memaddr, &memsize, &cacheable);
-		if (retval) {
-			printf(": couldn't find memory region\n");
-			return;
-		}
-	}
-	/* powerpc specific hack */
-{
-	int s;
-	u_int32_t sizedata;
-	pci_chipset_tag_t pc = pa->pa_pc;
-	/*
-	 * Open Firmware (yuck) shuts down devices before entering a
-	 * program so we need to bring them back 'online' to respond
-         * to bus accesses... so far this is true on the power.4e.
-         */
-	s = splhigh();
-	sizedata = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-	sizedata |= (PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE |
-		     PCI_COMMAND_PARITY_ENABLE | PCI_COMMAND_SERR_ENABLE);
-	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, sizedata);
-	splx(s);
-}
-	ioaddr = 0;
-#endif
 	console = (!bcmp(&pa->pa_tag, &vgafb_pci_console_tag, sizeof(pa->pa_tag)));
 	if (console)
 		vc = sc->sc_vc = &vgafb_pci_console_vc;
@@ -214,16 +300,23 @@ vgafb_pci_attach(parent, self, aux)
 
 		/* set up bus-independent VGA configuration */
 		vgafb_common_setup(pa->pa_iot, pa->pa_memt, vc, 
-		ioaddr, memaddr, memsize);
+		ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize);
 	}
 	vc->vc_mmap = vgafbpcimmap;
 	vc->vc_ioctl = vgafbpciioctl;
 
 	sc->sc_pcitag = pa->pa_tag;
 
+	if (iosize == 0) {
+		printf (", no io");
+	}
+	if (mmiosize != 0) {
+		printf (", mmio");
+	}
 	printf("\n");
 
 	vgafb_wscons_attach(self, vc, console);
+	id++;
 }
 
 void
@@ -233,47 +326,31 @@ vgafb_pci_console(iot, memt, pc, bus, device, function)
 	int bus, device, function;
 {
 	struct vgafb_config *vc = &vgafb_pci_console_vc;
-	u_int32_t memaddr, memsize;
-	u_int32_t ioaddr, iosize;
+	u_int32_t memaddr, memsize, mmioaddr;
+	u_int32_t ioaddr, iosize, mmiosize;
+	int retval;
+	u_int32_t cacheable;
+	static struct pci_attach_args spa;
+	struct pci_attach_args *pa = &spa;
 
 	/* for later recognition */
 	vgafb_pci_console_tag = pci_make_tag(pc, bus, device, function);
 
+	pa->pa_iot = iot;
+	pa->pa_memt = memt;
+	pa->pa_tag = vgafb_pci_console_tag;
+	/* 
+	pa->pa_pc = XXX;
+	 */
+
 /* XXX probe pci before pci bus config? */
-#if 0
-	int retval;
-	u_int32_t cacheable;
-	pci_chipset_tag_t pc = pa->pa_pc;
 
-	retval = pci_mem_find(pc, pa->pa_tag, 0x10,
-		&memaddr, &memsize, &cacheable);
-	if (retval) {
-		printf(": couldn't find memory region\n");
-		return 0;
-	}
-	printf("vga pci_mem_find returned retval %x A %x S %x C%x\n",
-		retval, memaddr, memsize, cacheable);
+	vgafb_pci_probe(pa, 0, &ioaddr, &iosize,
+		&memaddr, &memsize, &cacheable, mmioaddr, mmiosize);
 
-{
-	int s;
-	u_int32_t sizedata;
-	/*
-	 * Open Firmware (yuck) shuts down devices before entering a
-	 * program so we need to bring them back 'online' to respond
-         * to bus accesses... so far this is true on the power.4e.
-         */
-	s = splhigh();
-	sizedata = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-	sizedata |= (PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_IO_ENABLE |
-		     PCI_COMMAND_PARITY_ENABLE | PCI_COMMAND_SERR_ENABLE);
-	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, sizedata);
-	splx(s);
-}
-	ioaddr = 0;
-#endif
 
 	/* set up bus-independent VGA configuration */
-	vgafb_common_setup(iot, memt, vc, ioaddr, memaddr, memsize);
+	vgafb_common_setup(iot, memt, vc, ioaddr, iosize, memaddr, memsize, mmioaddr, mmiosize);
 
 	vgafb_wscons_console(vc);
 }
@@ -288,7 +365,7 @@ vgafbpciioctl(v, cmd, data, flag, p)
 {
 	struct vgafb_pci_softc *sc = v;
 
-	return (vgaioctl(sc->sc_vc, cmd, data, flag, p));
+	return (vgafbioctl(sc->sc_vc, cmd, data, flag, p));
 }
 
 int
@@ -299,5 +376,5 @@ vgafbpcimmap(v, offset, prot)
 {
 	struct vgafb_pci_softc *sc = v;
 
-	return (vgammap(sc->sc_vc, offset, prot));
+	return (vgafbmmap(sc->sc_vc, offset, prot));
 }