summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/pci/pcic_pci_machdep.c7
-rw-r--r--sys/dev/isa/i82365_isa.c4
-rw-r--r--sys/dev/isa/i82365_isasubr.c11
-rw-r--r--sys/dev/isa/i82365_isavar.h4
-rw-r--r--sys/dev/isa/tcic2_isa.c7
-rw-r--r--sys/dev/pci/i82365_pcivar.h4
-rw-r--r--sys/dev/pci/pccbb.c7
-rw-r--r--sys/dev/pcmcia/aic_pcmcia.c5
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c12
-rw-r--r--sys/dev/pcmcia/esp_pcmcia.c7
-rw-r--r--sys/dev/pcmcia/if_an_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_cnw.c11
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c14
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c12
-rw-r--r--sys/dev/pcmcia/if_ray.c4
-rw-r--r--sys/dev/pcmcia/if_rln_pcmcia.c11
-rw-r--r--sys/dev/pcmcia/if_sm_pcmcia.c12
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_xe.c10
-rw-r--r--sys/dev/pcmcia/pcmcia.c16
-rw-r--r--sys/dev/pcmcia/pcmciachip.h8
-rw-r--r--sys/dev/pcmcia/pcmciavar.h4
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c8
24 files changed, 105 insertions, 101 deletions
diff --git a/sys/arch/i386/pci/pcic_pci_machdep.c b/sys/arch/i386/pci/pcic_pci_machdep.c
index bbdedb4c05b..4f7e1bbf3ca 100644
--- a/sys/arch/i386/pci/pcic_pci_machdep.c
+++ b/sys/arch/i386/pci/pcic_pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcic_pci_machdep.c,v 1.1 2000/08/01 07:55:38 aaron Exp $ */
+/* $OpenBSD: pcic_pci_machdep.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: pcic_pci_machdep.c,v 1.1 1998/12/20 17:53:29 nathanw Exp $ */
/*
@@ -69,14 +69,15 @@ pcic_pci_machdep_pcic_intr_establish(sc, fct)
}
void *
-pcic_pci_machdep_chip_intr_establish(pch, pf, ipl, fct, arg)
+pcic_pci_machdep_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
pcmcia_chipset_handle_t pch;
struct pcmcia_function *pf;
int ipl;
int (*fct) __P((void *));
void *arg;
+ char *xname;
{
- return (pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg));
+ return (pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname));
}
void
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 47cb167b060..e1986cd9a15 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isa.c,v 1.12 2000/07/03 02:59:24 aaron Exp $ */
+/* $OpenBSD: i82365_isa.c,v 1.13 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */
/*
@@ -64,7 +64,7 @@ int pcic_isa_probe __P((struct device *, void *, void *));
void pcic_isa_attach __P((struct device *, struct device *, void *));
void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
- struct pcmcia_function *, int, int (*) (void *), void *));
+ struct pcmcia_function *, int, int (*) (void *), void *, char *));
void pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
struct cfattach pcic_isa_ca = {
diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c
index 55dd350d0d1..2519159c058 100644
--- a/sys/dev/isa/i82365_isasubr.c
+++ b/sys/dev/isa/i82365_isasubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isasubr.c,v 1.14 2000/07/03 19:02:47 niklas Exp $ */
+/* $OpenBSD: i82365_isasubr.c,v 1.15 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: i82365_isasubr.c,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */
/*
@@ -184,12 +184,13 @@ pcic_isa_bus_width_probe(sc, iot, ioh, base, length)
void *
-pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
+pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
pcmcia_chipset_handle_t pch;
struct pcmcia_function *pf;
int ipl;
int (*fct) __P((void *));
void *arg;
+ char *xname;
{
struct pcic_handle *h = (struct pcic_handle *)pch;
struct pcic_softc *sc = (struct pcic_softc *)(h->ph_parent);
@@ -218,7 +219,11 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
if (!ih)
return (NULL);
- printf(" irq %d", irq);
+ if (xname) {
+ printf("%s: irq %d", xname, irq);
+ if (*xname)
+ printf("\n");
+ }
return (ih);
}
diff --git a/sys/dev/isa/i82365_isavar.h b/sys/dev/isa/i82365_isavar.h
index ef94d6a6fb0..c1951b4afa0 100644
--- a/sys/dev/isa/i82365_isavar.h
+++ b/sys/dev/isa/i82365_isavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isavar.h,v 1.3 1999/08/11 12:02:07 niklas Exp $ */
+/* $OpenBSD: i82365_isavar.h,v 1.4 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: i82365_isavar.h,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */
/*
@@ -39,7 +39,7 @@ extern int npcic_isa_intr_list;
*/
void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
- struct pcmcia_function *, int, int (*) (void *), void *));
+ struct pcmcia_function *, int, int (*) (void *), void *, char *));
void pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
/*
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 725e5e49fb3..aa91660a958 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcic2_isa.c,v 1.1 2000/05/15 04:17:29 jason Exp $ */
+/* $OpenBSD: tcic2_isa.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $ */
#undef TCICISADEBUG
@@ -112,7 +112,7 @@ int tcic_isa_probe __P((struct device *, void *, void *));
void tcic_isa_attach __P((struct device *, struct device *, void *));
void *tcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
- struct pcmcia_function *, int, int (*) (void *), void *));
+ struct pcmcia_function *, int, int (*) (void *), void *, char *));
void tcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
struct cfattach tcic_isa_ca = {
@@ -308,12 +308,13 @@ tcic_isa_attach(parent, self, aux)
}
void *
-tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
+tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
pcmcia_chipset_handle_t pch;
struct pcmcia_function *pf;
int ipl;
int (*fct) __P((void *));
void *arg;
+ char *xname;
{
struct tcic_handle *h = (struct tcic_handle *) pch;
int irq, ist, val, reg;
diff --git a/sys/dev/pci/i82365_pcivar.h b/sys/dev/pci/i82365_pcivar.h
index 44f2e1fb020..6c0eda83b02 100644
--- a/sys/dev/pci/i82365_pcivar.h
+++ b/sys/dev/pci/i82365_pcivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_pcivar.h,v 1.2 2000/10/14 18:04:07 aaron Exp $ */
+/* $OpenBSD: i82365_pcivar.h,v 1.3 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: i82365_pcivar.h,v 1.2 2000/02/22 16:04:47 thorpej Exp $ */
/*
@@ -51,6 +51,6 @@ void *pcic_pci_machdep_pcic_intr_establish __P((struct pcic_softc *,
void *pcic_pci_machdep_chip_intr_establish __P((pcmcia_chipset_handle_t,
struct pcmcia_function *,
int, int (*) __P((void *)),
- void *));
+ void *, char *));
void pcic_pci_machdep_chip_intr_disestablish __P((pcmcia_chipset_handle_t,
void *));
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index b6594de0064..352a93a4559 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.21 2001/06/20 23:12:11 niklas Exp $ */
+/* $OpenBSD: pccbb.c,v 1.22 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */
/*
@@ -152,7 +152,7 @@ int pccbb_pcmcia_io_map __P((pcmcia_chipset_handle_t, int, bus_addr_t,
bus_size_t, struct pcmcia_io_handle *, int *));
void pccbb_pcmcia_io_unmap __P((pcmcia_chipset_handle_t, int));
void *pccbb_pcmcia_intr_establish __P((pcmcia_chipset_handle_t,
- struct pcmcia_function *, int, int (*)(void *), void *));
+ struct pcmcia_function *, int, int (*)(void *), void *, char *));
void pccbb_pcmcia_intr_disestablish __P((pcmcia_chipset_handle_t,
void *));
void pccbb_pcmcia_socket_enable __P((pcmcia_chipset_handle_t));
@@ -2737,12 +2737,13 @@ pccbb_pcmcia_poll(arg)
* This function enables PC-Card interrupt. PCCBB uses PCI interrupt line.
*/
void *
-pccbb_pcmcia_intr_establish(pch, pf, ipl, func, arg)
+pccbb_pcmcia_intr_establish(pch, pf, ipl, func, arg, xname)
pcmcia_chipset_handle_t pch;
struct pcmcia_function *pf;
int ipl;
int (*func) __P((void *));
void *arg;
+ char *xname;
{
struct pcic_handle *ph = (struct pcic_handle *)pch;
struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index 1578dccb3c7..0ea00a7ae62 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic_pcmcia.c,v 1.8 1999/09/13 13:07:00 deraadt Exp $ */
+/* $OpenBSD: aic_pcmcia.c,v 1.9 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $ */
/*
@@ -160,7 +160,8 @@ aic_pcmcia_attach(parent, self, aux)
}
/* Establish the interrupt handler. */
- psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_BIO, aicintr, sc);
+ psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_BIO,
+ aicintr, sc, "");
if (psc->sc_ih == NULL) {
printf(": couldn't establish interrupt\n");
return;
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 97ef8236a7f..ebbb1e309a7 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_pcmcia.c,v 1.28 2001/03/28 19:59:48 millert Exp $ */
+/* $OpenBSD: com_pcmcia.c,v 1.29 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */
/*
@@ -248,10 +248,8 @@ com_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", sc->sc_com.sc_dev.dv_xname);
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_TTY,
- comintr, sc);
- printf("\n");
+ comintr, sc, sc->sc_com.sc_dev.dv_xname);
break;
case DVACT_DEACTIVATE:
@@ -338,7 +336,8 @@ found:
com_attach_subr(sc);
#endif
/* establish the interrupt. */
- psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY, comintr, sc);
+ psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY,
+ comintr, sc, "");
if (psc->sc_ih == NULL)
printf(", couldn't establish interrupt");
@@ -378,7 +377,8 @@ com_pcmcia_enable(sc)
struct pcmcia_function *pf = psc->sc_pf;
/* establish the interrupt. */
- psc->sc_ih = pcmcia_intr_establish(pf, IPL_TTY, comintr, sc);
+ psc->sc_ih = pcmcia_intr_establish(pf, IPL_TTY, comintr, sc,
+ sc->sc_dev.dv_xname);
if (psc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc_dev.dv_xname);
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 4ed5ea749a8..0b823d9cc6d 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp_pcmcia.c,v 1.2 2000/06/20 04:56:57 niklas Exp $ */
+/* $OpenBSD: esp_pcmcia.c,v 1.3 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: esp_pcmcia.c,v 1.8 2000/06/05 15:36:45 tsutsui Exp $ */
/*-
@@ -200,7 +200,7 @@ esp_pcmcia_attach(parent, self, aux)
esp_pcmcia_init(esc);
esc->sc_ih = pcmcia_intr_establish(esc->sc_pf, IPL_BIO,
- ncr53c9x_intr, &esc->sc_ncr53c9x);
+ ncr53c9x_intr, &esc->sc_ncr53c9x, "");
if (esc->sc_ih == NULL) {
printf(": couldn't establish interrupt\n");
goto iomap_failed;
@@ -307,7 +307,8 @@ esp_pcmcia_enable(arg, onoff)
#else
/* Establish the interrupt handler. */
esc->sc_ih = pcmcia_intr_establish(esc->sc_pf, IPL_BIO,
- ncr53c9x_intr, &esc->sc_ncr53c9x);
+ ncr53c9x_intr, &esc->sc_ncr53c9x,
+ esc->sc_ncr53c9x.sc_dev.dv_xname);
if (esc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt handler\n",
esc->sc_ncr53c9x.sc_dev.dv_xname);
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index c12691e2688..11bba2d79fd 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_an_pcmcia.c,v 1.4 2001/04/06 18:02:58 aaron Exp $ */
+/* $OpenBSD: if_an_pcmcia.c,v 1.5 2001/08/17 21:52:16 deraadt Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -130,7 +130,8 @@ an_pcmcia_attach(parent, self, aux)
sc->an_btag = psc->sc_pcioh.iot;
sc->an_bhandle = psc->sc_pcioh.ioh;
- sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, an_intr, sc);
+ sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
+ an_intr, sc, "");
if (sc->sc_ih == NULL)
printf("no irq");
@@ -179,9 +180,8 @@ an_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(psc->sc_pf);
- sc->sc_ih =
- pcmcia_intr_establish(psc->sc_pf, IPL_NET, an_intr, sc);
- printf("\n");
+ sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
+ an_intr, sc, sc->sc_dev.dv_xname);
an_init(sc);
break;
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 34a88f90f3d..8a5bec9fedc 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */
-/* $OpenBSD: if_awi_pcmcia.c,v 1.8 2001/05/22 11:04:50 fgsch Exp $ */
+/* $OpenBSD: if_awi_pcmcia.c,v 1.9 2001/08/17 21:52:16 deraadt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -185,7 +185,8 @@ awi_pcmcia_enable(sc)
struct pcmcia_function *pf = psc->sc_pf;
/* establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(pf, IPL_NET, awi_intr, sc);
+ sc->sc_ih = pcmcia_intr_establish(pf, IPL_NET, awi_intr,
+ sc, sc->sc_dev.dv_xname);
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc_dev.dv_xname);
@@ -346,7 +347,8 @@ awi_pcmcia_attach(parent, self, aux)
sc->sc_disable = awi_pcmcia_disable;
/* establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, awi_intr, sc);
+ sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
+ awi_intr, sc, "");
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc_dev.dv_xname);
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 2f439b4f50a..b1ece1b0e73 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cnw.c,v 1.9 2001/06/27 06:34:51 kjc Exp $ */
+/* $OpenBSD: if_cnw.c,v 1.10 2001/08/17 21:52:16 deraadt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -316,7 +316,8 @@ cnw_enable(sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
- sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET, cnw_intr, sc);
+ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ cnw_intr, sc, "");
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt handler\n",
sc->sc_dev.dv_xname);
@@ -875,10 +876,8 @@ cnw_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", sc->sc_dev.dv_xname);
- sc->sc_ih =
- pcmcia_intr_establish(sc->sc_pf, IPL_NET, cnw_intr, sc);
- printf("\n");
+ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ cnw_intr, sc, sc->sc_dev.dv_xname);
cnw_init(sc);
break;
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index ae8524b3574..620accd537a 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ep_pcmcia.c,v 1.26 2000/09/15 22:28:52 aaron Exp $ */
+/* $OpenBSD: if_ep_pcmcia.c,v 1.27 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */
/*-
@@ -211,7 +211,8 @@ ep_pcmcia_enable(sc)
struct pcmcia_function *pf = psc->sc_pf;
/* establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(pf, IPL_NET, epintr, sc);
+ sc->sc_ih = pcmcia_intr_establish(pf, IPL_NET, epintr,
+ sc, sc->sc_dev.dv_xname);
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc_dev.dv_xname);
@@ -371,7 +372,8 @@ ep_pcmcia_attach(parent, self, aux)
#endif
/* establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, epintr, sc);
+ sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, epintr,
+ sc, "");
if (sc->sc_ih == NULL)
printf(", couldn't establish interrupt");
@@ -417,10 +419,8 @@ ep_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", esc->sc_dev.dv_xname);
- sc->sc_ep.sc_ih =
- pcmcia_intr_establish(sc->sc_pf, IPL_NET, epintr, sc);
- printf("\n");
+ sc->sc_ep.sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ epintr, sc, esc->sc_dev.dv_xname);
epinit(esc);
break;
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index f698c24e4b7..1ad728fe635 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_pcmcia.c,v 1.51 2001/06/12 05:54:25 fgsch Exp $ */
+/* $OpenBSD: if_ne_pcmcia.c,v 1.52 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */
/*
@@ -671,7 +671,7 @@ again:
/* set up the interrupt */
psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, dp8390_intr,
- dsc);
+ dsc, "");
if (psc->sc_ih == NULL)
printf("no irq");
@@ -744,10 +744,8 @@ ne_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", esc->sc_dev.dv_xname);
- sc->sc_ih =
- pcmcia_intr_establish(sc->sc_pf, IPL_NET, dp8390_intr, sc);
- printf("\n");
+ sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ dp8390_intr, sc, esc->sc_dev.dv_xname);
dp8390_init(esc);
break;
@@ -771,7 +769,7 @@ ne_pcmcia_enable(dsc)
/* set up the interrupt */
psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, dp8390_intr,
- dsc);
+ dsc, dsc->sc_dev.dv_xname);
if (psc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
dsc->sc_dev.dv_xname);
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index a6bf096274c..463ca4b161d 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ray.c,v 1.16 2001/06/27 06:34:52 kjc Exp $ */
+/* $OpenBSD: if_ray.c,v 1.17 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */
/*
@@ -780,7 +780,7 @@ ray_enable(sc)
if ((error = ray_init(sc)) == 0) {
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
- ray_intr, sc);
+ ray_intr, sc, "");
if (sc->sc_ih == NULL) {
ray_stop(sc);
return (EIO);
diff --git a/sys/dev/pcmcia/if_rln_pcmcia.c b/sys/dev/pcmcia/if_rln_pcmcia.c
index 5c90087c1bd..7ef32a0558f 100644
--- a/sys/dev/pcmcia/if_rln_pcmcia.c
+++ b/sys/dev/pcmcia/if_rln_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rln_pcmcia.c,v 1.11 2000/12/16 21:47:49 mickey Exp $ */
+/* $OpenBSD: if_rln_pcmcia.c,v 1.12 2001/08/17 21:52:16 deraadt Exp $ */
/*
* David Leonard <d@openbsd.org>, 1999. Public domain.
*
@@ -225,7 +225,7 @@ rln_pcmcia_attach(parent, self, aux)
* responses, causes hard lock-ups.
*/
psc->psc_ih = pcmcia_intr_establish(psc->psc_pf, IPL_NET,
- rlnintr_pcmcia, sc);
+ rlnintr_pcmcia, sc, "");
if (psc->psc_ih == NULL)
printf(": couldn't establish interrupt\n",
sc->sc_dev.dv_xname);
@@ -274,11 +274,8 @@ rln_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(psc->psc_pf);
- printf("%s:", sc->sc_dev.dv_xname);
- psc->psc_ih =
- pcmcia_intr_establish(psc->psc_pf, IPL_NET, rlnintr_pcmcia,
- psc);
- printf("\n");
+ psc->psc_ih = pcmcia_intr_establish(psc->psc_pf, IPL_NET,
+ rlnintr_pcmcia, psc, sc->sc_dev.dv_xname);
rlninit(sc);
break;
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index 22ccd74dab5..6ccfedbbe5b 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sm_pcmcia.c,v 1.14 2000/08/04 15:51:02 aaron Exp $ */
+/* $OpenBSD: if_sm_pcmcia.c,v 1.15 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $ */
/*-
@@ -218,8 +218,8 @@ sm_pcmcia_attach(parent, self, aux)
if (enaddr == NULL)
printf(", unable to get Ethernet address\n");
- psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, smc91cxx_intr,
- sc);
+ psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
+ smc91cxx_intr, sc, "");
if (psc->sc_ih == NULL)
printf(": couldn't establish interrupt\n");
@@ -262,10 +262,8 @@ sm_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", sc->sc_smc.sc_dev.dv_xname);
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
- smc91cxx_intr, sc);
- printf("\n");
+ smc91cxx_intr, sc, sc->sc_smc.sc_dev.dv_xname);
smc91cxx_init(&sc->sc_smc);
break;
@@ -368,7 +366,7 @@ sm_pcmcia_enable(sc)
/* Establish the interrupt handler. */
psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, smc91cxx_intr,
- sc);
+ sc, sc->sc_dev.dv_xname);
if (psc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt handler\n",
sc->sc_dev.dv_xname);
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 99447659473..834a717ac9d 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.7 2001/06/23 01:56:10 millert Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.8 2001/08/17 21:52:16 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -280,7 +280,7 @@ wi_pcmcia_attach(parent, self, aux)
CSR_WRITE_2(sc, WI_EVENT_ACK, 0xffff);
/* Establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc);
+ sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, "");
if (sc->sc_ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc_dev.dv_xname);
@@ -331,10 +331,8 @@ wi_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(psc->sc_pf);
- printf("%s:", WI_PRT_ARG(sc));
- sc->sc_ih =
- pcmcia_intr_establish(psc->sc_pf, IPL_NET, wi_intr, sc);
- printf("\n");
+ sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
+ wi_intr, sc, sc->sc_dev.dv_xname);
wi_init(sc);
break;
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index f595a245531..becdcef676e 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xe.c,v 1.22 2001/07/08 23:38:07 fgsch Exp $ */
+/* $OpenBSD: if_xe.c,v 1.23 2001/08/17 21:52:16 deraadt Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -385,7 +385,7 @@ xe_pcmcia_attach(parent, self, aux)
IFQ_SET_READY(&ifp->if_snd);
/* Establish the interrupt. */
- sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, xe_intr, sc);
+ sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, xe_intr, sc, "");
if (sc->sc_ih == NULL) {
printf(", couldn't establish interrupt\n");
goto bad;
@@ -483,10 +483,8 @@ xe_pcmcia_activate(dev, act)
switch (act) {
case DVACT_ACTIVATE:
pcmcia_function_enable(sc->sc_pf);
- printf("%s:", sc->sc_xe.sc_dev.dv_xname);
- sc->sc_xe.sc_ih =
- pcmcia_intr_establish(sc->sc_pf, IPL_NET, xe_intr, sc);
- printf("\n");
+ sc->sc_xe.sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
+ xe_intr, sc, sc->sc_xe.sc_dev.dv_xname);
xe_init(&sc->sc_xe);
break;
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index d9ee7d91c18..fc25386a5a0 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia.c,v 1.29 2000/06/28 17:38:25 aaron Exp $ */
+/* $OpenBSD: pcmcia.c,v 1.30 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $ */
/*
@@ -681,11 +681,12 @@ pcmcia_io_map(pf, width, offset, size, pcihp, windowp)
}
void *
-pcmcia_intr_establish(pf, ipl, ih_fct, ih_arg)
+pcmcia_intr_establish(pf, ipl, ih_fct, ih_arg, xname)
struct pcmcia_function *pf;
int ipl;
int (*ih_fct) __P((void *));
void *ih_arg;
+ char *xname;
{
void *ret;
int s, ihcnt, hiipl, reg;
@@ -731,7 +732,8 @@ pcmcia_intr_establish(pf, ipl, ih_fct, ih_arg)
pf->ih_ipl = ipl;
pf->sc->ih = pcmcia_chip_intr_establish(pf->sc->pct,
- pf->sc->pch, pf, ipl, pcmcia_card_intr, pf->sc);
+ pf->sc->pch, pf, ipl, pcmcia_card_intr, pf->sc,
+ xname);
splx(s);
} else if (ipl > hiipl) {
#ifdef DIAGNOSTIC
@@ -751,7 +753,8 @@ pcmcia_intr_establish(pf, ipl, ih_fct, ih_arg)
pf->ih_ipl = ipl;
pf->sc->ih = pcmcia_chip_intr_establish(pf->sc->pct,
- pf->sc->pch, pf, ipl, pcmcia_card_intr, pf->sc);
+ pf->sc->pch, pf, ipl, pcmcia_card_intr, pf->sc,
+ xname);
splx(s);
} else {
@@ -778,7 +781,7 @@ pcmcia_intr_establish(pf, ipl, ih_fct, ih_arg)
}
} else
ret = pcmcia_chip_intr_establish(pf->sc->pct, pf->sc->pch,
- pf, ipl, ih_fct, ih_arg);
+ pf, ipl, ih_fct, ih_arg, xname);
return (ret);
}
@@ -848,7 +851,8 @@ pcmcia_intr_disestablish(pf, ih)
pcmcia_chip_intr_disestablish(pf->sc->pct, pf->sc->pch,
pf->sc->ih);
pf->sc->ih = pcmcia_chip_intr_establish(pf->sc->pct,
- pf->sc->pch, pf, hiipl, pcmcia_card_intr, pf->sc);
+ pf->sc->pch, pf, hiipl, pcmcia_card_intr, pf->sc,
+ NULL);
/* Null out the handler for this function. */
pf->ih_fct = NULL;
diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h
index 65821a53138..5a9c67afa76 100644
--- a/sys/dev/pcmcia/pcmciachip.h
+++ b/sys/dev/pcmcia/pcmciachip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmciachip.h,v 1.3 2000/04/08 05:50:51 aaron Exp $ */
+/* $OpenBSD: pcmciachip.h,v 1.4 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: pcmciachip.h,v 1.5 2000/01/13 08:58:51 joda Exp $ */
/*
@@ -83,7 +83,7 @@ struct pcmcia_chip_functions {
/* interrupt glue */
void *(*intr_establish) __P((pcmcia_chipset_handle_t,
- struct pcmcia_function *, int, int (*)(void *), void *));
+ struct pcmcia_function *, int, int (*)(void *), void *, char *));
void (*intr_disestablish) __P((pcmcia_chipset_handle_t, void *));
/* card enable/disable */
@@ -125,8 +125,8 @@ struct pcmcia_chip_functions {
((*(tag)->io_unmap)((handle), (window)))
/* Interrupt functions. */
-#define pcmcia_chip_intr_establish(tag, handle, pf, ipl, fct, arg) \
- ((*(tag)->intr_establish)((handle), (pf), (ipl), (fct), (arg)))
+#define pcmcia_chip_intr_establish(tag, handle, pf, ipl, fct, arg, xname) \
+ ((*(tag)->intr_establish)((handle), (pf), (ipl), (fct), (arg), (xname)))
#define pcmcia_chip_intr_disestablish(tag, handle, ih) \
((*(tag)->intr_disestablish)((handle), (ih)))
diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h
index 40b37514496..0986e4b6d0c 100644
--- a/sys/dev/pcmcia/pcmciavar.h
+++ b/sys/dev/pcmcia/pcmciavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmciavar.h,v 1.12 1999/08/16 16:51:20 deraadt Exp $ */
+/* $OpenBSD: pcmciavar.h,v 1.13 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: pcmciavar.h,v 1.5 1998/07/19 17:28:17 christos Exp $ */
/*
@@ -276,5 +276,5 @@ int pcmcia_io_map __P((struct pcmcia_function *, int, bus_addr_t,
(pcmcia_chip_mem_unmap((pf)->sc->pct, (pf)->sc->pch, (window)))
void *pcmcia_intr_establish __P((struct pcmcia_function *, int,
- int (*) (void *), void *));
+ int (*) (void *), void *, char *));
void pcmcia_intr_disestablish __P((struct pcmcia_function *, void *));
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index 4a580457fac..8f69365e839 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_pcmcia.c,v 1.11 2001/06/12 09:05:34 d Exp $ */
+/* $OpenBSD: wdc_pcmcia.c,v 1.12 2001/08/17 21:52:16 deraadt Exp $ */
/* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */
/*-
@@ -372,7 +372,7 @@ wdc_pcmcia_attach(parent, self, aux)
#else
/* Establish the interrupt handler. */
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO, wdcintr,
- &sc->wdc_channel);
+ &sc->wdc_channel, "");
if (sc->sc_ih == NULL) {
printf("couldn't establish interrupt handler");
}
@@ -457,7 +457,7 @@ wdc_pcmcia_activate(self, act)
}
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO,
- wdcintr, &sc->wdc_channel);
+ wdcintr, &sc->wdc_channel, sc->sc_wdcdev.sc_dev.dv_xname);
if (sc->sc_ih == NULL) {
printf("%s: "
"couldn't establish interrupt handler\n",
@@ -498,7 +498,7 @@ wdc_pcmcia_enable(arg, onoff)
}
sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO,
- wdcintr, &sc->wdc_channel);
+ wdcintr, &sc->wdc_channel, sc->sc_dev.dv_xname);
if (sc->sc_ih == NULL) {
printf("%s: "
"couldn't establish interrupt handler\n",
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 04:37:43 +0000