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

Test for serial console in adb_init() early, and abort if we're using it. 

Initiialize ROM vectors regardless of this so that the PRAM RTC read and
write work regardless of whether a serial console is in use.
This commit is contained in:
scottr 1996-06-21 06:10:56 +00:00
parent d5a4ec3087
commit 08a2715e38
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/mac68k/dev/adbsys.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: adbsys.c,v 1.20 1996/05/08 13:36:41 briggs Exp $ */
/* $NetBSD: adbsys.c,v 1.21 1996/06/21 06:10:56 scottr Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@ -32,12 +32,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/adbsys.h>
#include <machine/cpu.h>
#include <machine/viareg.h>
#include "adbvar.h"
#include "../mac68k/macrom.h"
extern struct mac68k_machine_S mac68k_machine;
/* from adb.c */
void adb_processevent(adb_event_t * event);
@ -176,6 +180,11 @@ adb_init()
int error;
char buffer[9];
if ((mac68k_machine.serial_console & 0x03)) {
printf("adb: using serial console\n");
return;
}
if (!mrg_romready()) {
printf("adb: no ROM ADB driver in this kernel for this machine\n");
return;

5
sys/arch/mac68k/mac68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.109 1996/06/11 03:11:06 scottr Exp $ */
/* $NetBSD: machdep.c,v 1.110 1996/06/21 06:11:02 scottr Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -2167,8 +2167,7 @@ setmachdep()
* used later when we re-map the vectors from MacOS Address
* Space to NetBSD Address Space.
*/
if ((mac68k_machine.serial_console & 0x03) == 0)
mrg_MacOSROMVectors = cpui->rom_vectors;
mrg_MacOSROMVectors = cpui->rom_vectors;
/*
* Set up any machine specific stuff that we have to before