diff options
| -rw-r--r-- | sys/dev/eisa/if_fea.c | 15 | ||||
| -rw-r--r-- | sys/dev/ic/pdq.c | 15 | ||||
| -rw-r--r-- | sys/dev/pci/if_fpa.c | 28 | ||||
| -rw-r--r-- | sys/dev/tc/if_fta.c | 3 |
4 files changed, 27 insertions, 34 deletions
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index 453e293879a..3dbaeecd7a4 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fea.c,v 1.6 1997/11/07 08:06:39 niklas Exp $ */ +/* $OpenBSD: if_fea.c,v 1.7 1999/11/23 04:49:29 jason Exp $ */ /* $NetBSD: if_fea.c,v 1.9 1996/10/21 22:31:05 thorpej Exp $ */ /*- @@ -515,10 +515,6 @@ pdq_eisa_attach( return; } - bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); - - pdq_ifattach(sc, pdq_eisa_ifwatchdog); - if (eisa_intr_map(ea->ea_ec, irq, &ih)) { printf("%s: couldn't map interrupt (%d)\n", sc->sc_dev.dv_xname, irq); return; @@ -533,6 +529,13 @@ pdq_eisa_attach( printf("\n"); return; } + if (intrstr != NULL) + printf(": interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); + + bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); + + pdq_ifattach(sc, pdq_eisa_ifwatchdog); + sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq); if (sc->sc_ats == NULL) printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); @@ -540,8 +543,6 @@ pdq_eisa_attach( printf("%s: using iomem 0x%x-0x%x\n", sc->sc_dev.dv_xname, maddr, maddr + msize - 1); #endif - if (intrstr != NULL) - printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); } struct cfattach fea_ca = { diff --git a/sys/dev/ic/pdq.c b/sys/dev/ic/pdq.c index 75f64b8a416..1e22589dbbe 100644 --- a/sys/dev/ic/pdq.c +++ b/sys/dev/ic/pdq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdq.c,v 1.8 1998/03/01 12:45:18 niklas Exp $ */ +/* $OpenBSD: pdq.c,v 1.9 1999/11/23 04:49:29 jason Exp $ */ /* $NetBSD: pdq.c,v 1.9 1996/10/13 01:37:26 christos Exp $ */ /*- @@ -169,17 +169,8 @@ pdq_print_fddi_chars( { const char hexchars[] = "0123456789abcdef"; - printf( -#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - PDQ_OS_PREFIX -#else - ": " -#endif - "DEC %s FDDI %s Controller\n", -#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - PDQ_OS_PREFIX_ARGS, -#endif - pdq_descriptions[pdq->pdq_type], + printf(PDQ_OS_PREFIX "DEC %s FDDI %s Controller\n", + PDQ_OS_PREFIX_ARGS, pdq_descriptions[pdq->pdq_type], pdq_station_types[rsp->status_chars_get.station_type]); printf(PDQ_OS_PREFIX "FDDI address %c%c:%c%c:%c%c:%c%c:%c%c:%c%c, FW=%c%c%c%c, HW=%c", diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index 40dd369b09f..2598f200d7b 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fpa.c,v 1.11 1998/01/07 11:03:28 deraadt Exp $ */ +/* $OpenBSD: if_fpa.c,v 1.12 1999/11/23 04:49:30 jason Exp $ */ /* $NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $ */ /*- @@ -427,17 +427,6 @@ pdq_pci_attach( return; } - sc->sc_pdq = pdq_initialize(sc->sc_csrtag, sc->sc_csrhandle, - sc->sc_if.if_xname, 0, - (void *) sc, PDQ_DEFPA); - if (sc->sc_pdq == NULL) { - printf(": initialization failed\n"); - return; - } - - bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); - pdq_ifattach(sc, pdq_pci_ifwatchdog); - if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &intrhandle)) { printf(": couldn't map interrupt\n"); @@ -453,12 +442,23 @@ pdq_pci_attach( printf("\n"); return; } + if (intrstr != NULL) + printf(": %s\n", intrstr); + + sc->sc_pdq = pdq_initialize(sc->sc_csrtag, sc->sc_csrhandle, + sc->sc_if.if_xname, 0, + (void *) sc, PDQ_DEFPA); + if (sc->sc_pdq == NULL) { + printf(": initialization failed\n"); + return; + } + + bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); + pdq_ifattach(sc, pdq_pci_ifwatchdog); sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq); if (sc->sc_ats == NULL) printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); - if (intrstr != NULL) - printf(": %s\n", intrstr); } struct cfattach fpa_ca = { diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c index e261c1d59eb..3bdda137cd9 100644 --- a/sys/dev/tc/if_fta.c +++ b/sys/dev/tc/if_fta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fta.c,v 1.3 1997/11/07 08:07:46 niklas Exp $ */ +/* $OpenBSD: if_fta.c,v 1.4 1999/11/23 04:49:30 jason Exp $ */ /* $NetBSD: if_fta.c,v 1.7 1996/10/22 21:37:26 cgd Exp $ */ /*- @@ -110,6 +110,7 @@ pdq_tc_attach( return; } bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6); + printf("\n"); pdq_ifattach(sc, NULL); tc_intr_establish(parent, ta->ta_cookie, TC_IPL_NET, |