diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-08-11 03:28:38 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-08-11 03:28:38 +0000 |
commit | 982bfe6c3ddfbe011706597d19e28a8a413cad29 (patch) | |
tree | badfb529fa5560e9e6b6a8187406acef8f8182c8 | |
parent | 6ff50ad91a70edd49ea24750c3f4ac5575b282ee (diff) |
put irq number on the line with the other info, not on its own line
-rw-r--r-- | sys/dev/isa/if_ed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c index 3b4b8e8b9c0..effdbdaa413 100644 --- a/sys/dev/isa/if_ed.c +++ b/sys/dev/isa/if_ed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ed.c,v 1.39 1998/07/31 18:02:05 millert Exp $ */ +/* $OpenBSD: if_ed.c,v 1.40 1998/08/11 03:28:37 millert Exp $ */ /* $NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $ */ /* @@ -516,7 +516,7 @@ ed_pci_attach(parent, self, aux) printf("type %s ", sc->type_str); else printf("type unknown (0x%x) ", sc->type); - printf("%s\n", sc->isa16bit ? "(16-bit)" : "(8-bit)"); /* XXX */ + printf("%s", sc->isa16bit ? "(16-bit)" : "(8-bit)"); /* XXX */ #if NBPFILTER > 0 if ((sc->spec_flags & ED_REATTACH) == 0) @@ -527,21 +527,21 @@ ed_pci_attach(parent, self, aux) /* Map and establish the interrupt. */ if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin, pa->pa_intrline, &ih)) { - printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); + printf("\n%s: couldn't map interrupt\n", sc->sc_dev.dv_xname); return; } intrstr = pci_intr_string(pc, ih); sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, edintr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { - printf("%s: couldn't establish interrupt", + printf("\n%s: couldn't establish interrupt", sc->sc_dev.dv_xname); if (intrstr != NULL) printf(" at %s", intrstr); printf("\n"); return; } - printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr); + printf(", %s\n", intrstr); } #endif |