cvs commit: src/sys/dev/cardbus cardbus.c

[Daniel Eischen]

On Tue, 8 Mar 2005, Scott Long wrote:

> Kevin Oberman wrote:
> > Oops! I sent the wrong diff. Sorry, It was an older one. The current one
> > is:
> > --- sys/pci/if_dc.c.orig        Thu Mar  3 16:00:57 2005
> > +++ sys/pci/if_dc.c     Tue Mar  8 14:41:20 2005

[ ... ]

> > I can confirm that this one makes my Xircom card work just fine. It
> > would be nice to get this committed if it's an acceptable fix. I have no
> > idea who should do this as if_dc does not show up in MAINTAINERS. I guess
> > most any committer (Scott...Warner?) can do it.
>
> Done, thanks!

Scott, you forgot a comma.  See fix at end.

To be clear, this commit does not address the problem from before
this thread was hijacked ;-).  With or without the dc commit,
the dc driver either does not recognize the card at all, or it
does and can't map the interrupt and panics when it tries to
detach.  It seems to be random as to which one occurs.  I suspect
something is not getting properly initialized or its getting
stomped on.

-- 
DE

Index: if_dc.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_dc.c,v
retrieving revision 1.156
diff -u -r1.156 if_dc.c
--- if_dc.c	8 Mar 2005 23:25:46 -0000	1.156
+++ if_dc.c	9 Mar 2005 00:10:36 -0000
@@ -2148,7 +2148,7 @@

 	/* Allocate a busdma tag for mbufs. */
 	error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
-	    BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES DC_TX_LIST_CNT, MCLBYTES,
+	    BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, DC_TX_LIST_CNT, MCLBYTES,
 	    0, NULL, NULL, &sc->dc_mtag);
 	if (error) {
 		printf("dc%d: failed to allocate busdma tag\n", unit);