diff options
| author | thorpej <thorpej@NetBSD.org> | 2004-05-01 19:03:59 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2004-05-01 19:03:59 +0000 |
| commit | cdac01064e6cc00bd167582bedd9c3754ac417cc (patch) | |
| tree | 2dae96f6edad428a4f40d67fc67e9b7fb2dc9a7a /sys/dev | |
| parent | 31cb3898dfd52cd821b1201d7c8c7ca6427ca749 (diff) | |
Rename the COM16650 option to COM_16650, for consistency with other
com variant options.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/com.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 225f6dadc70..d2cfa5ce504 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.226 2004/05/01 06:12:18 thorpej Exp $ */ +/* $NetBSD: com.c,v 1.227 2004/05/01 19:03:59 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.226 2004/05/01 06:12:18 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.227 2004/05/01 19:03:59 thorpej Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -87,6 +87,11 @@ __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.226 2004/05/01 06:12:18 thorpej Exp $"); #include <sys/rnd.h> #endif +/* The COM16650 option was renamed to COM_16650. */ +#ifdef COM16650 +#error Obsolete COM16650 option; use COM_16650 instead. +#endif + /* * Override cnmagic(9) macro before including <sys/systm.h>. * We need to know if cn_check_magic triggered debugger, so set a flag. @@ -419,7 +424,7 @@ com_attach_subr(struct com_softc *sc) bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; struct tty *tp; -#ifdef COM16650 +#ifdef COM_16650 u_int8_t lcr; #endif #ifdef COM_HAYESP @@ -483,7 +488,7 @@ com_attach_subr(struct com_softc *sc) == FIFO_TRIGGER_14) { SET(sc->sc_hwflags, COM_HW_FIFO); -#ifdef COM16650 +#ifdef COM_16650 /* * IIR changes into the EFR if LCR is set to LCR_EERS * on 16650s. We also know IIR != 0 at this point. @@ -512,7 +517,7 @@ com_attach_subr(struct com_softc *sc) #endif sc->sc_fifolen = 16; -#ifdef COM16650 +#ifdef COM_16650 bus_space_write_1(iot, ioh, com_lcr, lcr); if (sc->sc_fifolen == 0) fifo_msg = "st16650, broken fifo"; |
