Date: Thu, 9 Apr 2009 18:22:51 +0000 (UTC) From: Maksim Yevmenkin <emax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190868 - head/sys/dev/syscons Message-ID: <200904091822.n39IMp0x013184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emax Date: Thu Apr 9 18:22:51 2009 New Revision: 190868 URL: http://svn.freebsd.org/changeset/base/190868 Log: Remove obsolete/bogus layering. Reviewed by: freebsd-current@, freebsd-hackers@ MFC after: 1 week Modified: head/sys/dev/syscons/syscons.c Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Thu Apr 9 16:53:59 2009 (r190867) +++ head/sys/dev/syscons/syscons.c Thu Apr 9 18:22:51 2009 (r190868) @@ -173,7 +173,6 @@ static void scshutdown(void *arg, int ho 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904091822.n39IMp0x013184>