cardbus no longer working with -CURRENT and ACPI

[John Baldwin]

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 at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/