From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KE45F-0007qB-BV
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 11:17:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KE45E-0007pR-8t
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 11:17:24 -0400
Received: from [199.232.76.173] (port=41689 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KE45E-0007pJ-1U
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 11:17:24 -0400
Received: from savannah.gnu.org ([199.232.41.3]:53876 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <blauwirbel@gmail.com>)
	id 1KE45D-0001HJ-Mh
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 11:17:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <blauwirbel@gmail.com>) id 1KE45C-00033k-VC
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 15:17:23 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1KE45C-00033b-Gd
	for qemu-devel@nongnu.org; Wed, 02 Jul 2008 15:17:22 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1KE45C-00033b-Gd@cvs.savannah.gnu.org>
Date: Wed, 02 Jul 2008 15:17:22 +0000
Subject: [Qemu-devel] [4822] Fix NetBSD keyboard problem
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4822
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4822
Author:   blueswir1
Date:     2008-07-02 15:17:21 +0000 (Wed, 02 Jul 2008)

Log Message:
-----------
Fix NetBSD keyboard problem

Modified Paths:
--------------
    trunk/hw/slavio_serial.c

Modified: trunk/hw/slavio_serial.c
===================================================================
--- trunk/hw/slavio_serial.c	2008-07-02 15:16:18 UTC (rev 4821)
+++ trunk/hw/slavio_serial.c	2008-07-02 15:17:21 UTC (rev 4822)
@@ -260,8 +260,7 @@
 
 static int slavio_serial_update_irq_chn(ChannelState *s)
 {
-    if ((s->wregs[W_INTR] & INTR_INTALL) && // interrupts enabled
-        (((s->wregs[W_INTR] & INTR_TXINT) && s->txint == 1) ||
+    if ((((s->wregs[W_INTR] & INTR_TXINT) && s->txint == 1) ||
          // tx ints enabled, pending
          ((((s->wregs[W_INTR] & INTR_RXMODEMSK) == INTR_RXINT1ST) ||
            ((s->wregs[W_INTR] & INTR_RXMODEMSK) == INTR_RXINTALL)) &&