diff options
| author | briggs <briggs@cvs.openbsd.org> | 1996-06-23 15:38:13 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1996-06-23 15:38:13 +0000 |
| commit | 8122d440f1bfa845bc5e5cec8130b1f74d325db9 (patch) | |
| tree | f3448c0d0be886dd836595dd107e0a4af75c23b1 /sys/arch/mac68k/dev/adbsys.c | |
| parent | 715c475f1ad0c7b6606388a25b066091fed9a08d (diff) | |
From scottr/NetBSD:
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.
Diffstat (limited to 'sys/arch/mac68k/dev/adbsys.c')
| -rw-r--r-- | sys/arch/mac68k/dev/adbsys.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/mac68k/dev/adbsys.c b/sys/arch/mac68k/dev/adbsys.c index a2da219940b..65e8fbdfcbb 100644 --- a/sys/arch/mac68k/dev/adbsys.c +++ b/sys/arch/mac68k/dev/adbsys.c @@ -1,5 +1,5 @@ -/* $OpenBSD: adbsys.c,v 1.3 1996/05/26 18:35:15 briggs Exp $ */ -/* $NetBSD: adbsys.c,v 1.20 1996/05/08 13:36:41 briggs Exp $ */ +/* $OpenBSD: adbsys.c,v 1.4 1996/06/23 15:38:12 briggs Exp $ */ +/* $NetBSD: adbsys.c,v 1.21 1996/06/21 06:10:56 scottr Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -33,12 +33,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); @@ -177,6 +181,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; |