diff options
| author | leo <leo@NetBSD.org> | 2002-08-29 08:28:58 +0000 |
|---|---|---|
| committer | leo <leo@NetBSD.org> | 2002-08-29 08:28:58 +0000 |
| commit | eeb4fd145c3c8496c6b969c8deee5723f248a9dc (patch) | |
| tree | e2b7cea67a29387db977b1ad08992f813b698e76 /sys | |
| parent | 284c3f4875c2f3d4f191614f7196080742e73249 (diff) | |
defopt SERCONSOLE
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/atari/conf/files.atari | 10 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ser.c | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/sys/arch/atari/conf/files.atari b/sys/arch/atari/conf/files.atari index 744eeefdf8e..9f76b8ef6a9 100644 --- a/sys/arch/atari/conf/files.atari +++ b/sys/arch/atari/conf/files.atari @@ -1,14 +1,14 @@ # -# $NetBSD: files.atari,v 1.95 2002/04/16 20:50:18 thorpej Exp $ +# $NetBSD: files.atari,v 1.96 2002/08/29 08:28:58 leo Exp $ maxpartitions 16 maxusers 2 8 64 -defflag opt_mbtype.h _MILANHW_ _ATARIHW_ - -defflag opt_atariscsi.h TT_SCSI FALCON_SCSI -defparam opt_atariscsi.h TRY_SCSI_LINKED_COMMANDS +defflag opt_mbtype.h _MILANHW_ _ATARIHW_ +defflag opt_serconsole.h SERCONSOLE +defflag opt_atariscsi.h TT_SCSI FALCON_SCSI +defparam opt_atariscsi.h TRY_SCSI_LINKED_COMMANDS device mainbus {} attach mainbus at root diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c index d950c1e8eda..cc5b0be3189 100644 --- a/sys/arch/atari/dev/ser.c +++ b/sys/arch/atari/dev/ser.c @@ -1,4 +1,4 @@ -/* $NetBSD: ser.c,v 1.16 2002/05/30 19:59:36 thorpej Exp $ */ +/* $NetBSD: ser.c,v 1.17 2002/08/29 08:28:59 leo Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -105,6 +105,7 @@ #include "opt_ddb.h" #include "opt_mbtype.h" +#include "opt_serconsole.h" #include <sys/param.h> #include <sys/systm.h> @@ -320,13 +321,13 @@ void *auxp; callout_init(&sc->sc_diag_ch); -#ifdef SERCONSOLE +#if SERCONSOLE > 0 /* * Activate serial console when DCD present... */ if (!(MFP->mf_gpip & MCR_DCD)) SET(sc->sc_hwflags, SER_HW_CONSOLE); -#endif /* SERCONSOLE */ +#endif /* SERCONSOLE > 0 */ printf("\n"); if (ISSET(sc->sc_hwflags, SER_HW_CONSOLE)) { @@ -1428,11 +1429,11 @@ sercnprobe(cp) /* initialize required fields */ cp->cn_dev = makedev(sermajor, 0); /* XXX: LWP What unit? */ -#ifdef SERCONSOLE +#if SERCONSOLE > 0 cp->cn_pri = CN_REMOTE; /* Force a serial port console */ #else cp->cn_pri = CN_NORMAL; -#endif +#endif /* SERCONSOLE > 0 */ } void |
