pccbb.c

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

struct pcic_handle in pccbbvar.h no longer has event_thread nor sock members
(as opposed to the one in ic/i82365var.h)

Cheers,

Patrick

Index: pccbb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pccbb.c,v
retrieving revision 1.174
diff -u -r1.174 pccbb.c
--- pccbb.c     26 Jun 2008 12:33:17 -0000      1.174
+++ pccbb.c     26 Jun 2008 16:20:29 -0000
@@ -2384,13 +2384,8 @@
                panic("pccbb_pcmcia_delay: called with timeout %d", timo);
        if (!curlwp)
                panic("pccbb_pcmcia_delay: called in interrupt context");
-#if 0
-       if (!ph->event_thread)
-               panic("pccbb_pcmcia_delay: no event thread");
-#endif
 #endif
-       DPRINTF(("pccbb_pcmcia_delay: \"%s\" %p, sleep %d ms\n",
-           wmesg, ph->event_thread, timo));
+       DPRINTF(("pccbb_pcmcia_delay: \"%s\", sleep %d ms\n", wmesg, timo));
        tsleep(pccbb_pcmcia_delay, PWAIT, wmesg, roundup(timo * hz, 1000) / 
1000);
 }
 
@@ -2549,9 +2544,9 @@
                intr |= PCIC_INTR_CARDTYPE_MEM;
        Pcic_write(ph, PCIC_INTR, intr);
 
-       DPRINTF(("%s: pccbb_pcmcia_socket_settype %02x type %s %02x\n",
+       DPRINTF(("%s: pccbb_pcmcia_socket_settype type %s %02x\n",
            device_xname(ph->ph_parent->sc_dev),
-           ph->sock, ((type == PCMCIA_IFTYPE_IO) ? "io" : "mem"), intr));
+           ((type == PCMCIA_IFTYPE_IO) ? "io" : "mem"), intr));
 }
 
 /*