If you have PCMCIA cards which cause ``CIS checksum failed'' messages to
appear when inserted, please try the following diff and let me know if
the message disappears.

And if you have PCMCIA cards which do not cause the checksum failed
message to appear, please try this diff anyway and let me know if the
message suddenly appears - it should not.

Miod

PS: this diff conflicts with the `indirect CIS' diff I mailed earlier.
Do not try both at once!

Index: pcmcia_cis.c
===================================================================
RCS file: /cvs/src/sys/dev/pcmcia/pcmcia_cis.c,v
retrieving revision 1.15
diff -u -p -r1.15 pcmcia_cis.c
--- pcmcia_cis.c        11 Sep 2007 13:39:34 -0000      1.15
+++ pcmcia_cis.c        1 Sep 2010 18:06:16 -0000
@@ -251,10 +251,8 @@ pcmcia_scan_cis(dev, fct, arg)
                                        }
                                        sum = 0;
                                        for (i = 0; i < length; i++)
-                                               sum +=
-                                                   bus_space_read_1(tuple.memt,
-                                                   tuple.memh,
-                                                   addr + tuple.mult * i);
+                                               sum += pcmcia_cis_read_1(&tuple,
+                                                   addr + i);
                                        if (cksum != (sum & 0xff)) {
                                                DPRINTF((" failed sum=%x\n",
                                                    sum));

Reply via email to