Deleted Added
full compact
syscons.c (111162) syscons.c (111194)
1/*-
2 * Copyright (c) 1992-1998 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1992-1998 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * $FreeBSD: head/sys/dev/syscons/syscons.c 111162 2003-02-20 03:27:09Z cognet $
28 * $FreeBSD: head/sys/dev/syscons/syscons.c 111194 2003-02-20 20:54:45Z phk $
29 */
30
31#include "opt_syscons.h"
32#include "opt_splash.h"
33#include "opt_ddb.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 1426 unchanged lines hidden (view full) ---

1463 sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
1464 consdev.cn_dev = makedev(CDEV_MAJOR, 0);
1465 cnadd(&consdev);
1466}
1467
1468#endif /* __alpha__ */
1469
1470static void
29 */
30
31#include "opt_syscons.h"
32#include "opt_splash.h"
33#include "opt_ddb.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 1426 unchanged lines hidden (view full) ---

1463 sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]);
1464 consdev.cn_dev = makedev(CDEV_MAJOR, 0);
1465 cnadd(&consdev);
1466}
1467
1468#endif /* __alpha__ */
1469
1470static void
1471sccnputc(dev_t dev, int c)
1471sccnputc(struct consdev *cd, int c)
1472{
1473 u_char buf[1];
1474 scr_stat *scp = sc_console;
1475 void *save;
1476#ifndef SC_NO_HISTORY
1477 struct tty *tp;
1478#endif /* !SC_NO_HISTORY */
1479 int s;

--- 25 unchanged lines hidden (view full) ---

1505 scp->ts = save;
1506
1507 s = spltty(); /* block sckbdevent and scrn_timer */
1508 sccnupdate(scp);
1509 splx(s);
1510}
1511
1512static int
1472{
1473 u_char buf[1];
1474 scr_stat *scp = sc_console;
1475 void *save;
1476#ifndef SC_NO_HISTORY
1477 struct tty *tp;
1478#endif /* !SC_NO_HISTORY */
1479 int s;

--- 25 unchanged lines hidden (view full) ---

1505 scp->ts = save;
1506
1507 s = spltty(); /* block sckbdevent and scrn_timer */
1508 sccnupdate(scp);
1509 splx(s);
1510}
1511
1512static int
1513sccngetc(dev_t dev)
1513sccngetc(struct consdev *cd)
1514{
1515 return sccngetch(0);
1516}
1517
1518static int
1514{
1515 return sccngetch(0);
1516}
1517
1518static int
1519sccncheckc(dev_t dev)
1519sccncheckc(struct consdev *cd)
1520{
1521 return sccngetch(SCGETC_NONBLOCK);
1522}
1523
1524static void
1520{
1521 return sccngetch(SCGETC_NONBLOCK);
1522}
1523
1524static void
1525sccndbctl(dev_t dev, int on)
1525sccndbctl(struct consdev *cd, int on)
1526{
1527 /* assert(sc_console_unit >= 0) */
1528 /* try to switch to the kernel console screen */
1529 if (on && debugger == 0) {
1530 /*
1531 * TRY to make sure the screen saver is stopped,
1532 * and the screen is updated before switching to
1533 * the vty0.

--- 2044 unchanged lines hidden ---
1526{
1527 /* assert(sc_console_unit >= 0) */
1528 /* try to switch to the kernel console screen */
1529 if (on && debugger == 0) {
1530 /*
1531 * TRY to make sure the screen saver is stopped,
1532 * and the screen is updated before switching to
1533 * the vty0.

--- 2044 unchanged lines hidden ---