From owner-freebsd-current@FreeBSD.ORG  Tue Nov 18 13:03:59 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1FAC116A4CE
	for <current@freebsd.org>; Tue, 18 Nov 2003 13:03:59 -0800 (PST)
Received: from mail.speakeasy.net (mail6.speakeasy.net [216.254.0.206])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B5F743FDF
	for <current@freebsd.org>; Tue, 18 Nov 2003 13:03:57 -0800 (PST)
	(envelope-from jhb@FreeBSD.org)
Received: (qmail 24137 invoked from network); 18 Nov 2003 21:03:55 -0000
Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63])
	(envelope-sender <jhb@FreeBSD.org>)encrypted SMTP
	for <current@freebsd.org>; 18 Nov 2003 21:03:55 -0000
Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1])
	by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id hAIL3pFn019694;
	Tue, 18 Nov 2003 16:03:52 -0500 (EST)
	(envelope-from jhb@FreeBSD.org)
Message-ID: <XFMail.20031118160350.jhb@FreeBSD.org>
X-Mailer: XFMail 1.5.4 on FreeBSD
X-Priority: 3 (Normal)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
In-Reply-To: <3FB6A344.14489.1B3A005@localhost>
Date: Tue, 18 Nov 2003 16:03:50 -0500 (EST)
From: John Baldwin <jhb@FreeBSD.org>
To: Dylan Wylie <d.wylie@hccnet.nl>
X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
cc: current@freebsd.org
cc: freebsd-mobile@freebsd.org
Subject: RE: cardbus no longer working with -CURRENT and ACPI
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Nov 2003 21:03:59 -0000


On 15-Nov-2003 Dylan Wylie wrote:
> List,
> 
> Running -CURRENT now gives the following problem on a Compaq Pressario 1600-
> XL144 laptop:
> 
> [...]
> cbb0: <TI1211 PCI-CardBus Bridge>  at device 10.0 on pci0
> cardbus0: <CardBus bus> on cbb0
> pccard0: <16-bit PCCard bus> on cbb0
> pcib0: _PRS resource entry has unsupported type 0
> cbb: Unable to map IRQ...
> device_probe_and_attach: cbb0 attache returned 12
> [...]

Umm.  ARGH!

Can you try this:

Index: acpi_pcib.c
===================================================================
RCS file: /usr/cvs/src/sys/dev/acpica/acpi_pcib.c,v
retrieving revision 1.33
diff -u -r1.33 acpi_pcib.c
--- acpi_pcib.c 14 Nov 2003 21:36:09 -0000      1.33
+++ acpi_pcib.c 18 Nov 2003 19:40:31 -0000
@@ -287,7 +287,7 @@
     }
 
     /* type-check the resource we've got */
-    if (prsres->Id != ACPI_RSTYPE_IRQ || prsres->Id != ACPI_RSTYPE_EXT_IRQ) {
+    if (prsres->Id != ACPI_RSTYPE_IRQ && prsres->Id != ACPI_RSTYPE_EXT_IRQ) {
        device_printf(pcib, "_PRS resource entry has unsupported type %d\n",
            prsres->Id);
        goto out;
                                                                                

-- 

John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/