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

Do console initialization earlier (see obio_init). 

Document initialization order dependencies.
This commit is contained in:
gwr 1997-04-28 22:08:36 +00:00
parent 2e1c5c36ad
commit 445e244536
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/arch/sun3/sun3/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.91 1997/04/09 20:49:06 thorpej Exp $ */ /* $NetBSD: machdep.c,v 1.92 1997/04/28 22:08:36 gwr Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -107,6 +107,7 @@ extern char etext[];
int physmem; int physmem;
int fputype; int fputype;
int msgbufmapped; int msgbufmapped;
struct msgbuf *msgbufp;
vm_offset_t vmmap; vm_offset_t vmmap;
@ -136,13 +137,14 @@ static void initcpu __P((void));
/* /*
* Console initialization: called early on from main, * Console initialization: called early on from main,
* before vm init or startup. Do enough configuration * before vm init or cpu_startup. This system is able
* to choose and initialize a console. * to setup the console much earlier than here (thanks
* to some help from the PROM monitor) so all that is
* left to do here is the debugger stuff.
*/ */
void void
consinit() consinit()
{ {
cninit(); /* See dev/zs.c */
#ifdef KGDB #ifdef KGDB
/* XXX - Ask on console for kgdb_dev? */ /* XXX - Ask on console for kgdb_dev? */
@ -409,20 +411,20 @@ setregs(p, pack, stack, retval)
*/ */
char machine[] = "sun3"; /* cpu "architecture" */ char machine[] = "sun3"; /* cpu "architecture" */
char cpu_model[120]; char cpu_model[120];
extern long hostid;
/*
* Determine which Sun3 model we are running on.
* We have to do this very early on the Sun3 because
* pmap_bootstrap() needs to know if it should avoid
* the video memory on the Sun3/50. Therefore, this
* function just prints out what we already know.
*/
void void
identifycpu() identifycpu()
{ {
/*
* actual identification done earlier because i felt like it,
* and i believe i will need the info to deal with some VAC, and awful
* framebuffer placement problems. could be moved later.
*/
strcpy(cpu_model, "Sun 3/");
/* should eventually include whether it has a VAC, mc6888x version, etc */ /* Other stuff? (VAC, mc6888x version, etc.) */
strcat(cpu_model, cpu_string); sprintf(cpu_model, "Sun 3/%s", cpu_string);
printf("Model: %s (hostid %x)\n", cpu_model, (int) hostid); printf("Model: %s (hostid %x)\n", cpu_model, (int) hostid);
} }
@ -779,7 +781,7 @@ initcpu()
/* straptrap() in trap.c */ /* straptrap() in trap.c */
/* from hp300: badaddr() */ /* from hp300: badaddr() */
/* peek_byte(), peek_word() moved to autoconf.c */ /* peek_byte(), peek_word() moved to bus_subr.c */
/* XXX: parityenable() ? */ /* XXX: parityenable() ? */
/* regdump() moved to regdump.c */ /* regdump() moved to regdump.c */