From owner-cvs-all@FreeBSD.ORG  Sat Feb 25 21:59:29 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CAAF716A420;
	Sat, 25 Feb 2006 21:59: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 6F6CB43D46;
	Sat, 25 Feb 2006 21:59: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 k1PLxTFM036313;
	Sat, 25 Feb 2006 21:59:29 GMT
	(envelope-from emax@repoman.freebsd.org)
Received: (from emax@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1PLxT8G036312;
	Sat, 25 Feb 2006 21:59:29 GMT (envelope-from emax)
Message-Id: <200602252159.k1PLxT8G036312@repoman.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Sat, 25 Feb 2006 21:59:29 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/dev/kbdmux kbdmux.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Feb 2006 21:59:30 -0000

emax        2006-02-25 21:59:29 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/kbdmux       kbdmux.c 
  Log:
  Fix hard lockup caused by kbdmux(4) when kbdmux(4), PS/2 keyboard
  (atkbd(4)) and PS/2 mouse (psm(4)) are used together.
  
  Turns out that atkbd(4) check_char() method may return "true" while
  read_char() method returns NOKEY. When this happens kbdmux(4) was
  simply stuck in the dead loop. Avoid dead loop in kbdmux(4) by breaking
  out of the loop if read_char() method returns NOKEY.
  
  It almost seems like a bug in atkkbd(4), atkbd_check_char() calls
  kbdc_data_ready(), and, the later will return "true" if there are
  pending data in either kbd or aux queue. However, because both aux
  and kbd are on the same controller, I'm not sure if this is a bug
  or feature.
  
  Tested by:      markus
  MFC after:      1 day
  
  Revision  Changes    Path
  1.4       +1 -1      src/sys/dev/kbdmux/kbdmux.c