diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-09-17 02:59:35 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-09-17 02:59:35 +0000 |
| commit | 5ca251874f77e1a0a603d0d99e23ac447553efe6 (patch) | |
| tree | 8f8d76ebf1f6391aa2085668b4f974c52ddcd239 /sys/arch/macppc | |
| parent | 479f47cdf218fe0f9aee44841ada359ff5b96e4f (diff) | |
Until vgafb on macppc properly support non-console operation, do
not allow it to execute code which could panic the otherwise booting system.
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/pci/vgafb_pci.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/arch/macppc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c index 363aeb72ae0..0b58cfcc7e9 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.10 2002/09/15 09:01:59 deraadt Exp $ */ +/* $OpenBSD: vgafb_pci.c,v 1.11 2002/09/17 02:59:34 drahn Exp $ */ /* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */ /* @@ -225,11 +225,13 @@ 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 potential; int retval; +#endif + int potential; static int id = 0; int myid; @@ -271,6 +273,12 @@ 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? */ @@ -292,6 +300,8 @@ vgafb_pci_match(parent, match, aux) id++; return (1); +#endif + return (0); } void |