diff options
author | kato <kato@FreeBSD.org> | 1999-01-08 16:09:23 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1999-01-08 16:09:23 +0000 |
commit | ff153c1347827ed9ba52305c99f5c37b45951ff0 (patch) | |
tree | d21526fea899239b50e0c5ba224dc84d1c55461d /sys/pc98 | |
parent | d7d67115d6ac3dbc126677b365891a350bb1bffa (diff) | |
download | FreeBSD-src-ff153c1347827ed9ba52305c99f5c37b45951ff0.zip FreeBSD-src-ff153c1347827ed9ba52305c99f5c37b45951ff0.tar.gz |
Sync with sys/i386/isa/sio.c and syscons.c revisions 1.221 and 1.289,
respectively.
Diffstat (limited to 'sys/pc98')
-rw-r--r-- | sys/pc98/cbus/sio.c | 20 | ||||
-rw-r--r-- | sys/pc98/pc98/sio.c | 20 | ||||
-rw-r--r-- | sys/pc98/pc98/syscons.c | 20 |
3 files changed, 46 insertions, 14 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index b883a17..e84dc28 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.72 1999/01/03 05:03:47 kato Exp $ + * $Id: sio.c,v 1.73 1999/01/03 15:57:02 kato Exp $ */ #include "opt_comconsole.h" @@ -3821,6 +3821,18 @@ static void siocnclose __P((struct siocnstate *sp)); static void siocnopen __P((struct siocnstate *sp)); static void siocntxwait __P((void)); +/* + * XXX: sciocnget() and sciocnputc() are not declared static, as they are + * referred to from i386/i386/i386-gdbstub.c. + */ +static cn_probe_t siocnprobe; +static cn_init_t siocninit; +static cn_checkc_t siocncheckc; + cn_getc_t siocngetc; + cn_putc_t siocnputc; + +CONS_DRIVER(sio, siocnprobe, siocninit, siocngetc, siocncheckc, siocnputc); + static void siocntxwait() { @@ -3942,7 +3954,7 @@ siocnclose(sp) outb(iobase + com_ier, sp->ier); } -void +static void siocnprobe(cp) struct consdev *cp; { @@ -4008,14 +4020,14 @@ siocnprobe(cp) } } -void +static void siocninit(cp) struct consdev *cp; { comconsole = DEV_TO_UNIT(cp->cn_dev); } -int +static int siocncheckc(dev) dev_t dev; { diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index b883a17..e84dc28 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.72 1999/01/03 05:03:47 kato Exp $ + * $Id: sio.c,v 1.73 1999/01/03 15:57:02 kato Exp $ */ #include "opt_comconsole.h" @@ -3821,6 +3821,18 @@ static void siocnclose __P((struct siocnstate *sp)); static void siocnopen __P((struct siocnstate *sp)); static void siocntxwait __P((void)); +/* + * XXX: sciocnget() and sciocnputc() are not declared static, as they are + * referred to from i386/i386/i386-gdbstub.c. + */ +static cn_probe_t siocnprobe; +static cn_init_t siocninit; +static cn_checkc_t siocncheckc; + cn_getc_t siocngetc; + cn_putc_t siocnputc; + +CONS_DRIVER(sio, siocnprobe, siocninit, siocngetc, siocncheckc, siocnputc); + static void siocntxwait() { @@ -3942,7 +3954,7 @@ siocnclose(sp) outb(iobase + com_ier, sp->ier); } -void +static void siocnprobe(cp) struct consdev *cp; { @@ -4008,14 +4020,14 @@ siocnprobe(cp) } } -void +static void siocninit(cp) struct consdev *cp; { comconsole = DEV_TO_UNIT(cp->cn_dev); } -int +static int siocncheckc(dev) dev_t dev; { diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index f71f45d..c0fa332 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.103 1998/11/08 12:39:05 dfr Exp $ + * $Id: syscons.c,v 1.104 1998/12/16 14:57:37 kato Exp $ */ #include "sc.h" @@ -345,6 +345,14 @@ static void scsplash_saver(int show); #define scsplash_stick(stick) #endif +static cn_probe_t sccnprobe; +static cn_init_t sccninit; +static cn_getc_t sccngetc; +static cn_checkc_t sccncheckc; +static cn_putc_t sccnputc; + +CONS_DRIVER(sc, sccnprobe, sccninit, sccngetc, sccncheckc, sccnputc); + struct isa_driver scdriver = { scprobe, scattach, "sc", 1 }; @@ -2084,7 +2092,7 @@ scmousestart(struct tty *tp) splx(s); } -void +static void sccnprobe(struct consdev *cp) { struct isa_device *dvp; @@ -2110,13 +2118,13 @@ sccnprobe(struct consdev *cp) sc_kbdc = kbdc_open(sc_port); } -void +static void sccninit(struct consdev *cp) { scinit(); } -void +static void sccnputc(dev_t dev, int c) { u_char buf[1]; @@ -2139,7 +2147,7 @@ sccnputc(dev_t dev, int c) splx(s); } -int +static int sccngetc(dev_t dev) { int s = spltty(); /* block scintr and scrn_timer while we poll */ @@ -2158,7 +2166,7 @@ sccngetc(dev_t dev) return(c); } -int +static int sccncheckc(dev_t dev) { int s = spltty(); /* block scintr and scrn_timer while we poll */ |