summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2000-03-06 21:36:05 +0000
committerthorpej <thorpej@NetBSD.org>2000-03-06 21:36:05 +0000
commita183d34f04482a618d0fb955db92ffba90ee516e (patch)
tree6b144785feb78953b66a5cb9b808dbdec2860306 /sys
parent57aae5ce02da67da6b5b5d6516b9f333ec98606e (diff)
- Implement cnbell() -- ring the console bell. The cn_bell entrypoint
is optional. - Add cn_bell to statically allocated consdevs as appropriate.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/a12/a12dc.c10
-rw-r--r--sys/arch/alpha/alpha/prom.c6
-rw-r--r--sys/arch/alpha/tc/scc.c6
-rw-r--r--sys/arch/alpha/tc/zs_ioasic.c6
-rw-r--r--sys/arch/arc/arc/arcbios.c4
-rw-r--r--sys/arch/arc/dev/pccons.c5
-rw-r--r--sys/arch/arm32/footbridge/footbridge_com.c6
-rw-r--r--sys/arch/arm32/rc7500/rc7500_prom.c4
-rw-r--r--sys/arch/bebox/isa/pccons.c5
-rw-r--r--sys/arch/hpcmips/dev/bicons.c3
-rw-r--r--sys/arch/hpcmips/tx/txcom.c4
-rw-r--r--sys/arch/i386/isa/pccons.c5
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_drv.c2
-rw-r--r--sys/arch/luna68k/dev/siotty.c5
-rw-r--r--sys/arch/macppc/dev/ofcons.c3
-rw-r--r--sys/arch/macppc/dev/zs.c3
-rw-r--r--sys/arch/mmeye/mmeye/com.c5
-rw-r--r--sys/arch/news68k/dev/zs.c5
-rw-r--r--sys/arch/newsmips/apbus/zs_ap.c5
-rw-r--r--sys/arch/newsmips/dev/bmcons.c5
-rw-r--r--sys/arch/newsmips/dev/zs_hb.c5
-rw-r--r--sys/arch/pmax/dev/dc.c6
-rw-r--r--sys/arch/pmax/dev/dtop.c6
-rw-r--r--sys/arch/pmax/pmax/promcall.c5
-rw-r--r--sys/arch/pmax/tc/scc.c6
-rw-r--r--sys/arch/sparc/dev/kd.c3
-rw-r--r--sys/arch/sparc/dev/zs.c3
-rw-r--r--sys/arch/sparc64/dev/consinit.c3
-rw-r--r--sys/arch/sparc64/dev/kd.c3
-rw-r--r--sys/arch/sparc64/dev/zs.c3
-rw-r--r--sys/arch/sun3/dev/kd.c3
-rw-r--r--sys/arch/sun3/dev/zs.c3
-rw-r--r--sys/dev/cons.c12
-rw-r--r--sys/dev/cons.h12
-rw-r--r--sys/dev/ic/com.c5
35 files changed, 107 insertions, 68 deletions
diff --git a/sys/arch/alpha/a12/a12dc.c b/sys/arch/alpha/a12/a12dc.c
index c9a73daee24..541d42f1c10 100644
--- a/sys/arch/alpha/a12/a12dc.c
+++ b/sys/arch/alpha/a12/a12dc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12dc.c,v 1.1 1998/09/23 21:14:02 ross Exp $ */
+/* $NetBSD: a12dc.c,v 1.2 2000/03/06 21:36:05 thorpej Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -63,7 +63,7 @@
#ifndef BSIDE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.1 1998/09/23 21:14:02 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.2 2000/03/06 21:36:05 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -149,7 +149,7 @@ a12dcattach(parent, self, aux)
/* note that we've attached the chipset; can't have 2 A12Cs. */
a12dcfound = 1;
- printf(": driver %s\n", "$Revision: 1.1 $");
+ printf(": driver %s\n", "$Revision: 1.2 $");
tp = a12dc_tty[0] = ttymalloc();
tp->t_oproc = a12dcstart;
@@ -441,8 +441,8 @@ a12dccnattach()
{
int i;
static struct consdev a12dccons = {
- NULL, NULL, a12dccngetc, a12dccnputc, a12dccnpollc, NODEV,
- CN_NORMAL
+ NULL, NULL, a12dccngetc, a12dccnputc, a12dccnpollc, NULL,
+ NODEV, CN_NORMAL
};
for(i = 0; i < nchrdev; ++i)
diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c
index 1cb6c6d536c..939381623ad 100644
--- a/sys/arch/alpha/alpha/prom.c
+++ b/sys/arch/alpha/alpha/prom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.c,v 1.38 1999/08/10 23:35:45 thorpej Exp $ */
+/* $NetBSD: prom.c,v 1.39 2000/03/06 21:36:05 thorpej Exp $ */
/*
* Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University
@@ -27,7 +27,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.38 1999/08/10 23:35:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.39 2000/03/06 21:36:05 thorpej Exp $");
#include "opt_multiprocessor.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.38 1999/08/10 23:35:45 thorpej Exp $");
/* XXX this is to fake out the console routines, while booting. */
struct consdev promcons = { NULL, NULL, promcngetc, promcnputc,
- nullcnpollc, makedev(23,0), 1 };
+ nullcnpollc, NULL, makedev(23,0), 1 };
struct rpb *hwrpb;
int alpha_console;
diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c
index 2b7dfdd7d20..bdd4f9da098 100644
--- a/sys/arch/alpha/tc/scc.c
+++ b/sys/arch/alpha/tc/scc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scc.c,v 1.49 2000/02/09 00:33:03 thorpej Exp $ */
+/* $NetBSD: scc.c,v 1.50 2000/03/06 21:36:05 thorpej Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.49 2000/02/09 00:33:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.50 2000/03/06 21:36:05 thorpej Exp $");
#include "opt_ddb.h"
#ifdef alpha
@@ -250,7 +250,7 @@ void scc_alphaintr __P((int));
scc_regmap_t *scc_cons_addr = 0;
static struct scc_softc coldcons_softc;
static struct consdev scccons = {
- NULL, NULL, sccGetc, sccPutc, sccPollc, NODEV, 0
+ NULL, NULL, sccGetc, sccPutc, sccPollc, NULL, NODEV, 0
};
void scc_consinit __P((dev_t dev, scc_regmap_t *sccaddr));
diff --git a/sys/arch/alpha/tc/zs_ioasic.c b/sys/arch/alpha/tc/zs_ioasic.c
index 9caf3ab466b..3050e5dc56a 100644
--- a/sys/arch/alpha/tc/zs_ioasic.c
+++ b/sys/arch/alpha/tc/zs_ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasic.c,v 1.8 2000/02/03 08:13:45 nisimura Exp $ */
+/* $NetBSD: zs_ioasic.c,v 1.9 2000/03/06 21:36:05 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.8 2000/02/03 08:13:45 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.9 2000/03/06 21:36:05 thorpej Exp $");
/*
* Zilog Z8530 Dual UART driver (machine-dependent part). This driver
@@ -94,7 +94,7 @@ void zs_ioasic_cnpollc __P((dev_t, int));
struct consdev zs_ioasic_cons = {
NULL, NULL, zs_ioasic_cngetc, zs_ioasic_cnputc,
- zs_ioasic_cnpollc, NODEV, CN_NORMAL,
+ zs_ioasic_cnpollc, NULL, NODEV, CN_NORMAL,
};
tc_offset_t zs_ioasic_console_offset;
diff --git a/sys/arch/arc/arc/arcbios.c b/sys/arch/arc/arc/arcbios.c
index fdfe23393fc..335aaee14ee 100644
--- a/sys/arch/arc/arc/arcbios.c
+++ b/sys/arch/arc/arc/arcbios.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.c,v 1.4 2000/03/03 12:50:19 soda Exp $ */
+/* $NetBSD: arcbios.c,v 1.5 2000/03/06 21:36:06 thorpej Exp $ */
/* $OpenBSD: arcbios.c,v 1.3 1998/06/06 06:33:33 mickey Exp $ */
/*-
@@ -149,7 +149,7 @@ void biosputc __P((dev_t, int));
/* this is to fake out the console routines, while booting. */
struct consdev bioscons = {
- NULL, NULL, biosgetc, biosputc, nullcnpollc, NODEV, CN_DEAD
+ NULL, NULL, biosgetc, biosputc, nullcnpollc, NULL, NODEV, CN_DEAD
};
int
diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c
index 87940fd9e91..78526832960 100644
--- a/sys/arch/arc/dev/pccons.c
+++ b/sys/arch/arc/dev/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.15 2000/03/03 12:35:40 soda Exp $ */
+/* $NetBSD: pccons.c,v 1.16 2000/03/06 21:36:06 thorpej Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
@@ -846,7 +846,8 @@ pccnattach()
{
int maj;
static struct consdev pccons = {
- NULL, NULL, pccngetc, pccnputc, pccnpollc, NODEV, CN_NORMAL
+ NULL, NULL, pccngetc, pccnputc, pccnpollc, NULL,
+ NODEV, CN_NORMAL
};
/*
diff --git a/sys/arch/arm32/footbridge/footbridge_com.c b/sys/arch/arm32/footbridge/footbridge_com.c
index 21db790980d..4c78e4e2cf5 100644
--- a/sys/arch/arm32/footbridge/footbridge_com.c
+++ b/sys/arch/arm32/footbridge/footbridge_com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com.c,v 1.3 2000/02/13 04:59:57 mark Exp $ */
+/* $NetBSD: footbridge_com.c,v 1.4 2000/03/06 21:36:06 thorpej Exp $ */
/*-
* Copyright (c) 1997 Mark Brinicombe
@@ -656,8 +656,8 @@ fcomcnattach(iobase, rate, cflag)
tcflag_t cflag;
{
static struct consdev fcomcons = {
- NULL, NULL, fcomcngetc, fcomcnputc, fcomcnpollc, NODEV,
- CN_NORMAL
+ NULL, NULL, fcomcngetc, fcomcnputc, fcomcnpollc, NULL,
+ NODEV, CN_NORMAL
};
fcomconstag = &fcomcons_bs_tag;
diff --git a/sys/arch/arm32/rc7500/rc7500_prom.c b/sys/arch/arm32/rc7500/rc7500_prom.c
index b09ce0a6a9e..07ec33b2252 100644
--- a/sys/arch/arm32/rc7500/rc7500_prom.c
+++ b/sys/arch/arm32/rc7500/rc7500_prom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rc7500_prom.c,v 1.2 1997/10/14 10:49:53 mark Exp $ */
+/* $NetBSD: rc7500_prom.c,v 1.3 2000/03/06 21:36:06 thorpej Exp $ */
/*
* Copyright (c) 1992, 1994, 1995 Carnegie Mellon University
@@ -35,7 +35,7 @@
void promcnputc __P((dev_t, int));
int promcngetc __P((dev_t));
struct consdev promcons = { NULL, NULL, promcngetc, promcnputc,
- nullcnpollc, makedev(23,0), 1 };
+ nullcnpollc, NULL, makedev(23,0), 1 };
void
init_prom_interface()
diff --git a/sys/arch/bebox/isa/pccons.c b/sys/arch/bebox/isa/pccons.c
index 58400603025..26969edbe1f 100644
--- a/sys/arch/bebox/isa/pccons.c
+++ b/sys/arch/bebox/isa/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.15 1999/03/19 04:58:46 cgd Exp $ */
+/* $NetBSD: pccons.c,v 1.16 2000/03/06 21:36:07 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -840,7 +840,8 @@ int
pccnattach()
{
static struct consdev pccons = {
- NULL, NULL, pccngetc, pccnputc, pccnpollc, NODEV, CN_NORMAL
+ NULL, NULL, pccngetc, pccnputc, pccnpollc, NULL,
+ NODEV, CN_NORMAL
};
cn_tab = &pccons;
diff --git a/sys/arch/hpcmips/dev/bicons.c b/sys/arch/hpcmips/dev/bicons.c
index c50e83ca178..5eb7ecb9ab8 100644
--- a/sys/arch/hpcmips/dev/bicons.c
+++ b/sys/arch/hpcmips/dev/bicons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bicons.c,v 1.4 1999/11/30 18:42:02 uch Exp $ */
+/* $NetBSD: bicons.c,v 1.5 2000/03/06 21:36:07 thorpej Exp $ */
/*-
* Copyright (c) 1999
@@ -130,6 +130,7 @@ struct consdev builtincd = {
(int (*)(dev_t)) bicons_getc, /* getc */
(void (*)(dev_t, int))bicons_putc, /* putc */
(void (*)(dev_t, int))bicons_pollc, /* pollc */
+ NULL, /* bell */
makedev (0, 0),
CN_DEAD,
};
diff --git a/sys/arch/hpcmips/tx/txcom.c b/sys/arch/hpcmips/tx/txcom.c
index ee820047095..9c5cdfd07d5 100644
--- a/sys/arch/hpcmips/tx/txcom.c
+++ b/sys/arch/hpcmips/tx/txcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: txcom.c,v 1.6 2000/01/16 21:47:01 uch Exp $ */
+/* $NetBSD: txcom.c,v 1.7 2000/03/06 21:36:07 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000, by UCHIYAMA Yasushi
@@ -140,7 +140,7 @@ cdev_decl(txcom);
struct consdev txcomcons = {
NULL, NULL, txcom_cngetc, txcom_cnputc, txcom_cnpollc,
- NODEV, CN_NORMAL
+ NULL, NODEV, CN_NORMAL
};
/* Serial console */
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 9e4bd4b0f2a..3b1e2ed8008 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.137 1999/12/03 22:48:24 thorpej Exp $ */
+/* $NetBSD: pccons.c,v 1.138 2000/03/06 21:36:07 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1077,7 +1077,8 @@ int
pccnattach()
{
static struct consdev pccons = {
- NULL, NULL, pccngetc, pccnputc, pccnpollc, NODEV, CN_NORMAL
+ NULL, NULL, pccngetc, pccnputc, pccnpollc,
+ NULL, NODEV, CN_NORMAL
};
cn_tab = &pccons;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index 0826473e80a..3157a89b12a 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -763,7 +763,7 @@ int
pccnattach()
{
static struct consdev pccons = { NULL, NULL,
- pccngetc, pccnputc, pccnpollc, NODEV, CN_NORMAL};
+ pccngetc, pccnputc, pccnpollc, NULL, NODEV, CN_NORMAL};
cn_tab = &pccons;
diff --git a/sys/arch/luna68k/dev/siotty.c b/sys/arch/luna68k/dev/siotty.c
index 7c22eeef6f2..334228e37fe 100644
--- a/sys/arch/luna68k/dev/siotty.c
+++ b/sys/arch/luna68k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.3 2000/01/12 01:59:45 nisimura Exp $ */
+/* $NetBSD: siotty.c,v 1.4 2000/03/06 21:36:09 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.3 2000/01/12 01:59:45 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.4 2000/03/06 21:36:09 thorpej Exp $");
#include "opt_ddb.h"
@@ -561,6 +561,7 @@ struct consdev syscons = {
syscngetc,
syscnputc,
nullcnpollc,
+ NULL,
NODEV,
CN_REMOTE,
};
diff --git a/sys/arch/macppc/dev/ofcons.c b/sys/arch/macppc/dev/ofcons.c
index 8d65b82a4a8..28c3ecbe8a8 100644
--- a/sys/arch/macppc/dev/ofcons.c
+++ b/sys/arch/macppc/dev/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.2 1998/07/28 23:43:33 thorpej Exp $ */
+/* $NetBSD: ofcons.c,v 1.3 2000/03/06 21:36:09 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -360,6 +360,7 @@ struct consdev consdev_ofcons = {
ofccngetc,
ofccnputc,
ofccnpollc,
+ NULL,
};
struct consdev *cn_tab = &consdev_ofcons;
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index 3ffbbf8b20e..ef78d3b2eed 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.13 2000/02/27 20:31:57 tsubai Exp $ */
+/* $NetBSD: zs.c,v 1.14 2000/03/06 21:36:09 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998 Bill Studenmund
@@ -1090,6 +1090,7 @@ struct consdev consdev_zs = {
zscngetc,
zscnputc,
zscnpollc,
+ NULL,
};
void
diff --git a/sys/arch/mmeye/mmeye/com.c b/sys/arch/mmeye/mmeye/com.c
index 601acf2796d..1d4078d1fe8 100644
--- a/sys/arch/mmeye/mmeye/com.c
+++ b/sys/arch/mmeye/mmeye/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.2 1999/11/22 03:53:39 sommerfeld Exp $ */
+/* $NetBSD: com.c,v 1.3 2000/03/06 21:36:09 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -2241,7 +2241,8 @@ comcnattach(iot, iobase, rate, frequency, cflag)
{
int res;
static struct consdev comcons = {
- NULL, NULL, comcngetc, comcnputc, comcnpollc, NODEV, CN_NORMAL
+ NULL, NULL, comcngetc, comcnputc, comcnpollc,
+ NULL, NODEV, CN_NORMAL
};
res = cominit(iot, iobase, rate, frequency, cflag, &comconsioh);
diff --git a/sys/arch/news68k/dev/zs.c b/sys/arch/news68k/dev/zs.c
index 038f8f173da..fbd168a9261 100644
--- a/sys/arch/news68k/dev/zs.c
+++ b/sys/arch/news68k/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.3 2000/02/08 16:17:32 tsutsui Exp $ */
+/* $NetBSD: zs.c,v 1.4 2000/03/06 21:36:10 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -618,7 +618,8 @@ struct consdev consdev_zs = {
zscninit,
zscngetc,
zscnputc,
- nullcnpollc
+ nullcnpollc,
+ NULL,
};
static void
diff --git a/sys/arch/newsmips/apbus/zs_ap.c b/sys/arch/newsmips/apbus/zs_ap.c
index dfa239529fd..73d607472b1 100644
--- a/sys/arch/newsmips/apbus/zs_ap.c
+++ b/sys/arch/newsmips/apbus/zs_ap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ap.c,v 1.3 1999/12/26 09:05:38 tsubai Exp $ */
+/* $NetBSD: zs_ap.c,v 1.4 2000/03/06 21:36:10 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -422,7 +422,8 @@ struct consdev consdev_zs_ap = {
zscninit,
zscngetc,
zscnputc,
- zscnpollc
+ zscnpollc,
+ NULL,
};
void
diff --git a/sys/arch/newsmips/dev/bmcons.c b/sys/arch/newsmips/dev/bmcons.c
index a43d29fc883..118dcbc80ab 100644
--- a/sys/arch/newsmips/dev/bmcons.c
+++ b/sys/arch/newsmips/dev/bmcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bmcons.c,v 1.4 1999/02/15 04:36:33 hubertf Exp $ */
+/* $NetBSD: bmcons.c,v 1.5 2000/03/06 21:36:10 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -88,7 +88,8 @@ struct consdev consdev_bm = {
bmcninit,
bmcngetc,
bmcnputc,
- bmcnpollc
+ bmcnpollc,
+ NULL,
};
static void
diff --git a/sys/arch/newsmips/dev/zs_hb.c b/sys/arch/newsmips/dev/zs_hb.c
index 558a932d17c..332fd469f32 100644
--- a/sys/arch/newsmips/dev/zs_hb.c
+++ b/sys/arch/newsmips/dev/zs_hb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_hb.c,v 1.3 2000/01/23 15:27:44 tsubai Exp $ */
+/* $NetBSD: zs_hb.c,v 1.4 2000/03/06 21:36:10 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -391,7 +391,8 @@ struct consdev consdev_zs = {
zscninit,
zscngetc,
zscnputc,
- zscnpollc
+ zscnpollc,
+ NULL,
};
void
diff --git a/sys/arch/pmax/dev/dc.c b/sys/arch/pmax/dev/dc.c
index c7b51e7befb..6605f0a4281 100644
--- a/sys/arch/pmax/dev/dc.c
+++ b/sys/arch/pmax/dev/dc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dc.c,v 1.61 2000/02/09 08:29:40 nisimura Exp $ */
+/* $NetBSD: dc.c,v 1.62 2000/03/06 21:36:10 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.61 2000/02/09 08:29:40 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.62 2000/03/06 21:36:10 thorpej Exp $");
/*
* devDC7085.c --
@@ -188,7 +188,7 @@ static struct dc_softc coldcons_softc;
/* XXX move back into dc_consinit when debugged */
static struct consdev dccons = {
- NULL, NULL, dcGetc, dcPutc, dcPollc, NODEV, CN_REMOTE
+ NULL, NULL, dcGetc, dcPutc, dcPollc, NULL, NODEV, CN_REMOTE
};
void
diff --git a/sys/arch/pmax/dev/dtop.c b/sys/arch/pmax/dev/dtop.c
index 782a1b4c0dd..f7792a6d46b 100644
--- a/sys/arch/pmax/dev/dtop.c
+++ b/sys/arch/pmax/dev/dtop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dtop.c,v 1.48 2000/02/09 08:29:40 nisimura Exp $ */
+/* $NetBSD: dtop.c,v 1.49 2000/03/06 21:36:10 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -94,7 +94,7 @@ SOFTWARE.
********************************************************/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.48 2000/02/09 08:29:40 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.49 2000/03/06 21:36:10 thorpej Exp $");
#include "opt_ddb.h"
#include "rasterconsole.h"
@@ -204,7 +204,7 @@ static u_char divend[NUMDIVS] = {0xff, 0xa5, 0xbc, 0xbe, 0xb2, 0xaf, 0xa8,
static u_long keymodes[8] = {0, 0, 0, 0, 0, 0x0003e800, 0, 0};
struct consdev dtopcons = {
- NULL, NULL, (void *)dtopKBDGetc, NULL, NULL, NODEV, 0
+ NULL, NULL, (void *)dtopKBDGetc, NULL, NULL, NULL, NODEV, 0
};
void dtikbd_cnattach __P((void)); /* XXX */
diff --git a/sys/arch/pmax/pmax/promcall.c b/sys/arch/pmax/pmax/promcall.c
index 0e3d66e15a1..a187e4ea46c 100644
--- a/sys/arch/pmax/pmax/promcall.c
+++ b/sys/arch/pmax/pmax/promcall.c
@@ -1,4 +1,4 @@
-/* $NetBSD: promcall.c,v 1.5 2000/01/10 03:24:40 simonb Exp $ */
+/* $NetBSD: promcall.c,v 1.6 2000/03/06 21:36:11 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.5 2000/01/10 03:24:40 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.6 2000/03/06 21:36:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -71,6 +71,7 @@ struct consdev promcd = {
romgetc, /* getc */
romputc, /* putc */
nullcnpollc, /* pollc */
+ NULL, /* bell */
makedev(0, 0),
CN_DEAD,
};
diff --git a/sys/arch/pmax/tc/scc.c b/sys/arch/pmax/tc/scc.c
index 1a119693c7d..7a5902b0ce2 100644
--- a/sys/arch/pmax/tc/scc.c
+++ b/sys/arch/pmax/tc/scc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scc.c,v 1.64 2000/02/09 08:29:40 nisimura Exp $ */
+/* $NetBSD: scc.c,v 1.65 2000/03/06 21:36:11 thorpej Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.64 2000/02/09 08:29:40 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.65 2000/03/06 21:36:11 thorpej Exp $");
/*
* Intel 82530 dual usart chip driver. Supports the serial port(s) on the
@@ -249,7 +249,7 @@ static int sccintr __P((void *));
scc_regmap_t *scc_cons_addr = 0;
static struct scc_softc coldcons_softc;
static struct consdev scccons = {
- NULL, NULL, sccGetc, sccPutc, sccPollc, NODEV, 0
+ NULL, NULL, sccGetc, sccPutc, sccPollc, NULL, NODEV, 0
};
void
diff --git a/sys/arch/sparc/dev/kd.c b/sys/arch/sparc/dev/kd.c
index c54e57b9309..8f314e882a6 100644
--- a/sys/arch/sparc/dev/kd.c
+++ b/sys/arch/sparc/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.5 1999/08/05 18:08:13 thorpej Exp $ */
+/* $NetBSD: kd.c,v 1.6 2000/03/06 21:36:11 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -486,6 +486,7 @@ struct consdev consdev_kd = {
kdcngetc,
kdcnputc,
kdcnpollc,
+ NULL,
};
/* We never call this. */
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index a09c6319c91..0a6998358ff 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.73 2000/02/14 18:07:37 pk Exp $ */
+/* $NetBSD: zs.c,v 1.74 2000/03/06 21:36:11 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -802,6 +802,7 @@ struct consdev consdev_tty = {
zscngetc,
zscnputc,
nullcnpollc,
+ NULL,
};
static void
diff --git a/sys/arch/sparc64/dev/consinit.c b/sys/arch/sparc64/dev/consinit.c
index 324d39b291a..f79ea4ee562 100644
--- a/sys/arch/sparc64/dev/consinit.c
+++ b/sys/arch/sparc64/dev/consinit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.1 1999/05/23 02:46:35 eeh Exp $ */
+/* $NetBSD: consinit.c,v 1.2 2000/03/06 21:36:11 thorpej Exp $ */
/*-
* Copyright (c) 1999 Eduardo E. Horvath
@@ -81,6 +81,7 @@ struct consdev consdev_prom = {
prom_cngetc,
prom_cnputc,
nullcnpollc,
+ NULL,
};
/*
diff --git a/sys/arch/sparc64/dev/kd.c b/sys/arch/sparc64/dev/kd.c
index 169a1f7acec..c72c2371dab 100644
--- a/sys/arch/sparc64/dev/kd.c
+++ b/sys/arch/sparc64/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.5 1999/08/05 18:08:13 thorpej Exp $ */
+/* $NetBSD: kd.c,v 1.6 2000/03/06 21:36:11 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -474,6 +474,7 @@ struct consdev consdev_kd = {
kdcngetc,
kdcnputc,
kdcnpollc,
+ NULL,
};
/* We never call this. */
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index bd9b43958f3..46f47e798dd 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.13 1999/10/11 01:57:43 eeh Exp $ */
+/* $NetBSD: zs.c,v 1.14 2000/03/06 21:36:12 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -933,6 +933,7 @@ struct consdev consdev_zs = {
zscngetc,
zscnputc,
zscnpollc,
+ NULL,
};
static void
diff --git a/sys/arch/sun3/dev/kd.c b/sys/arch/sun3/dev/kd.c
index 507b9bd0ff1..4f9ab6d5421 100644
--- a/sys/arch/sun3/dev/kd.c
+++ b/sys/arch/sun3/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.27 1999/08/05 18:08:14 thorpej Exp $ */
+/* $NetBSD: kd.c,v 1.28 2000/03/06 21:36:12 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -411,6 +411,7 @@ struct consdev consdev_kd = {
kdcngetc,
kdcnputc,
kdcnpollc,
+ NULL,
};
/* We never call this. */
diff --git a/sys/arch/sun3/dev/zs.c b/sys/arch/sun3/dev/zs.c
index 04e7233ba3d..43e282ff305 100644
--- a/sys/arch/sun3/dev/zs.c
+++ b/sys/arch/sun3/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.59 1999/11/22 18:34:01 jdolecek Exp $ */
+/* $NetBSD: zs.c,v 1.60 2000/03/06 21:36:12 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -702,6 +702,7 @@ struct consdev consdev_tty = {
zscngetc,
zscnputc,
nullcnpollc,
+ NULL,
};
static void
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index 853442f4125..cf09fd4b9f1 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.33 1999/08/04 14:40:54 leo Exp $ */
+/* $NetBSD: cons.c,v 1.34 2000/03/06 21:36:12 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -275,3 +275,13 @@ nullcnpollc(dev, on)
{
}
+
+void
+cnbell(pitch, period, volume)
+ u_int pitch, period, volume;
+{
+
+ if (cn_tab == NULL || cn_tab->cn_bell == NULL)
+ return;
+ (*cn_tab->cn_bell)(cn_tab->cn_dev, pitch, period, volume);
+}
diff --git a/sys/dev/cons.h b/sys/dev/cons.h
index ecb452147d5..d264fd25803 100644
--- a/sys/dev/cons.h
+++ b/sys/dev/cons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.h,v 1.16 1999/12/08 01:20:12 simonb Exp $ */
+/* $NetBSD: cons.h,v 1.17 2000/03/06 21:36:12 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -56,6 +56,8 @@ struct consdev {
__P((dev_t, int));
void (*cn_pollc) /* turn on and off polling */
__P((dev_t, int));
+ void (*cn_bell) /* ring bell */
+ __P((dev_t, u_int, u_int, u_int));
dev_t cn_dev; /* major/minor of device */
int cn_pri; /* pecking order; the higher the better */
};
@@ -84,6 +86,7 @@ int cnpoll __P((dev_t, int, struct proc *));
int cngetc __P((void));
void cnputc __P((int));
void cnpollc __P((int));
+void cnbell __P((u_int, u_int, u_int));
void cnrint __P((void));
void nullcnpollc __P((dev_t, int));
@@ -93,15 +96,20 @@ void nullcnpollc __P((dev_t, int));
#define dev_type_cngetc(n) int n __P((dev_t))
#define dev_type_cnputc(n) void n __P((dev_t, int))
#define dev_type_cnpollc(n) void n __P((dev_t, int))
+#define dev_type_cnbell(n) void n __P((dev_t, u_int, u_int, u_int));
#define cons_decl(n) \
dev_decl(n,cnprobe); dev_decl(n,cninit); dev_decl(n,cngetc); \
- dev_decl(n,cnputc); dev_decl(n,cnpollc)
+ dev_decl(n,cnputc); dev_decl(n,cnpollc); dev_decl(n,cnbell);
#define cons_init(n) { \
dev_init(1,n,cnprobe), dev_init(1,n,cninit), dev_init(1,n,cngetc), \
dev_init(1,n,cnputc), dev_init(1,n,cnpollc) }
+#define cons_init_bell(n) { \
+ dev_init(1,n,cnprobe), dev_init(1,n,cninit), dev_init(1,n,cngetc), \
+ dev_init(1,n,cnputc), dev_init(1,n,cnpollc), dev_init(1,n,cnbell) }
+
#endif
#endif /* _SYS_DEV_CONS_H_ */
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index d9abc8721c1..be6e5842360 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.168 2000/02/07 02:17:18 jonathan Exp $ */
+/* $NetBSD: com.c,v 1.169 2000/03/06 21:36:12 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -2235,7 +2235,8 @@ comcnattach(iot, iobase, rate, frequency, cflag)
{
int res;
static struct consdev comcons = {
- NULL, NULL, comcngetc, comcnputc, comcnpollc, NODEV, CN_NORMAL
+ NULL, NULL, comcngetc, comcnputc, comcnpollc, NULL,
+ NODEV, CN_NORMAL
};
res = cominit(iot, iobase, rate, frequency, cflag, &comconsioh);