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

Apply patch supplied by Konrad Schroder in PR 10452: fixes console output 

on PMAG-D.
This commit is contained in:
ad 2000-06-28 11:03:25 +00:00
parent cb94bf1d45
commit c3459ba769
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/pmax/dev/rcons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcons.c,v 1.42 2000/06/26 04:55:55 simonb Exp $ */ /* $NetBSD: rcons.c,v 1.43 2000/06/28 11:03:26 ad Exp $ */
/* /*
* Copyright (c) 1995 * Copyright (c) 1995
@ -188,6 +188,7 @@ rcons_connect_native (ops, cookie, width, height, cols, rows)
rc.rc_deffgcolor = WSCOL_WHITE; rc.rc_deffgcolor = WSCOL_WHITE;
rc.rc_defbgcolor = WSCOL_BLACK; rc.rc_defbgcolor = WSCOL_BLACK;
rcons_init(&rc, 1); rcons_init(&rc, 1);
rcons_ttyinit(fbconstty);
} }
#endif #endif

24
sys/arch/pmax/pmax/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.174 2000/06/26 14:20:54 mrg Exp $ */ /* $NetBSD: machdep.c,v 1.175 2000/06/28 11:03:25 ad Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.174 2000/06/26 14:20:54 mrg Exp $"); __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175 2000/06/28 11:03:25 ad Exp $");
#include "fs_mfs.h" #include "fs_mfs.h"
#include "opt_ddb.h" #include "opt_ddb.h"
@ -179,12 +179,6 @@ mach_init(argc, argv, code, cv, bim, bip)
#endif #endif
extern char edata[], end[]; /* XXX */ extern char edata[], end[]; /* XXX */
/* Initialize callv so we can do PROM output... */
callv = (code == DEC_PROM_MAGIC) ? (void *)cv : &callvec;
/* Use PROM console output until we initialize a console driver. */
cn_tab = &promcd;
/* Set up bootinfo structure looking at stack. */ /* Set up bootinfo structure looking at stack. */
if (bim == BOOTINFO_MAGIC) { if (bim == BOOTINFO_MAGIC) {
struct btinfo_magic *bi_magic; struct btinfo_magic *bi_magic;
@ -199,10 +193,6 @@ mach_init(argc, argv, code, cv, bim, bip)
} }
else else
bootinfo_msg = "invalid bootinfo pointer (old bootblocks?)\n"; bootinfo_msg = "invalid bootinfo pointer (old bootblocks?)\n";
#if 0
if (bootinfo_msg != NULL)
printf(bootinfo_msg);
#endif
/* clear the BSS segment */ /* clear the BSS segment */
#ifdef DDB #ifdef DDB
@ -235,6 +225,16 @@ mach_init(argc, argv, code, cv, bim, bip)
memset(edata, 0, kernend - edata); memset(edata, 0, kernend - edata);
} }
/* Initialize callv so we can do PROM output... */
callv = (code == DEC_PROM_MAGIC) ? (void *)cv : &callvec;
/* Use PROM console output until we initialize a console driver. */
cn_tab = &promcd;
#if 0
if (bootinfo_msg != NULL)
printf(bootinfo_msg);
#endif
/* /*
* Set the VM page size. * Set the VM page size.
*/ */