diff options
| author | bde <bde@FreeBSD.org> | 1995-04-24 16:43:01 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-04-24 16:43:01 +0000 |
| commit | 04e93468c1cde28dd80e8be7419a8ea71f4acbcf (patch) | |
| tree | d02bdcfe9f2479c7b298d039c7be6cd9dfe7b265 /sys | |
| parent | d46c3a542a9ebd1643836c2a9f74b2b28e12ec9e (diff) | |
| download | FreeBSD-src-04e93468c1cde28dd80e8be7419a8ea71f4acbcf.zip FreeBSD-src-04e93468c1cde28dd80e8be7419a8ea71f4acbcf.tar.gz | |
Undo the move of `#include "sc.h"' etc. to cons.h. It broke anything
that includes <machine/cons.h>.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/i386/cons.c | 5 | ||||
| -rw-r--r-- | sys/i386/i386/cons.h | 11 | ||||
| -rw-r--r-- | sys/kern/tty_cons.c | 5 | ||||
| -rw-r--r-- | sys/sys/cons.h | 11 |
4 files changed, 14 insertions, 18 deletions
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index 44d1384..3076fab 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.25 1995/04/08 21:31:51 joerg Exp $ + * $Id: cons.c,v 1.26 1995/04/23 12:55:54 bde Exp $ */ #include <sys/param.h> @@ -49,6 +49,9 @@ #include <machine/stdarg.h> /* XXX this should be config(8)ed. */ +#include "sc.h" +#include "vt.h" +#include "sio.h" static struct consdev constab[] = { #if NSC > 0 || NVT > 0 { pccnprobe, pccninit, pccngetc, pccncheckc, pccnputc }, diff --git a/sys/i386/i386/cons.h b/sys/i386/i386/cons.h index 672cad5..d99c3e5 100644 --- a/sys/i386/i386/cons.h +++ b/sys/i386/i386/cons.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.h 7.2 (Berkeley) 5/9/91 - * $Id: cons.h,v 1.7 1995/04/08 21:31:53 joerg Exp $ + * $Id: cons.h,v 1.8 1995/04/23 12:55:55 bde Exp $ */ #ifndef _MACHINE_CONS_H_ @@ -49,28 +49,23 @@ typedef int cn_getc_t __P((dev_t)); typedef int cn_checkc_t __P((dev_t)); typedef void cn_putc_t __P((dev_t, int)); +#ifdef KERNEL /* * XXX public functions in drivers should be declared in headers produced * by `config', not here. */ -#include "sc.h" -#include "vt.h" -#if NSC > 0 || NVT > 0 cn_probe_t pccnprobe; cn_init_t pccninit; cn_getc_t pccngetc; cn_checkc_t pccncheckc; cn_putc_t pccnputc; -#endif -#include "sio.h" -#if NSIO > 0 cn_probe_t siocnprobe; cn_init_t siocninit; cn_getc_t siocngetc; cn_checkc_t siocncheckc; cn_putc_t siocnputc; -#endif +#endif /* KERNEL */ struct consdev { cn_probe_t *cn_probe; diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 44d1384..3076fab 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.25 1995/04/08 21:31:51 joerg Exp $ + * $Id: cons.c,v 1.26 1995/04/23 12:55:54 bde Exp $ */ #include <sys/param.h> @@ -49,6 +49,9 @@ #include <machine/stdarg.h> /* XXX this should be config(8)ed. */ +#include "sc.h" +#include "vt.h" +#include "sio.h" static struct consdev constab[] = { #if NSC > 0 || NVT > 0 { pccnprobe, pccninit, pccngetc, pccncheckc, pccnputc }, diff --git a/sys/sys/cons.h b/sys/sys/cons.h index 672cad5..d99c3e5 100644 --- a/sys/sys/cons.h +++ b/sys/sys/cons.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.h 7.2 (Berkeley) 5/9/91 - * $Id: cons.h,v 1.7 1995/04/08 21:31:53 joerg Exp $ + * $Id: cons.h,v 1.8 1995/04/23 12:55:55 bde Exp $ */ #ifndef _MACHINE_CONS_H_ @@ -49,28 +49,23 @@ typedef int cn_getc_t __P((dev_t)); typedef int cn_checkc_t __P((dev_t)); typedef void cn_putc_t __P((dev_t, int)); +#ifdef KERNEL /* * XXX public functions in drivers should be declared in headers produced * by `config', not here. */ -#include "sc.h" -#include "vt.h" -#if NSC > 0 || NVT > 0 cn_probe_t pccnprobe; cn_init_t pccninit; cn_getc_t pccngetc; cn_checkc_t pccncheckc; cn_putc_t pccnputc; -#endif -#include "sio.h" -#if NSIO > 0 cn_probe_t siocnprobe; cn_init_t siocninit; cn_getc_t siocngetc; cn_checkc_t siocncheckc; cn_putc_t siocnputc; -#endif +#endif /* KERNEL */ struct consdev { cn_probe_t *cn_probe; |
