From owner-svn-src-all@FreeBSD.ORG  Wed Dec 21 12:21:22 2011
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 9F308106566B;
	Wed, 21 Dec 2011 12:21:22 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E0D58FC08;
	Wed, 21 Dec 2011 12:21:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBLCLMqE068140;
	Wed, 21 Dec 2011 12:21:22 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBLCLMmN068138;
	Wed, 21 Dec 2011 12:21:22 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201112211221.pBLCLMmN068138@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 21 Dec 2011 12:21:22 +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: r228767 - 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: Wed, 21 Dec 2011 12:21:22 -0000

Author: avg
Date: Wed Dec 21 12:21:22 2011
New Revision: 228767
URL: http://svn.freebsd.org/changeset/base/228767

Log:
  sc_cngrab: switch to console vty when possible
  
  In the future we may want to perform the switch even if the console is
  currently in the graphics mode by trying to reset the video adapter first
  (e.g. by executing vesa/vga bios post).  That would probably require
  some sort of a one-way flag as returning the control of the console back
  to the interrupted application most likely would result in a mess.
  
  Reviewed by:	emaste
  MFC after:	2 months

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

Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c	Wed Dec 21 12:07:14 2011	(r228766)
+++ head/sys/dev/syscons/syscons.c	Wed Dec 21 12:21:22 2011	(r228767)
@@ -1615,7 +1615,14 @@ sc_cngrab(struct consdev *cp)
 {
     scr_stat *scp;
 
+    if (!cold &&
+	sc_console->sc->cur_scp->index != sc_console->index &&
+	sc_console->sc->cur_scp->smode.mode == VT_AUTO &&
+	sc_console->smode.mode == VT_AUTO)
+	    sc_switch_scr(sc_console->sc, sc_console->index);
+
     scp = sc_console->sc->cur_scp;
+
     if (scp->sc->kbd == NULL)
 	return;