diff options
| author | briggs <briggs@cvs.openbsd.org> | 1996-09-21 04:03:59 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1996-09-21 04:03:59 +0000 |
| commit | d727411f9d2d881dab4610b22b7eabf30474cf3f (patch) | |
| tree | 590978cd63de987b552918dded313557afa99601 /sys | |
| parent | 222bd0f97333b4297dbdf4a468c158241b126cc8 (diff) | |
Do not call get_physical if 040. Hardwire Q700 internal video for now.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/mac68k/machdep.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 3632e096310..8650e2d1c9b 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.18 1996/08/10 21:37:46 briggs Exp $ */ +/* $OpenBSD: machdep.c,v 1.19 1996/09/21 04:03:58 briggs Exp $ */ /* $NetBSD: machdep.c,v 1.114 1996/08/06 04:03:33 scottr Exp $ */ /* @@ -2218,9 +2218,10 @@ setmachdep() /* * Get the console buffer physical address. If we can't, we - * punt and set it to 0. + * punt and set it to 0. Note that get_physical doesn't yet + * work on the '040. */ - if (!get_physical(videoaddr, &conspa)) + if ((mmutype == MMU_68040) || !get_physical(videoaddr, &conspa)) conspa = 0; /* @@ -2275,6 +2276,10 @@ setmachdep() mac68k_machine.sccClkConst = 115200; via_reg(VIA1, vIER) = 0x7f; /* disable VIA1 int */ via_reg(VIA2, vIER) = 0x7f; /* disable VIA2 int */ + if (cpui->machineid == MACH_MACQ700) { + mac68k_vidlog = mac68k_vidphys = 0xf9000000; + mac68k_vidlen = 2 * 1024 * 1024; + } break; case MACH_CLASSIIci: VIA2 = 0x13; @@ -2424,6 +2429,10 @@ get_physical(u_int addr, u_long * phys) int i, numbits; extern u_int macos_tc; + /* This can not work for the 040, yet */ + if (mmutype == MMU_68040) + return 0; + i = get_pte(addr, pte, &psr); switch (i) { |