From owner-svn-src-all@FreeBSD.ORG  Fri Sep 18 15:39:09 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E452E10656AB;
	Fri, 18 Sep 2009 15:39:09 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D2EA18FC0C;
	Fri, 18 Sep 2009 15:39:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8IFd9Zd094893;
	Fri, 18 Sep 2009 15:39:09 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8IFd9Sl094891;
	Fri, 18 Sep 2009 15:39:09 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200909181539.n8IFd9Sl094891@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 18 Sep 2009 15:39:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197315 - head/sys/dev/syscons
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Sep 2009 15:39:10 -0000

Author: ed
Date: Fri Sep 18 15:39:09 2009
New Revision: 197315
URL: http://svn.freebsd.org/changeset/base/197315

Log:
  Just use ttydisc_rint_simple() instead of doing it ourselves.
  
  This code seems to do exactly the same as ttydisc_rint_simple() does
  nowadays. Just remove it.
  
  Obtained from:	//depot/user/ed/newcons/sys/dev/syscons/syscons.c

Modified:
  head/sys/dev/syscons/syscons.c

Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c	Fri Sep 18 15:12:31 2009	(r197314)
+++ head/sys/dev/syscons/syscons.c	Fri Sep 18 15:39:09 2009	(r197315)
@@ -634,14 +634,8 @@ sckbdevent(keyboard_t *thiskbd, int even
 	    break;
 	case FKEY:  /* function key, return string */
 	    cp = kbdd_get_fkeystr(thiskbd, KEYCHAR(c), &len);
-	    if (cp != NULL) {
-		if (ttydisc_can_bypass(cur_tty)) {
-		    ttydisc_rint_bypass(cur_tty, cp, len);
-	    	} else {
-		    while (len-- >  0)
-			ttydisc_rint(cur_tty, *cp++, 0);
-		}
-	    }
+	    if (cp != NULL)
+	    	ttydisc_rint_simple(cur_tty, cp, len);
 	    break;
 	case MKEY:  /* meta is active, prepend ESC */
 	    ttydisc_rint(cur_tty, 0x1b, 0);