diff options
-rw-r--r-- | sys/i386/i386/conf.c | 13 | ||||
-rw-r--r-- | sys/i386/i386/cons.c | 7 | ||||
-rw-r--r-- | sys/kern/tty_cons.c | 7 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index d855cd5..c0a34d0 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.29 1994/08/30 19:36:32 davidg Exp $ + * $Id: conf.c,v 1.30 1994/08/30 20:11:40 davidg Exp $ */ #include <sys/param.h> @@ -285,12 +285,23 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); #include "machine/cons.h" /* more console */ +#include "sc.h" +#if NSC > 0 d_open_t pcopen; d_close_t pcclose; d_rdwr_t pcread, pcwrite; d_ioctl_t pcioctl; d_mmap_t pcmmap; extern struct tty pccons[]; +#else +#define pcopen (d_open_t *)enxio +#define pcclose (d_close_t *)enxio +#define pcread (d_rdwr_t *)enxio +#define pcwrite (d_rdwr_t *)enxio +#define pcioctl (d_ioctl_t *)enxio +#define pcmmap (d_mmap_t *)enxio +#define pccons NULL +#endif /* controlling TTY */ d_open_t cttyopen; diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index e001086..e7da720 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.13 1994/08/13 03:49:34 wollman Exp $ + * $Id: cons.c,v 1.14 1994/08/30 19:36:35 davidg Exp $ */ @@ -55,7 +55,10 @@ #include <machine/cons.h> /* XXX - all this could be autoconfig()ed */ +#include "sc.h" +#if NSC > 0 int pccnprobe(), pccninit(), pccngetc(), pccnputc(); +#endif #include "sio.h" #if NSIO > 0 @@ -63,7 +66,9 @@ int siocnprobe(), siocninit(), siocngetc(), siocnputc(); #endif struct consdev constab[] = { +#if NSC > 0 { pccnprobe, pccninit, pccngetc, pccnputc }, +#endif #if NSIO > 0 { siocnprobe, siocninit, siocngetc, siocnputc }, #endif diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index e001086..e7da720 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.13 1994/08/13 03:49:34 wollman Exp $ + * $Id: cons.c,v 1.14 1994/08/30 19:36:35 davidg Exp $ */ @@ -55,7 +55,10 @@ #include <machine/cons.h> /* XXX - all this could be autoconfig()ed */ +#include "sc.h" +#if NSC > 0 int pccnprobe(), pccninit(), pccngetc(), pccnputc(); +#endif #include "sio.h" #if NSIO > 0 @@ -63,7 +66,9 @@ int siocnprobe(), siocninit(), siocngetc(), siocnputc(); #endif struct consdev constab[] = { +#if NSC > 0 { pccnprobe, pccninit, pccngetc, pccnputc }, +#endif #if NSIO > 0 { siocnprobe, siocninit, siocngetc, siocnputc }, #endif |