Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out last commit; it interfered with NuBus video, and will 

have to be reworked.
This commit is contained in:
scottr 1997-09-04 00:54:04 +00:00
parent 6f4f08b8b2
commit 093be63832
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/mac68k/mac68k/pmap_bootstrap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap_bootstrap.c,v 1.35 1997/09/03 06:40:15 scottr Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.36 1997/09/04 00:54:04 scottr Exp $ */
/* /*
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -87,7 +87,6 @@ extern signed long nblen[];
#define VIDMAPSIZE btoc(m68k_round_page(vidlen)) #define VIDMAPSIZE btoc(m68k_round_page(vidlen))
extern u_int32_t mac68k_vidlog; extern u_int32_t mac68k_vidlog;
extern u_int32_t mac68k_vidphys; extern u_int32_t mac68k_vidphys;
extern u_int32_t mac68k_vidlen;
extern u_int32_t videoaddr; extern u_int32_t videoaddr;
extern u_int32_t videorowbytes; extern u_int32_t videorowbytes;
extern u_int32_t videosize; extern u_int32_t videosize;
@ -129,8 +128,7 @@ pmap_bootstrap(nextpa, firstpa)
register st_entry_t protoste, *ste; register st_entry_t protoste, *ste;
register pt_entry_t protopte, *pte, *epte; register pt_entry_t protopte, *pte, *epte;
if (vidlen == 0) vidlen = ((videosize >> 16) & 0xffff) * videorowbytes + PGOFSET;
vidlen = ((videosize >> 16) & 0xffff) * videorowbytes + PGOFSET;
/* /*
* Calculate important physical addresses: * Calculate important physical addresses:
@ -567,6 +565,7 @@ bootstrap_mac68k(tc)
printf("Bootstrapping NetBSD/mac68k.\n"); printf("Bootstrapping NetBSD/mac68k.\n");
oldROMBase = ROMBase; oldROMBase = ROMBase;
mac68k_vidphys = videoaddr;
if (((tc & 0x80000000) && (mmutype == MMU_68030)) || if (((tc & 0x80000000) && (mmutype == MMU_68030)) ||
((tc & 0x8000) && (mmutype == MMU_68040))) { ((tc & 0x8000) && (mmutype == MMU_68040))) {
@ -575,7 +574,6 @@ bootstrap_mac68k(tc)
(void) get_mapping(); (void) get_mapping();
if (mac68k_machine.do_graybars) if (mac68k_machine.do_graybars)
printf("Done.\n"); printf("Done.\n");
vidlen = mac68k_vidlen;
} else { } else {
/* MMU not enabled. Fake up ranges. */ /* MMU not enabled. Fake up ranges. */
nbnumranges = 0; nbnumranges = 0;
@ -584,7 +582,6 @@ bootstrap_mac68k(tc)
high[0] = mac68k_machine.mach_memsize * (1024 * 1024); high[0] = mac68k_machine.mach_memsize * (1024 * 1024);
if (mac68k_machine.do_graybars) if (mac68k_machine.do_graybars)
printf("Faked range to byte 0x%lx.\n", high[0]); printf("Faked range to byte 0x%lx.\n", high[0]);
mac68k_vidphys = videoaddr;
} }
nextpa = load_addr + (((int)esym + NBPG - 1) & PG_FRAME); nextpa = load_addr + (((int)esym + NBPG - 1) & PG_FRAME);