From owner-svn-src-all@FreeBSD.ORG  Sat Aug 27 22:10:45 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 715BE106564A;
	Sat, 27 Aug 2011 22:10:45 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 616958FC15;
	Sat, 27 Aug 2011 22:10:45 +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 p7RMAjTP022900;
	Sat, 27 Aug 2011 22:10:45 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7RMAjlZ022897;
	Sat, 27 Aug 2011 22:10:45 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201108272210.p7RMAjlZ022897@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 27 Aug 2011 22:10:45 +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: r225221 - 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: Sat, 27 Aug 2011 22:10:45 -0000

Author: rwatson
Date: Sat Aug 27 22:10:45 2011
New Revision: 225221
URL: http://svn.freebsd.org/changeset/base/225221

Log:
  Add support for alternative break-to-debugger to syscons(4).  While most
  keyboards allow console break sequences (such as ctrl-alt-esc) to be
  entered, alternative break can prove useful under virtualisation and
  remote console systems where entering control sequences can be
  difficult or unreliable.
  
  MFC after:	3 weeks
  Approved by:	re (bz)

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

Modified: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c	Sat Aug 27 22:08:01 2011	(r225220)
+++ head/sys/dev/syscons/syscons.c	Sat Aug 27 22:10:45 2011	(r225221)
@@ -3562,6 +3562,10 @@ next_code:
 	    /* goto next_code */
 	} else {
 	    /* regular keys (maybe MKEY is set) */
+#if !defined(SC_DISABLE_KDBKEY) && defined(KDB)
+	    if (enable_kdbkey)
+		kdb_alt_break(c, &sc->sc_altbrk);
+#endif
 	    if (!(sc->flags & SC_SCRN_BLANKED))
 		return c;
 	}

Modified: head/sys/dev/syscons/syscons.h
==============================================================================
--- head/sys/dev/syscons/syscons.h	Sat Aug 27 22:08:01 2011	(r225220)
+++ head/sys/dev/syscons/syscons.h	Sat Aug 27 22:10:45 2011	(r225221)
@@ -266,6 +266,9 @@ typedef struct sc_softc {
 	u_char		cursor_char;
 	u_char		mouse_char;
 
+#ifdef KDB
+	int		sc_altbrk;
+#endif
 } sc_softc_t;
 
 /* virtual screen */