diff options
| author | emax <emax@FreeBSD.org> | 2009-04-09 18:22:51 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2009-04-09 18:22:51 +0000 |
| commit | 33034a467e1f29710fb122deec02131a15f57625 (patch) | |
| tree | e4c60e2db774603df43fe4da8eae574e0685ebc9 | |
| parent | 72be4f0804adc397bab3f63b91ee2ed5d71614b4 (diff) | |
| download | FreeBSD-src-33034a467e1f29710fb122deec02131a15f57625.zip FreeBSD-src-33034a467e1f29710fb122deec02131a15f57625.tar.gz | |
Remove obsolete/bogus layering.
Reviewed by: freebsd-current@, freebsd-hackers@
MFC after: 1 week
| -rw-r--r-- | sys/dev/syscons/syscons.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 6791d64..77f4e61 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); @@ -1533,12 +1532,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; scr_stat *scp; @@ -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; |
