summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-03-15 20:46:16 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-03-15 20:46:16 +0000
commit5948f6a3e9f6d25f3f6cff3c7e4f989003bb5333 (patch)
tree85ab6274bbd24a99979c5c21b55575aef9071b42 /sys/arch
parent5d566994237591142b6ec4faf4cc9550660081e2 (diff)
Remove dead code (SUPPORTS_NON_CONSOLE and MD_DISPLAY_ISA_IOT)
ok miod@, drahn@, dim@.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/macppc/pci/vgafb_pci.c36
1 files changed, 1 insertions, 35 deletions
diff --git a/sys/arch/macppc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c
index ab7b6781a3c..9efc3ba93cf 100644
--- a/sys/arch/macppc/pci/vgafb_pci.c
+++ b/sys/arch/macppc/pci/vgafb_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafb_pci.c,v 1.16 2006/01/02 05:21:32 brad Exp $ */
+/* $OpenBSD: vgafb_pci.c,v 1.17 2006/03/15 20:46:15 matthieu Exp $ */
/* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */
/*
@@ -230,12 +230,6 @@ vgafb_pci_match(parent, match, aux)
void *aux;
{
struct pci_attach_args *pa = aux;
-#ifdef SUPPORTS_NON_CONSOLE
- u_int32_t memaddr, memsize, cacheable;
- u_int32_t ioaddr, iosize;
- u_int32_t mmioaddr, mmiosize;
- int retval;
-#endif
int potential;
static int id = 0;
int myid;
@@ -278,34 +272,6 @@ vgafb_pci_match(parent, match, aux)
}
#endif
-#ifdef SUPPORTS_NON_CONSOLE
- /* ALL non-console vga support removed for now.
- * when the problems with it are resolved,
- * it can be reenabled.
- */
-
- 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 1
- 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, iosize, memaddr, memsize, mmioaddr, mmiosize))
- {
- printf("vgafb_pci_match: common_probe failed\n");
- return (0);
- }
- id++;
-
- return (1);
-#endif
return (0);
}