Sat Oct 9 19:46:16 2010 UTC ()
Missing \n after printing device type.


(phx)
diff -r1.9 -r1.10 src/sys/dev/pci/if_bwi_pci.c
cvs diff -r1.9 -r1.10 src/sys/dev/pci/if_bwi_pci.c (expand / switch to unified diff)

--- src/sys/dev/pci/if_bwi_pci.c 2010/01/19 22:07:00 1.9
+++ src/sys/dev/pci/if_bwi_pci.c 2010/10/09 19:46:15 1.10
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1/* $NetBSD: if_bwi_pci.c,v 1.9 2010/01/19 22:07:00 pooka Exp $ */ 1/* $NetBSD: if_bwi_pci.c,v 1.10 2010/10/09 19:46:15 phx Exp $ */
2/* $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */ 2/* $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> 5 * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20/* 20/*
21 * Broadcom AirForce BCM43xx IEEE 802.11b/g wireless network driver 21 * Broadcom AirForce BCM43xx IEEE 802.11b/g wireless network driver
22 * PCI front end 22 * PCI front end
23 */ 23 */
24 24
25 25
26#include <sys/cdefs.h> 26#include <sys/cdefs.h>
27__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.9 2010/01/19 22:07:00 pooka Exp $"); 27__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.10 2010/10/09 19:46:15 phx Exp $");
28 28
29#include <sys/param.h> 29#include <sys/param.h>
30#include <sys/callout.h> 30#include <sys/callout.h>
31#include <sys/device.h> 31#include <sys/device.h>
32#include <sys/kernel.h> 32#include <sys/kernel.h>
33#include <sys/malloc.h> 33#include <sys/malloc.h>
34#include <sys/mbuf.h> 34#include <sys/mbuf.h>
35#include <sys/socket.h> 35#include <sys/socket.h>
36#include <sys/sockio.h> 36#include <sys/sockio.h>
37#include <sys/systm.h> 37#include <sys/systm.h>
38 38
39#include <machine/bus.h> 39#include <machine/bus.h>
40 40
@@ -103,27 +103,27 @@ bwi_pci_match(device_t parent, cfdata_t  @@ -103,27 +103,27 @@ bwi_pci_match(device_t parent, cfdata_t
103 103
104static void 104static void
105bwi_pci_attach(device_t parent, device_t self, void *aux) 105bwi_pci_attach(device_t parent, device_t self, void *aux)
106{ 106{
107 struct bwi_pci_softc *psc = device_private(self); 107 struct bwi_pci_softc *psc = device_private(self);
108 struct pci_attach_args *pa = aux; 108 struct pci_attach_args *pa = aux;
109 struct bwi_softc *sc = &psc->psc_bwi; 109 struct bwi_softc *sc = &psc->psc_bwi;
110 const char *intrstr = NULL; 110 const char *intrstr = NULL;
111 pci_intr_handle_t ih; 111 pci_intr_handle_t ih;
112 pcireg_t memtype, reg; 112 pcireg_t memtype, reg;
113 int error = 0; 113 int error = 0;
114 114
115 aprint_naive("\n"); 115 aprint_naive("\n");
116 aprint_normal(": Broadcom Wireless"); 116 aprint_normal(": Broadcom Wireless\n");
117 117
118 sc->sc_dev = self; 118 sc->sc_dev = self;
119 sc->sc_dmat = pa->pa_dmat; 119 sc->sc_dmat = pa->pa_dmat;
120 psc->psc_pc = pa->pa_pc; 120 psc->psc_pc = pa->pa_pc;
121 psc->psc_pcitag = pa->pa_tag; 121 psc->psc_pcitag = pa->pa_tag;
122 122
123 /* map control / status registers */ 123 /* map control / status registers */
124 memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BWI_PCI_BAR0);  124 memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, BWI_PCI_BAR0);
125 switch (memtype) { 125 switch (memtype) {
126 case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT: 126 case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT:
127 case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT: 127 case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT:
128 break; 128 break;
129 default: 129 default: