siisata at cardbus

[KIYOHARA Takashi <kiyohara%kk.iij4u.or.jp@localhost>]

Hi! Manuel and all,


I got 'siisata at cardbus' device.  I coordinate siisata_pci.c to
siisata_cardbus.c.

  ftp://ftp.netbsd.org/pub/NetBSD/misc/kiyohara/tmp/siisata_cardbus.diff


And, this patch will appropriate better.
  ftp://ftp.netbsd.org/pub/NetBSD/misc/kiyohara/tmp/siisata.diff

Moreover, this patch might be necessary.  We need set MEM_ENABLE
before GRREAD(sc, GR_GC).


Index: siisata_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/siisata_pci.c,v
retrieving revision 1.1
diff -u -r1.1 siisata_pci.c
--- siisata_pci.c       23 May 2008 21:11:40 -0000      1.1
+++ siisata_pci.c       9 Dec 2008 09:42:58 -0000
@@ -262,6 +262,12 @@
                /* _match() should prevent us from getting here */
                panic("siisata: the universe might be falling apart!\n");
 
+       /* enable bus mastering in case the firmware didn't */
+       csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+       csr |= PCI_COMMAND_MASTER_ENABLE;
+       csr |= PCI_COMMAND_MEM_ENABLE;
+       pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr);
+
        gcreg = GRREAD(sc, GR_GC);
 
        aprint_normal("%s: SiI%d on ", SIISATANAME(sc), sc->sc_chip);
@@ -293,12 +299,6 @@
        else
                aprint_normal("\n");
 
-       /* enable bus mastering in case the firmware didn't */
-       csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
-       csr |= PCI_COMMAND_MASTER_ENABLE;
-       csr |= PCI_COMMAND_MEM_ENABLE;
-       pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr);
-
        siisata_attach(sc);
 
        if (!pmf_device_register(self, NULL, siisata_pci_resume))


Thanks,
--
kiyohara