prettier printf messages

diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index 150426b..dc27528 100644 (file)
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -145,26 +145,24 @@ ep_eisa_attach(parent, self, aux)
                model = EISA_PRODUCT_TCM5093;
        else
                model = "unknown model!";
-       printf(": %s\n", model);
+       printf(": <%s> ", model);
 
        if (eisa_intr_map(ec, irq, &ih)) {
-               printf("%s: couldn't map interrupt (%d)\n",
-                   sc->sc_dev.dv_xname, irq);
+               printf("couldn't map interrupt (%d)\n", irq);
                return;
        }
        intrstr = eisa_intr_string(ec, ih);
        sc->sc_ih = eisa_intr_establish(ec, ih, IST_EDGE, IPL_NET,
            epintr, sc, sc->sc_dev.dv_xname);
        if (sc->sc_ih == NULL) {
-               printf("%s: couldn't establish interrupt",
-                   sc->sc_dev.dv_xname);
+               printf("couldn't establish interrupt");
                if (intrstr != NULL)
                        printf(" at %s", intrstr);
                printf("\n");
                return;
        }
        if (intrstr != NULL)
-               printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname,
+               printf("interrupting at %s, ", sc->sc_dev.dv_xname,
                    intrstr);
 
        epconfig(sc, conn);

diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 783ad4b..f1cd49a 100644 (file)
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -107,7 +107,6 @@ epconfig(sc, conn)
        struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 
        sc->ep_connectors = 0;
-       printf("%s: ", sc->sc_dev.dv_xname);
        if (conn & IS_AUI) {
                printf("aui");
                sc->ep_connectors |= AUI;

diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index a138daa..6891551 100644 (file)
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -207,7 +207,7 @@ ep_isa_attach(parent, self, aux)
        GO_WINDOW(0);
        conn = inw(iobase + EP_W0_CONFIG_CTRL);
 
-       printf(": 3Com 3C509 Ethernet\n");
+       printf(": <3Com 3C509 Ethernet> ");
 
        epconfig(sc, conn);
 

diff --git a/sys/dev/isa/pcmcia_isa.c b/sys/dev/isa/pcmcia_isa.c
index 5a485ca..6c62dcd 100644 (file)
--- a/sys/dev/isa/pcmcia_isa.c
+++ b/sys/dev/isa/pcmcia_isa.c
@@ -1,4 +1,4 @@
-/*     $Id: pcmcia_isa.c,v 1.2 1996/04/29 14:16:47 hvozda Exp $        */
+/*     $Id: pcmcia_isa.c,v 1.3 1996/05/03 07:59:36 deraadt Exp $       */
 /*
  * Copyright (c) 1995,1996 John T. Kohl.  All rights reserved.
  * Copyright (c) 1994 Stefan Grefen.  All rights reserved.
@@ -103,7 +103,7 @@ pcmcia_isa_init(parent, cf, aux, pca, flag)
                       pa, pa->pba_maddr, pa->pba_msize);
                printf("PCA %p mem %p size %d chip %x memh %x\n",
                       pca, pca->scratch_mem, pca->scratch_memsiz,
-                      pca->scratch_chipset, pca->scratch_memh);
+                      pca->pa_bc, pca->scratch_memh);
 #endif
        }
        return 1;

diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 5deec15..9c81c92 100644 (file)
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -156,7 +156,7 @@ ep_pci_attach(parent, self, aux)
                model = "unknown model!";
        }
 
-       printf(": %s\n", model);
+       printf(": <%s> ", model);
 
        epconfig(sc, conn);
 

diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index f37de3e..ea06da2 100644 (file)
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/*     $Id: pcmcia.c,v 1.3 1996/04/29 14:17:15 hvozda Exp $    */
+/*     $Id: pcmcia.c,v 1.4 1996/05/03 07:59:40 deraadt Exp $   */
 /*
  * Copyright (c) 1996 John T. Kohl.  All rights reserved.
  * Copyright (c) 1994 Stefan Grefen.  All rights reserved.
@@ -356,7 +356,7 @@ pcmcia_probedev(link, cardinfo)
 
        PPRINTF(("- pcmcia_probe_dev\n"));
 
-       printf("%s: slot %d ", ((struct device *) link->bus)->dv_xname, slot);
+       printf("%s slot %d: ", ((struct device *) link->bus)->dv_xname, slot);
 
        /* turn off power in case it's on, to get a fresh start on things: */
        PCMCIA_SERVICE(pca, link, PCMCIA_OP_POWER, 0, 0);
@@ -367,7 +367,7 @@ pcmcia_probedev(link, cardinfo)
        }
 
        if (ISSET(card_stat, PCMCIA_CARD_PRESENT) == 0) {
-               printf("is empty\n");
+               printf("empty\n");
                return NULL;
        }
 
@@ -406,7 +406,7 @@ pcmcia_probedev(link, cardinfo)
                goto bad;
        }
 
-       printf("contains <%s, %s", cardinfo->manufacturer, cardinfo->model);
+       printf("<%s, %s", cardinfo->manufacturer, cardinfo->model);
        if (cardinfo->add_info1[0])
                printf(", %s", cardinfo->add_info1);
        if (cardinfo->add_info2[0])

diff --git a/sys/dev/pcmcia/pcmcia_conf.c b/sys/dev/pcmcia/pcmcia_conf.c
index 3e09e03..f5f614d 100644 (file)
--- a/sys/dev/pcmcia/pcmcia_conf.c
+++ b/sys/dev/pcmcia/pcmcia_conf.c
@@ -1,4 +1,4 @@
-/*     $Id: pcmcia_conf.c,v 1.2 1996/04/29 14:17:21 hvozda Exp $       */
+/*     $Id: pcmcia_conf.c,v 1.3 1996/05/03 07:59:41 deraadt Exp $      */
 /*
  * Copyright (c) 1996 John T. Kohl.  All rights reserved.
  * Copyright (c) 1994 Stefan Grefen.  All rights reserved.
@@ -606,6 +606,7 @@ pcmcia_bestvalue(card, dentries, nentries, rmatch)
 {
        int bestmatch, thismatch;
        register int i;
+
        for (i = 0, bestmatch = 0; i < nentries; i++) {
                if ((thismatch = pcmcia_matchvalue(card, &dentries[i])) >
                    bestmatch) {