diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1996-09-14 04:27:46 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1996-09-14 04:27:46 +0000 |
| commit | daed6ffd24d37843e91228b6f19f4854edb1928f (patch) | |
| tree | b3213d6fc0cfefdd1d4313c9f142b7d0eaae3b30 /sys/dev | |
| parent | 40b55a34aec0f568d296842931d6dad02e57b683 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sio/sio.c | 4 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 2aa4dfc185d0..8976cae1ace1 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.144 1996/07/17 22:07:23 julian Exp $ + * $Id: sio.c,v 1.145 1996/09/06 23:08:05 phk Exp $ */ #include "opt_comconsole.h" @@ -2415,7 +2415,7 @@ siocncheckc(dev) if (inb(iobase + com_lsr) & LSR_RXRDY) c = inb(iobase + com_data); else - c = 0; + c = -1; siocnclose(&sp); splx(s); return (c); diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 533596d045b4..cce50f0ff16c 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/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.169 1996/09/09 19:02:26 sos Exp $ + * $Id: syscons.c,v 1.170 1996/09/10 19:14:49 peter Exp $ */ #include "sc.h" @@ -1428,7 +1428,12 @@ sccngetc(dev_t dev) int sccncheckc(dev_t dev) { - return (scgetc(1) & 0xff); + int c, s; + + s = spltty(); + c = scgetc(1); + splx(s); + return(c == NOKEY ? -1 : c); /* c == -1 can't happen */ } static void |