From af60af2dc0a25e1682721590fecf9440b10ca8c5 Mon Sep 17 00:00:00 2001 From: Maksim Yevmenkin Date: Thu, 9 Apr 2009 18:22:51 +0000 Subject: Remove obsolete/bogus layering. Reviewed by: freebsd-current@, freebsd-hackers@ MFC after: 1 week --- sys/dev/syscons/syscons.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 6791d64cb1bc..77f4e61fed9a 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -173,7 +173,6 @@ static void scshutdown(void *arg, int howto); static u_int scgetc(sc_softc_t *sc, u_int flags); #define SCGETC_CN 1 #define SCGETC_NONBLOCK 2 -static int sccngetch(int flags); static void sccnupdate(scr_stat *scp); static scr_stat *alloc_scp(sc_softc_t *sc, int vty); static void init_scp(sc_softc_t *sc, int vty, scr_stat *scp); @@ -1532,12 +1531,6 @@ sc_cnputc(struct consdev *cd, int c) static int sc_cngetc(struct consdev *cd) -{ - return sccngetch(SCGETC_NONBLOCK); -} - -static int -sccngetch(int flags) { static struct fkeytab fkey; static int fkeycp; @@ -1579,7 +1572,7 @@ sccngetch(int flags) kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); kbdd_poll(scp->sc->kbd, TRUE); - c = scgetc(scp->sc, SCGETC_CN | flags); + c = scgetc(scp->sc, SCGETC_CN | SCGETC_NONBLOCK); kbdd_poll(scp->sc->kbd, FALSE); scp->kbd_mode = cur_mode; -- cgit v1.3