From owner-freebsd-arch@FreeBSD.ORG  Wed Aug 27 21:44:42 2003
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 62FDB16A4BF
	for <freebsd-arch@freebsd.org>; Wed, 27 Aug 2003 21:44:42 -0700 (PDT)
Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 29BEC43F3F
	for <freebsd-arch@freebsd.org>; Wed, 27 Aug 2003 21:44:41 -0700 (PDT)
	(envelope-from imp@bsdimp.com)
Received: from localhost (warner@rover2.village.org [10.0.0.1])
	by harmony.village.org (8.12.9/8.12.3) with ESMTP id h7S4gAwN053979;
	Wed, 27 Aug 2003 22:44:40 -0600 (MDT)
	(envelope-from imp@bsdimp.com)
Date: Wed, 27 Aug 2003 22:40:45 -0600 (MDT)
Message-Id: <20030827.224045.20748146.imp@bsdimp.com>
To: jhay@icomtek.csir.co.za
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <20030827054550.GA53143@zibbi.icomtek.csir.co.za>
References: <20030827054550.GA53143@zibbi.icomtek.csir.co.za>
X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: freebsd-arch@freebsd.org
Subject: Re: pnp code and irq 2 broken
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussion related to FreeBSD architecture
	<freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Aug 2003 04:44:42 -0000

In message: <20030827054550.GA53143@zibbi.icomtek.csir.co.za>
            John Hay <jhay@icomtek.csir.co.za> writes:
: I have worked around it with this crude patch below. Crude because:
: 1) I don't know if it should be an i386 only fix, and
: 2) I used 0x04 directly, maybe IRQ_SLAVE from i386/isa/icu.h or
: some other define should be used?

I'd change 0x04 to 1 << IRQ_SLAVE.  Other than that, it looks good to
me.  I'm not sure of a better place to do this, as it doesn't looke
like a good idea to do the translation in pnp.c.

Warner

: Index: isa/pnpparse.c
: ===================================================================
: RCS file: /home/ncvs/src/sys/isa/pnpparse.c,v
: retrieving revision 1.13
: diff -u -r1.13 pnpparse.c
: --- isa/pnpparse.c	16 Oct 2002 09:07:30 -0000	1.13
: +++ isa/pnpparse.c	19 Jun 2003 06:00:02 -0000
: @@ -110,7 +110,8 @@
:  			if (bootverbose)
:  				pnp_printf(id, "adding irq mask %#02x\n",
:  					   I16(res));
: -			config->ic_irqmask[config->ic_nirq] = I16(res);
: +			config->ic_irqmask[config->ic_nirq] = I16(res) &
: +			    ~0x04;
:  			config->ic_nirq++;
:  			break;