summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-20 12:53:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-20 12:53:30 +0000
commite8fe1368feef94929b461e59bfc09f525a46f7ef (patch)
treebba906caaf63b7ca7f08dd9fa7078a20289a2510 /sys
parentff92c7f205e416ad32e9e331b2ca5ad0165b9b1d (diff)
put newlines at slightly different places during attach, leading to clean
USB attach
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/if_wi.c8
-rw-r--r--sys/dev/pci/if_wi_pci.c3
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c3
3 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 0d43ad8692c..9a6632f150b 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.111 2004/08/16 03:42:22 millert Exp $ */
+/* $OpenBSD: if_wi.c,v 1.112 2004/10/20 12:53:28 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -126,7 +126,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.111 2004/08/16 03:42:22 millert Exp $";
+ "$OpenBSD: if_wi.c,v 1.112 2004/10/20 12:53:28 deraadt Exp $";
#endif /* lint */
#ifdef foo
@@ -2551,10 +2551,10 @@ wi_get_id(sc)
}
if (sc->sc_firmware_type == WI_LUCENT) {
- printf("\n%s: Firmware %d.%02d variant %d, ", WI_PRT_ARG(sc),
+ printf("%s: Firmware %d.%02d variant %d, ", WI_PRT_ARG(sc),
ver.wi_ver[2], ver.wi_ver[3], ver.wi_ver[1]);
} else {
- printf("\n%s: %s%s, Firmware %d.%d.%d (primary), %d.%d.%d (station), ",
+ printf("%s: %s%s, Firmware %d.%d.%d (primary), %d.%d.%d (station), ",
WI_PRT_ARG(sc),
sc->sc_firmware_type == WI_SYMBOL ? "Symbol " : "",
card_name, pri_fw_ver[0], pri_fw_ver[1], pri_fw_ver[2],
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index 4da9e155386..b3147044ae5 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pci.c,v 1.36 2003/10/26 15:34:15 drahn Exp $ */
+/* $OpenBSD: if_wi_pci.c,v 1.37 2004/10/20 12:53:29 deraadt Exp $ */
/*
* Copyright (c) 2001-2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -135,6 +135,7 @@ wi_pci_attach(struct device *parent, struct device *self, void *aux)
pp = wi_pci_lookup(pa);
if (pp->pp_attach(pa, sc) != 0)
return;
+ printf("\n");
wi_attach(sc, &wi_func_io);
}
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index bbf4cf6750a..77514e6c451 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.53 2004/10/11 15:16:37 mickey Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.54 2004/10/20 12:53:28 deraadt Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
/*
@@ -377,6 +377,7 @@ wi_pcmcia_attach(parent, self, aux)
goto bad;
}
+ printf("\n");
if (wi_attach(sc, &wi_func_io) == 0)
return;