diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2010-12-31 14:52:48 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2010-12-31 14:52:48 +0000 |
| commit | f0f6a29566d2e88652c1e61ef67cd33426587c7c (patch) | |
| tree | fce4a509562f3d2c52b8060e94feb2edae12d742 /sys | |
| parent | 0acb93debe8ce04c45bd35f0dd1ce1d3a5eb2b6e (diff) | |
move the printing of the MAC address to the same line than the MAC rev.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/cardbus/if_athn_cardbus.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/athn.c | 21 | ||||
| -rw-r--r-- | sys/dev/pci/if_athn_pci.c | 4 |
3 files changed, 16 insertions, 13 deletions
diff --git a/sys/dev/cardbus/if_athn_cardbus.c b/sys/dev/cardbus/if_athn_cardbus.c index 01c228ce95b..5bad420b2b2 100644 --- a/sys/dev/cardbus/if_athn_cardbus.c +++ b/sys/dev/cardbus/if_athn_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_cardbus.c,v 1.11 2010/12/31 14:06:05 damien Exp $ */ +/* $OpenBSD: if_athn_cardbus.c,v 1.12 2010/12/31 14:52:47 damien Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -146,7 +146,7 @@ athn_cardbus_attach(struct device *parent, struct device *self, void *aux) /* Set up the PCI configuration registers. */ athn_cardbus_setup(csc); - printf(": irq %d", csc->sc_intrline); + printf(": irq %d\n", csc->sc_intrline); athn_attach(sc); Cardbus_function_disable(ct); diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c index 8c88d91895a..e05ea581614 100644 --- a/sys/dev/ic/athn.c +++ b/sys/dev/ic/athn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: athn.c,v 1.64 2010/12/31 14:06:05 damien Exp $ */ +/* $OpenBSD: athn.c,v 1.65 2010/12/31 14:52:47 damien Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -173,12 +173,12 @@ athn_attach(struct athn_softc *sc) int error; if ((error = athn_reset_power_on(sc)) != 0) { - printf(": could not reset chip\n"); + printf("%s: could not reset chip\n", sc->sc_dev.dv_xname); return (error); } if ((error = athn_set_power_awake(sc)) != 0) { - printf(": could not wakeup chip\n"); + printf("%s: could not wakeup chip\n", sc->sc_dev.dv_xname); return (error); } @@ -192,11 +192,12 @@ athn_attach(struct athn_softc *sc) error = ar9287_attach(sc); else if (AR_SREV_9380(sc)) error = ar9380_attach(sc); + else + error = ENOTSUP; if (error != 0) { - printf(": could not attach chip\n"); + printf("%s: could not attach chip\n", sc->sc_dev.dv_xname); return (error); } - printf(", address %s\n", ether_sprintf(ic->ic_myaddr)); /* We can put the chip in sleep state now. */ athn_set_power_sleep(sc); @@ -241,14 +242,16 @@ athn_attach(struct athn_softc *sc) ((sc->rxchainmask >> 0) & 1); if (AR_SINGLE_CHIP(sc)) { - printf("%s: %s rev %d (%dT%dR), ROM rev %d\n", + printf("%s: %s rev %d (%dT%dR), ROM rev %d, address %s\n", sc->sc_dev.dv_xname, athn_get_mac_name(sc), sc->mac_rev, - sc->ntxchains, sc->nrxchains, sc->eep_rev); + sc->ntxchains, sc->nrxchains, sc->eep_rev, + ether_sprintf(ic->ic_myaddr)); } else { - printf("%s: MAC %s rev %d, RF %s (%dT%dR), ROM rev %d\n", + printf("%s: MAC %s rev %d, RF %s (%dT%dR), ROM rev %d, " + "address %s\n", sc->sc_dev.dv_xname, athn_get_mac_name(sc), sc->mac_rev, athn_get_rf_name(sc), sc->ntxchains, sc->nrxchains, - sc->eep_rev); + sc->eep_rev, ether_sprintf(ic->ic_myaddr)); } timeout_set(&sc->scan_to, athn_next_scan, sc); diff --git a/sys/dev/pci/if_athn_pci.c b/sys/dev/pci/if_athn_pci.c index 37a64f0a7cd..4c0600645ef 100644 --- a/sys/dev/pci/if_athn_pci.c +++ b/sys/dev/pci/if_athn_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_pci.c,v 1.9 2010/12/31 14:06:05 damien Exp $ */ +/* $OpenBSD: if_athn_pci.c,v 1.10 2010/12/31 14:52:46 damien Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -187,7 +187,7 @@ athn_pci_attach(struct device *parent, struct device *self, void *aux) printf("\n"); return; } - printf(": %s", intrstr); + printf(": %s\n", intrstr); athn_attach(sc); } |