diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-02 23:37:18 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-01-02 23:37:18 +0000 |
| commit | 9f86983ae5a8ce1ce702b2a899887f3382bc49fe (patch) | |
| tree | cc6d6cd770fb26f8a9e21073a5d54bd0a4a3ce1a | |
| parent | 0bbdf2be3c7a6baa150619b489f4774dc1f9f504 (diff) | |
Relaxed dependencies, and do not undef DEBUG.
| -rw-r--r-- | sys/arch/mvme88k/dev/cl.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c index ab97cf36b13..c464c66fd12 100644 --- a/sys/arch/mvme88k/dev/cl.c +++ b/sys/arch/mvme88k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.34 2003/12/29 07:04:14 deraadt Exp $ */ +/* $OpenBSD: cl.c,v 1.35 2004/01/02 23:37:17 miod Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -44,9 +44,6 @@ #include <dev/cons.h> #include <mvme88k/dev/clreg.h> - -#include "cl.h" -#include "pcctwo.h" #include <mvme88k/dev/pcctworeg.h> #ifdef DDB @@ -70,9 +67,6 @@ #define CLCD_DO_POLLED_INPUT -#ifdef DEBUG -#undef DEBUG -#endif struct cl_cons { void *cl_paddr; struct clreg *volatile cl_vaddr; @@ -199,15 +193,15 @@ struct cfdriver cl_cd = { #define CLCDBUF 80 +#ifdef CLCD_DO_POLLED_INPUT int dopoll = 1; +#endif #define CL_UNIT(x) (minor(x) >> 2) #define CL_CHANNEL(x) (minor(x) & 3) -#define CL_TTY(x) (minor(x)) - -struct tty *cltty(dev_t dev); -struct tty *cltty(dev) +struct tty * +cltty(dev) dev_t dev; { int unit, channel; @@ -343,7 +337,9 @@ clattach(parent, self, aux) sc->sc_ih_r.ih_arg = sc; sc->sc_ih_e.ih_wantframe = 0; sc->sc_ih_r.ih_ipl = ca->ca_ipl; +#ifdef CLCD_DO_POLLED_INPUT dopoll = 0; +#endif intr_establish(PCC2_VECT + SRXEIRQ, &sc->sc_ih_e); intr_establish(PCC2_VECT + SMOIRQ, &sc->sc_ih_m); intr_establish(PCC2_VECT + STxIRQ, &sc->sc_ih_t); |