From owner-cvs-all  Thu Apr 22  4:56:49 1999
Delivered-To: cvs-all@freebsd.org
Received: from freebsd.dk (freebsd.dk [212.242.42.178])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7572E151CA; Thu, 22 Apr 1999 04:56:43 -0700 (PDT)
	(envelope-from sos@freebsd.dk)
Received: (from sos@localhost)
	by freebsd.dk (8.9.1/8.9.1) id NAA36481;
	Thu, 22 Apr 1999 13:53:50 +0200 (CEST)
	(envelope-from sos)
From: Soren Schmidt <sos@freebsd.dk>
Message-Id: <199904221153.NAA36481@freebsd.dk>
Subject: Re: cvs commit: src/sys/alpha/isa isa.c src/sys/alpha/pci pcibus.c src/sys/cam cam_xpt.c src/sys/dev/ata ata-all.c src/sys/i386/
In-Reply-To: <199904211746.LAA10934@harmony.village.org> from Warner Losh at "Apr 21, 1999 11:46:27 am"
To: imp@harmony.village.org (Warner Losh)
Date: Thu, 22 Apr 1999 13:53:50 +0200 (CEST)
Cc: mark@grondar.za, peter@FreeBSD.org, cvs-committers@FreeBSD.org,
	cvs-all@FreeBSD.org
X-Mailer: ELM [version 2.4ME+ PL43 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

It seems Warner Losh wrote:
> In message <199904211738.TAA70806@greenpeace.grondar.za> Mark Murray writes:
> : Want a tester? PCIC is completely hosed for me right now, so I may as
> : well hep get it sorted out :-)
> 
> Sure.  Once I get it sorted out.  pcic is hozed for me right now as
> well....

I did a quick fix for this, it works for me now...
Beware that if you have PCIC support in the kernel, rc.pccard will
load a module on top of it, and the whole thing fails.

Index: i386/isa/intr_machdep.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/intr_machdep.c,v
retrieving revision 1.19
diff -u -r1.19 intr_machdep.c
--- intr_machdep.c	1999/04/21 07:26:27	1.19
+++ intr_machdep.c	1999/04/23 11:16:30
@@ -877,6 +877,7 @@
 		free(irec, M_DEVBUF);
 		return -1;
 	}
+	isareclist[intr] = irec;
 	return 0;
 }
 
Index: pccard/pccard.c
===================================================================
RCS file: /home/ncvs/src/sys/pccard/pccard.c,v
retrieving revision 1.73
diff -u -r1.73 pccard.c
--- pccard.c	1999/03/10 15:00:54	1.73
+++ pccard.c	1999/04/23 11:18:23
@@ -527,7 +527,7 @@
 		if (!(mask & imask))
 			continue;
 		INTRMASK(*maskp, mask);
-		if (register_pcic_intr(irq, 0, 0, hand, maskp, unit) == 0) {
+		if (register_pcic_intr(irq, unit, 0, hand, maskp, unit) == 0) {
 			/* add this to the PCIC controller's mask */
 			if (pcic_imask)
 				INTRMASK(*pcic_imask, (1 << irq));
Index: pci/pcisupport.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/pcisupport.c,v
retrieving revision 1.100
diff -u -r1.100 pcisupport.c
--- pcisupport.c	1999/04/20 11:36:36	1.100
+++ pcisupport.c	1999/04/23 11:20:40
@@ -1166,7 +1166,9 @@
 	if (pci_get_class(dev) == PCIC_BRIDGE
 	    && pci_get_subclass(dev) != PCIS_BRIDGE_PCI
 	    && pci_get_subclass(dev) != PCIS_BRIDGE_ISA
-	    && pci_get_subclass(dev) != PCIS_BRIDGE_EISA)
+	    && pci_get_subclass(dev) != PCIS_BRIDGE_EISA
+    	    && pci_get_subclass(dev) != PCIS_BRIDGE_PCMCIA
+    	    && pci_get_subclass(dev) != PCIS_BRIDGE_CARDBUS)
 		return pci_bridge_type(dev);
 
 	return NULL;

-Søren


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message