diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2006-05-17 19:51:52 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2006-05-17 19:51:52 +0000 |
commit | 9e5809c7a318ec2dda5d4224b4f0fecf2fb20bc7 (patch) | |
tree | 5d6e1e48773eddafc8121246d8467c6c3179121f | |
parent | d4f194a03060a14434ffd84acfef9f900c752b48 (diff) |
tweak the dmesg printing a bit.
ok marco@
-rw-r--r-- | sys/dev/pci/mfi_pci.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index d861b9824fe..c530ed5c65a 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi_pci.c,v 1.7 2006/05/16 21:56:21 marco Exp $ */ +/* $OpenBSD: mfi_pci.c,v 1.8 2006/05/17 19:51:51 brad Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -106,12 +106,11 @@ mfi_pci_attach(struct device *parent, struct device *self, void *aux) pcireg_t csr; uint32_t subsysid, i; - printf(": "); subsysid = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG); for (i = 0; mfi_pci_devices[i].mpd_vendor; i++) if (mfi_pci_devices[i].mpd_subvendor == PCI_VENDOR(subsysid) && mfi_pci_devices[i].mpd_subproduct == PCI_PRODUCT(subsysid)){ - printf("%s ", mfi_pci_devices[i].mpd_model); + printf(", %s", mfi_pci_devices[i].mpd_model); break; } @@ -119,14 +118,14 @@ mfi_pci_attach(struct device *parent, struct device *self, void *aux) csr |= PCI_MAPREG_MEM_TYPE_32BIT; if (pci_mapreg_map(pa, MFI_BAR, csr, 0, &sc->sc_iot, &sc->sc_ioh, NULL, &size, MFI_PCI_MEMSIZE)) { - printf("can't map controller pci space\n"); + printf(": can't map controller pci space\n"); return; } sc->sc_dmat = pa->pa_dmat; if (pci_intr_map(pa, &ih)) { - printf("can't map interrupt\n"); + printf(": can't map interrupt\n"); bus_space_unmap(sc->sc_iot, sc->sc_ioh, size); return; } @@ -134,7 +133,7 @@ mfi_pci_attach(struct device *parent, struct device *self, void *aux) sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, mfi_intr, sc, sc->sc_dev.dv_xname); if (!sc->sc_ih) { - printf("can't establish interrupt"); + printf(": can't establish interrupt"); if (intrstr) printf(" at %s", intrstr); printf("\n"); @@ -142,7 +141,7 @@ mfi_pci_attach(struct device *parent, struct device *self, void *aux) return; } - printf("%s\n", intrstr); + printf(": %s\n", intrstr); if (mfi_attach(sc)) { printf("%s: can't attach", DEVNAME(sc)); |