From owner-cvs-src@FreeBSD.ORG Sat Mar 4 00:41:29 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F19216A420; Sat, 4 Mar 2006 00:41:29 +0000 (GMT) (envelope-from emax@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A2FD43D48; Sat, 4 Mar 2006 00:41:29 +0000 (GMT) (envelope-from emax@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k240fTOH086949; Sat, 4 Mar 2006 00:41:29 GMT (envelope-from emax@repoman.freebsd.org) Received: (from emax@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k240fTNE086948; Sat, 4 Mar 2006 00:41:29 GMT (envelope-from emax) Message-Id: <200603040041.k240fTNE086948@repoman.freebsd.org> From: Maksim Yevmenkin Date: Sat, 4 Mar 2006 00:41:28 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/dev/kbd kbd.c src/sys/dev/syscons syscons.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 00:41:29 -0000 emax 2006-03-04 00:41:28 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/dev/kbd kbd.c sys/dev/syscons syscons.c Log: MFC: Integrate kbdmux(4) into syscons(4) and kbd code. By default syscons(4) will look for the kbdmux(4) keyboard first, and then, if not found, look for any keyboard. Current kbd code is modified so if kbdmux(4) is the current keyboard, all new keyboards are automatically added to the kbdmux(4). Switch to kbdmux(4) can be done at boot time, by loading kbdmux module at the loader prompt, or at runtime, by kldload'ing the kbdmux module and releasing current active keyboard. If, for whatever reason, kbdmux(4) is not required/desired then just do not load it and everything should work as before. It is also possible to kldunload kbdmux at runtime and syscons(4) will automatically switch to the first available keyboard. Approved by: re (scottl) Revision Changes Path 1.43.2.2 +24 -0 src/sys/dev/kbd/kbd.c 1.436.2.5 +42 -4 src/sys/dev/syscons/syscons.c