Module Name: src
Committed By: plunky
Date: Wed Sep 23 19:07:20 UTC 2009
Modified Files:
src/sys/dev/usb: if_atu.c if_aue.c if_axe.c if_cdce.c if_cue.c if_kue.c
if_rum.c if_udav.c if_upl.c if_ural.c if_url.c if_zyd.c moscom.c
pseye.c uaudio.c uberry.c ubsa.c ubt.c uchcom.c udsbr.c uep.c
uftdi.c ugen.c ugensa.c uhidev.c uhmodem.c uipaq.c uirda.c ulpt.c
umass.c umct.c umodem_common.c uplcom.c urio.c uscanner.c uslsa.c
usscanner.c ustir.c utoppy.c uvisor.c uvscom.c uyap.c
xboxcontroller.c
Log Message:
fix up USB drivers printing of autoconf information
1. expand the USB_ATTACH_SETUP macro (requested by jmcneill)
2. reorder the attach function so that the first thing it does is print
newlines.
3. after this, we can call usbd_devinfo_alloc(), which polls the device
allowing a context switch, and aprint_normal() the device information.
this avoids problems where autoconf messages are getting mixed up.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/if_atu.c src/sys/dev/usb/urio.c
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/if_kue.c \
src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/if_rum.c src/sys/dev/usb/umct.c \
src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_upl.c src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_ural.c src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/pseye.c src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/uchcom.c src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/udsbr.c \
src/sys/dev/usb/umodem_common.c src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uep.c src/sys/dev/usb/utoppy.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/uftdi.c src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/ugensa.c src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/xboxcontroller.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.32 src/sys/dev/usb/if_atu.c:1.33
--- src/sys/dev/usb/if_atu.c:1.32 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_atu.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.32 2009/09/04 18:10:08 dyoung Exp $ */
+/* $NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.32 2009/09/04 18:10:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $");
#include "bpfilter.h"
@@ -1182,9 +1182,10 @@
sc->atu_dev = self;
sc->sc_state = ATU_S_UNCONFIG;
- devinfop = usbd_devinfo_alloc(dev, 0);
aprint_naive("\n");
aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.32 src/sys/dev/usb/urio.c:1.33
--- src/sys/dev/usb/urio.c:1.32 Tue Jan 20 18:20:48 2009
+++ src/sys/dev/usb/urio.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.32 2009/01/20 18:20:48 drochner Exp $ */
+/* $NetBSD: urio.c,v 1.33 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.32 2009/01/20 18:20:48 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.33 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,8 +167,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.114 src/sys/dev/usb/if_aue.c:1.115
--- src/sys/dev/usb/if_aue.c:1.114 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_aue.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.114 2009/09/04 18:10:08 dyoung Exp $ */
+/* $NetBSD: if_aue.c,v 1.115 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.114 2009/09/04 18:10:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.115 2009/09/23 19:07:19 plunky Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -742,9 +742,10 @@
sc->aue_dev = self;
- devinfop = usbd_devinfo_alloc(uaa->device, 0);
aprint_naive("\n");
aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(uaa->device, 0);
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.28 src/sys/dev/usb/if_axe.c:1.29
--- src/sys/dev/usb/if_axe.c:1.28 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_axe.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.28 2009/09/04 18:10:08 dyoung Exp $ */
+/* $NetBSD: if_axe.c,v 1.29 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.28 2009/09/04 18:10:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.29 2009/09/23 19:07:19 plunky Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -426,15 +426,18 @@
struct ifnet *ifp;
int i, s;
- devinfop = usbd_devinfo_alloc(dev, 0);
+ sc->axe_dev = self;
+
aprint_naive("\n");
aprint_normal("\n");
- sc->axe_dev = self;
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
err = usbd_set_config_no(dev, AXE_CONFIG_NO, 1);
if (err) {
aprint_error_dev(self, "getting interface handle failed\n");
- usbd_devinfo_free(devinfop);
return;
}
@@ -445,7 +448,6 @@
err = usbd_device2interface_handle(dev, AXE_IFACE_IDX, &sc->axe_iface);
if (err) {
aprint_error_dev(self, "getting interface handle failed\n");
- usbd_devinfo_free(devinfop);
return;
}
@@ -455,9 +457,6 @@
id = usbd_get_interface_descriptor(sc->axe_iface);
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
/* Find endpoints. */
for (i = 0; i < id->bNumEndpoints; i++) {
ed = usbd_interface2endpoint_descriptor(sc->axe_iface, i);
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.24 src/sys/dev/usb/if_cdce.c:1.25
--- src/sys/dev/usb/if_cdce.c:1.24 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_cdce.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.24 2009/09/04 18:10:08 dyoung Exp $ */
+/* $NetBSD: if_cdce.c,v 1.25 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.24 2009/09/04 18:10:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.25 2009/09/23 19:07:19 plunky Exp $");
#include "bpfilter.h"
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -154,10 +154,12 @@
const usb_cdc_ethernet_descriptor_t *ue;
char eaddr_str[USB_MAX_ENCODED_STRING_LEN];
- devinfop = usbd_devinfo_alloc(dev, 0);
+ sc->cdce_dev = self;
+
aprint_naive("\n");
aprint_normal("\n");
- sc->cdce_dev = self;
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.54 src/sys/dev/usb/if_cue.c:1.55
--- src/sys/dev/usb/if_cue.c:1.54 Fri Nov 7 00:20:12 2008
+++ src/sys/dev/usb/if_cue.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.54 2008/11/07 00:20:12 dyoung Exp $ */
+/* $NetBSD: if_cue.c,v 1.55 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.54 2008/11/07 00:20:12 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.55 2009/09/23 19:07:19 plunky Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -491,8 +491,10 @@
sc->cue_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.65 src/sys/dev/usb/if_kue.c:1.66
--- src/sys/dev/usb/if_kue.c:1.65 Fri Sep 4 18:10:08 2009
+++ src/sys/dev/usb/if_kue.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.65 2009/09/04 18:10:08 dyoung Exp $ */
+/* $NetBSD: if_kue.c,v 1.66 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.65 2009/09/04 18:10:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.66 2009/09/23 19:07:19 plunky Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -429,8 +429,10 @@
sc->kue_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.65 src/sys/dev/usb/uscanner.c:1.66
--- src/sys/dev/usb/uscanner.c:1.65 Mon Mar 9 15:59:33 2009
+++ src/sys/dev/usb/uscanner.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.65 2009/03/09 15:59:33 uebayasi Exp $ */
+/* $NetBSD: uscanner.c,v 1.66 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.65 2009/03/09 15:59:33 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.66 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -316,8 +316,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(uaa->device, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.27 src/sys/dev/usb/if_rum.c:1.28
--- src/sys/dev/usb/if_rum.c:1.27 Sun Aug 2 20:55:45 2009
+++ src/sys/dev/usb/if_rum.c Wed Sep 23 19:07:19 2009
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.27 2009/08/02 20:55:45 tshiozak Exp $ */
+/* $NetBSD: if_rum.c,v 1.28 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.27 2009/08/02 20:55:45 tshiozak Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.28 2009/09/23 19:07:19 plunky Exp $");
#include "bpfilter.h"
@@ -311,8 +311,10 @@
sc->sc_udev = uaa->device;
sc->sc_flags = 0;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.27 src/sys/dev/usb/umct.c:1.28
--- src/sys/dev/usb/umct.c:1.27 Tue May 12 13:22:10 2009
+++ src/sys/dev/usb/umct.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.27 2009/05/12 13:22:10 cegger Exp $ */
+/* $NetBSD: umct.c,v 1.28 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.27 2009/05/12 13:22:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.28 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -179,8 +179,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.27 src/sys/dev/usb/usscanner.c:1.28
--- src/sys/dev/usb/usscanner.c:1.27 Sat Mar 14 15:36:21 2009
+++ src/sys/dev/usb/usscanner.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.27 2009/03/14 15:36:21 dsl Exp $ */
+/* $NetBSD: usscanner.c,v 1.28 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.27 2009/03/14 15:36:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.28 2009/09/23 19:07:19 plunky Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -183,8 +183,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.25 src/sys/dev/usb/if_udav.c:1.26
--- src/sys/dev/usb/if_udav.c:1.25 Wed Mar 18 10:22:41 2009
+++ src/sys/dev/usb/if_udav.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.25 2009/03/18 10:22:41 cegger Exp $ */
+/* $NetBSD: if_udav.c,v 1.26 2009/09/23 19:07:19 plunky Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.25 2009/03/18 10:22:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.26 2009/09/23 19:07:19 plunky Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -189,8 +189,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.33 src/sys/dev/usb/if_upl.c:1.34
--- src/sys/dev/usb/if_upl.c:1.33 Fri Nov 7 00:20:13 2008
+++ src/sys/dev/usb/if_upl.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.33 2008/11/07 00:20:13 dyoung Exp $ */
+/* $NetBSD: if_upl.c,v 1.34 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.33 2008/11/07 00:20:13 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.34 2009/09/23 19:07:19 plunky Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -232,8 +232,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.33 src/sys/dev/usb/if_url.c:1.34
--- src/sys/dev/usb/if_url.c:1.33 Wed Mar 18 10:22:42 2009
+++ src/sys/dev/usb/if_url.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.33 2009/03/18 10:22:42 cegger Exp $ */
+/* $NetBSD: if_url.c,v 1.34 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.33 2009/03/18 10:22:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.34 2009/09/23 19:07:19 plunky Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -190,8 +190,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.31 src/sys/dev/usb/if_ural.c:1.32
--- src/sys/dev/usb/if_ural.c:1.31 Fri Nov 7 00:20:13 2008
+++ src/sys/dev/usb/if_ural.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.31 2008/11/07 00:20:13 dyoung Exp $ */
+/* $NetBSD: if_ural.c,v 1.32 2009/09/23 19:07:19 plunky Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.31 2008/11/07 00:20:13 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.32 2009/09/23 19:07:19 plunky Exp $");
#include "bpfilter.h"
@@ -377,8 +377,10 @@
sc->sc_dev = self;
sc->sc_udev = uaa->device;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.31 src/sys/dev/usb/uirda.c:1.32
--- src/sys/dev/usb/uirda.c:1.31 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/uirda.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.31 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uirda.c,v 1.32 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.31 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.32 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,8 +184,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.21 src/sys/dev/usb/if_zyd.c:1.22
--- src/sys/dev/usb/if_zyd.c:1.21 Fri Jun 26 00:15:23 2009
+++ src/sys/dev/usb/if_zyd.c Wed Sep 23 19:07:19 2009
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.21 2009/06/26 00:15:23 dyoung Exp $ */
+/* $NetBSD: if_zyd.c,v 1.22 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -22,7 +22,7 @@
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.21 2009/06/26 00:15:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.22 2009/09/23 19:07:19 plunky Exp $");
#include "bpfilter.h"
@@ -311,9 +311,10 @@
sc->sc_udev = uaa->device;
sc->sc_flags = 0;
- devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
aprint_naive("\n");
aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(uaa->device, 0);
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.1 src/sys/dev/usb/moscom.c:1.2
--- src/sys/dev/usb/moscom.c:1.1 Fri Jun 19 01:16:23 2009
+++ src/sys/dev/usb/moscom.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.1 2009/06/19 01:16:23 mrg Exp $ */
+/* $NetBSD: moscom.c,v 1.2 2009/09/23 19:07:19 plunky Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.1 2009/06/19 01:16:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.2 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,8 +200,10 @@
usbd_status error;
int i;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.13 src/sys/dev/usb/pseye.c:1.14
--- src/sys/dev/usb/pseye.c:1.13 Fri Sep 4 11:26:54 2009
+++ src/sys/dev/usb/pseye.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.13 2009/09/04 11:26:54 jmcneill Exp $ */
+/* $NetBSD: pseye.c,v 1.14 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.13 2009/09/04 11:26:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.14 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -185,13 +185,15 @@
usbd_device_handle dev = uaa->device;
usb_interface_descriptor_t *id = NULL;
usb_endpoint_descriptor_t *ed = NULL, *ed_bulkin = NULL;
- char *devinfo;
+ char *devinfop;
int i;
- devinfo = usbd_devinfo_alloc(dev, 0);
aprint_naive("\n");
- aprint_normal(": %s\n", devinfo);
- usbd_devinfo_free(devinfo);
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
sc->sc_dev = self;
sc->sc_udev = dev;
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.13 src/sys/dev/usb/uipaq.c:1.14
--- src/sys/dev/usb/uipaq.c:1.13 Tue Jul 8 08:47:32 2008
+++ src/sys/dev/usb/uipaq.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.13 2008/07/08 08:47:32 uebayasi Exp $ */
+/* $NetBSD: uipaq.c,v 1.14 2009/09/23 19:07:19 plunky Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.13 2008/07/08 08:47:32 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.14 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,6 +164,13 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
+
/* Move the device into the configured state. */
err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1);
if (err) {
@@ -179,11 +186,6 @@
goto bad;
}
- devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
sc->sc_flags = uipaq_lookup(uaa->vendor, uaa->product)->uv_flags;
id = usbd_get_interface_descriptor(iface);
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.115 src/sys/dev/usb/uaudio.c:1.116
--- src/sys/dev/usb/uaudio.c:1.115 Mon Mar 9 15:59:33 2009
+++ src/sys/dev/usb/uaudio.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.115 2009/03/09 15:59:33 uebayasi Exp $ */
+/* $NetBSD: uaudio.c,v 1.116 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.115 2009/03/09 15:59:33 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.116 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -390,13 +390,14 @@
int i, j, found;
sc->sc_dev = self;
+ sc->sc_udev = uaa->device;
- devinfop = usbd_devinfo_alloc(uaa->device, 0);
- aprint_normal(": %s\n", devinfop);
aprint_naive("\n");
- usbd_devinfo_free(devinfop);
+ aprint_normal("\n");
- sc->sc_udev = uaa->device;
+ devinfop = usbd_devinfo_alloc(uaa->device, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
cdesc = usbd_get_config_descriptor(sc->sc_udev);
if (cdesc == NULL) {
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.3 src/sys/dev/usb/uberry.c:1.4
--- src/sys/dev/usb/uberry.c:1.3 Mon May 26 03:20:56 2008
+++ src/sys/dev/usb/uberry.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.3 2008/05/26 03:20:56 jmcneill Exp $ */
+/* $NetBSD: uberry.c,v 1.4 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.3 2008/05/26 03:20:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.4 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,8 +166,10 @@
sc->sc_dev = self;
sc->sc_udev = dev;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.23 src/sys/dev/usb/ubsa.c:1.24
--- src/sys/dev/usb/ubsa.c:1.23 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/ubsa.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.23 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: ubsa.c,v 1.24 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.23 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.24 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,8 +169,11 @@
int i;
sc->sc_dev = self;
+
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.36 src/sys/dev/usb/ubt.c:1.37
--- src/sys/dev/usb/ubt.c:1.36 Sun Aug 30 18:35:53 2009
+++ src/sys/dev/usb/ubt.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.36 2009/08/30 18:35:53 plunky Exp $ */
+/* $NetBSD: ubt.c,v 1.37 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.36 2009/08/30 18:35:53 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.37 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -343,8 +343,10 @@
MBUFQ_INIT(&sc->sc_aclwr_queue);
MBUFQ_INIT(&sc->sc_scowr_queue);
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.7 src/sys/dev/usb/uchcom.c:1.8
--- src/sys/dev/usb/uchcom.c:1.7 Wed Oct 22 10:35:50 2008
+++ src/sys/dev/usb/uchcom.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.7 2008/10/22 10:35:50 haad Exp $ */
+/* $NetBSD: uchcom.c,v 1.8 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.7 2008/10/22 10:35:50 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.8 2009/09/23 19:07:19 plunky Exp $");
/*
* driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -243,8 +243,10 @@
struct uchcom_endpoints endpoints;
struct ucom_attach_args uca;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.7 src/sys/dev/usb/uhmodem.c:1.8
--- src/sys/dev/usb/uhmodem.c:1.7 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/uhmodem.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.7 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uhmodem.c,v 1.8 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <y...@nui.org>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.7 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.8 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,8 +200,10 @@
int j;
char comname[16];
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.15 src/sys/dev/usb/udsbr.c:1.16
--- src/sys/dev/usb/udsbr.c:1.15 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/udsbr.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.15 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: udsbr.c,v 1.16 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.15 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.16 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,8 +128,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/umodem_common.c
diff -u src/sys/dev/usb/umodem_common.c:1.15 src/sys/dev/usb/umodem_common.c:1.16
--- src/sys/dev/usb/umodem_common.c:1.15 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/umodem_common.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.15 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: umodem_common.c,v 1.16 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.15 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.16 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,17 +113,19 @@
int data_ifcno;
int i;
- devinfop = usbd_devinfo_alloc(uaa->device, 0);
- USB_ATTACH_SETUP;
-
sc->sc_dev = self;
sc->sc_udev = dev;
sc->sc_ctl_iface = uaa->iface;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
id = usbd_get_interface_descriptor(sc->sc_ctl_iface);
+ devinfop = usbd_devinfo_alloc(uaa->device, 0);
aprint_normal_dev(self, "%s, iclass %d/%d\n",
devinfop, id->bInterfaceClass, id->bInterfaceSubClass);
usbd_devinfo_free(devinfop);
+
sc->sc_ctl_iface_no = id->bInterfaceNumber;
/* Get the data interface no. */
Index: src/sys/dev/usb/uyap.c
diff -u src/sys/dev/usb/uyap.c:1.15 src/sys/dev/usb/uyap.c:1.16
--- src/sys/dev/usb/uyap.c:1.15 Mon Mar 9 15:59:33 2009
+++ src/sys/dev/usb/uyap.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.15 2009/03/09 15:59:33 uebayasi Exp $ */
+/* $NetBSD: uyap.c,v 1.16 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.15 2009/03/09 15:59:33 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.16 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,8 +76,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uep.c
diff -u src/sys/dev/usb/uep.c:1.12 src/sys/dev/usb/uep.c:1.13
--- src/sys/dev/usb/uep.c:1.12 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/uep.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uep.c,v 1.12 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uep.c,v 1.13 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.12 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.13 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,8 +138,11 @@
int i, found;
sc->sc_dev = self;
+
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.12 src/sys/dev/usb/utoppy.c:1.13
--- src/sys/dev/usb/utoppy.c:1.12 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/utoppy.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.12 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: utoppy.c,v 1.13 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.12 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.13 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,8 +208,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.42 src/sys/dev/usb/uftdi.c:1.43
--- src/sys/dev/usb/uftdi.c:1.42 Mon May 25 11:38:49 2009
+++ src/sys/dev/usb/uftdi.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.42 2009/05/25 11:38:49 nisimura Exp $ */
+/* $NetBSD: uftdi.c,v 1.43 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.42 2009/05/25 11:38:49 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.43 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -189,6 +189,13 @@
DPRINTFN(10,("\nuftdi_attach: sc=%p\n", sc));
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
+
/* Move the device into the configured state. */
err = usbd_set_config_index(dev, UFTDI_CONFIG_INDEX, 1);
if (err) {
@@ -197,11 +204,6 @@
goto bad;
}
- devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
sc->sc_dev = self;
sc->sc_udev = dev;
sc->sc_numports = 1;
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.42 src/sys/dev/usb/uhidev.c:1.43
--- src/sys/dev/usb/uhidev.c:1.42 Mon May 26 19:01:51 2008
+++ src/sys/dev/usb/uhidev.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.42 2008/05/26 19:01:51 drochner Exp $ */
+/* $NetBSD: uhidev.c,v 1.43 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.42 2008/05/26 19:01:51 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.43 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,10 +117,13 @@
sc->sc_dev = self;
sc->sc_udev = uaa->device;
sc->sc_iface = iface;
+
+ aprint_naive("\n");
+ aprint_normal("\n");
+
id = usbd_get_interface_descriptor(iface);
devinfop = usbd_devinfo_alloc(uaa->device, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s, iclass %d/%d\n",
devinfop, id->bInterfaceClass, id->bInterfaceSubClass);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.102 src/sys/dev/usb/ugen.c:1.103
--- src/sys/dev/usb/ugen.c:1.102 Fri Mar 20 20:47:43 2009
+++ src/sys/dev/usb/ugen.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.102 2009/03/20 20:47:43 drochner Exp $ */
+/* $NetBSD: ugen.c,v 1.103 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.102 2009/03/20 20:47:43 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.103 2009/09/23 19:07:19 plunky Exp $");
#include "opt_ugen_bulk_ra_wb.h"
#include "opt_compat_netbsd.h"
@@ -225,8 +225,10 @@
usbd_status err;
int i, dir, conf;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(uaa->device, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.22 src/sys/dev/usb/ugensa.c:1.23
--- src/sys/dev/usb/ugensa.c:1.22 Sun Oct 19 11:40:02 2008
+++ src/sys/dev/usb/ugensa.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.22 2008/10/19 11:40:02 joerg Exp $ */
+/* $NetBSD: ugensa.c,v 1.23 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.22 2008/10/19 11:40:02 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.23 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -148,6 +148,13 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
+
/* Move the device into the configured state. */
err = usbd_set_config_index(dev, UGENSA_CONFIG_INDEX, 1);
if (err) {
@@ -163,11 +170,6 @@
goto bad;
}
- devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
if (ugensa_lookup(uaa->vendor, uaa->product)->ugensa_flags & UNTESTED)
aprint_normal_dev(self, "WARNING: This device is marked as "
"untested. Please submit a report via send-pr(1).\n");
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.22 src/sys/dev/usb/uvscom.c:1.23
--- src/sys/dev/usb/uvscom.c:1.22 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/uvscom.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.22 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uvscom.c,v 1.23 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiy...@jp.freebsd.org>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.22 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.23 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,9 +261,11 @@
int i;
struct ucom_attach_args uca;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
- aprint_normal_dev(self, "%s\n", devinfop);
+ aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
sc->sc_dev = self;
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.82 src/sys/dev/usb/ulpt.c:1.83
--- src/sys/dev/usb/ulpt.c:1.82 Fri Feb 13 23:31:23 2009
+++ src/sys/dev/usb/ulpt.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.82 2009/02/13 23:31:23 bouyer Exp $ */
+/* $NetBSD: ulpt.c,v 1.83 2009/09/23 19:07:19 plunky Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.82 2009/02/13 23:31:23 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.83 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,8 +229,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s, iclass %d/%d\n",
devinfop, ifcd->bInterfaceClass, ifcd->bInterfaceSubClass);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.133 src/sys/dev/usb/umass.c:1.134
--- src/sys/dev/usb/umass.c:1.133 Wed Sep 16 22:44:19 2009
+++ src/sys/dev/usb/umass.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.133 2009/09/16 22:44:19 dyoung Exp $ */
+/* $NetBSD: umass.c,v 1.134 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.133 2009/09/16 22:44:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.134 2009/09/23 19:07:19 plunky Exp $");
#include "atapibus.h"
#include "scsibus.h"
@@ -310,9 +310,11 @@
sc->sc_dev = self;
- devinfop = usbd_devinfo_alloc(uaa->device, 0);
aprint_naive("\n");
- aprint_normal(": %s\n", devinfop);
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(uaa->device, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
sc->sc_udev = uaa->device;
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.67 src/sys/dev/usb/uplcom.c:1.68
--- src/sys/dev/usb/uplcom.c:1.67 Thu Nov 20 10:50:42 2008
+++ src/sys/dev/usb/uplcom.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.67 2008/11/20 10:50:42 jnemeth Exp $ */
+/* $NetBSD: uplcom.c,v 1.68 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.67 2008/11/20 10:50:42 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.68 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,8 +227,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.9 src/sys/dev/usb/uslsa.c:1.10
--- src/sys/dev/usb/uslsa.c:1.9 Mon Jan 5 17:22:18 2009
+++ src/sys/dev/usb/uslsa.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.9 2009/01/05 17:22:18 jakllsch Exp $ */
+/* $NetBSD: uslsa.c,v 1.10 2009/09/23 19:07:19 plunky Exp $ */
/* from ugensa.c */
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.9 2009/01/05 17:22:18 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.10 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -232,36 +232,36 @@
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
char *devinfop;
- const char *devname;
usbd_status err;
struct ucom_attach_args uca;
int i;
sc->sc_dev = self;
- devname = USBDEVNAME(sc->sc_dev);
DPRINTFN(10, ("\nuslsa_attach: sc=%p\n", sc));
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
+
/* Move the device into the configured state. */
err = usbd_set_config_index(dev, USLSA_CONFIG_INDEX, 1);
if (err) {
- aprint_error("\n%s: failed to set configuration, err=%s\n",
- devname, usbd_errstr(err));
+ aprint_error_dev(self, "failed to set configuration, err=%s\n",
+ usbd_errstr(err));
goto bad;
}
err = usbd_device2interface_handle(dev, USLSA_IFACE_INDEX, &iface);
if (err) {
- aprint_error("\n%s: failed to get interface, err=%s\n",
- devname, usbd_errstr(err));
+ aprint_error_dev(self, "failed to get interface, err=%s\n",
+ usbd_errstr(err));
goto bad;
}
- devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
id = usbd_get_interface_descriptor(iface);
sc->sc_udev = dev;
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.26 src/sys/dev/usb/ustir.c:1.27
--- src/sys/dev/usb/ustir.c:1.26 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/ustir.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.26 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: ustir.c,v 1.27 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.26 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.27 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -318,8 +318,10 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.40 src/sys/dev/usb/uvisor.c:1.41
--- src/sys/dev/usb/uvisor.c:1.40 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/uvisor.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.40 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uvisor.c,v 1.41 2009/09/23 19:07:19 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.40 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.41 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,6 +228,13 @@
sc->sc_dev = self;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ devinfop = usbd_devinfo_alloc(dev, 0);
+ aprint_normal_dev(self, "%s\n", devinfop);
+ usbd_devinfo_free(devinfop);
+
/* Move the device into the configured state. */
err = usbd_set_config_index(dev, UVISOR_CONFIG_INDEX, 1);
if (err) {
@@ -243,11 +250,6 @@
goto bad;
}
- devinfop = usbd_devinfo_alloc(dev, 0);
- USB_ATTACH_SETUP;
- aprint_normal_dev(self, "%s\n", devinfop);
- usbd_devinfo_free(devinfop);
-
sc->sc_flags = uvisor_lookup(uaa->vendor, uaa->product)->uv_flags;
if ((sc->sc_flags & (VISOR | PALM4)) == 0) {
Index: src/sys/dev/usb/xboxcontroller.c
diff -u src/sys/dev/usb/xboxcontroller.c:1.10 src/sys/dev/usb/xboxcontroller.c:1.11
--- src/sys/dev/usb/xboxcontroller.c:1.10 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/xboxcontroller.c Wed Sep 23 19:07:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xboxcontroller.c,v 1.10 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: xboxcontroller.c,v 1.11 2009/09/23 19:07:19 plunky Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.10 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.11 2009/09/23 19:07:19 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,9 +112,12 @@
usb_endpoint_descriptor_t *ed;
char *devinfo;
- devinfo = usbd_devinfo_alloc(dev, 0);
sc->sc_dev = self;
- USB_ATTACH_SETUP;
+
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ devinfo = usbd_devinfo_alloc(dev, 0);
aprint_normal_dev(self, "%s\n", devinfo);
usbd_devinfo_free(devinfo);
