Sun Apr 10 15:42:43 2016 UTC ()
default uhubdebug to 0 again


(skrll)
diff -r1.126.2.26 -r1.126.2.27 src/sys/dev/usb/uhub.c
cvs diff -r1.126.2.26 -r1.126.2.27 src/sys/dev/usb/uhub.c (expand / switch to unified diff)

--- src/sys/dev/usb/uhub.c 2016/04/10 15:40:25 1.126.2.26
+++ src/sys/dev/usb/uhub.c 2016/04/10 15:42:43 1.126.2.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uhub.c,v 1.126.2.26 2016/04/10 15:40:25 skrll Exp $ */ 1/* $NetBSD: uhub.c,v 1.126.2.27 2016/04/10 15:42:43 skrll Exp $ */
2/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ 2/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
3/* $OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */ 3/* $OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */
4 4
5/* 5/*
6 * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. 6 * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * This code is derived from software contributed to The NetBSD Foundation 9 * This code is derived from software contributed to The NetBSD Foundation
10 * by Lennart Augustsson (lennart@augustsson.net) at 10 * by Lennart Augustsson (lennart@augustsson.net) at
11 * Carlstedt Research & Technology. 11 * Carlstedt Research & Technology.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -27,50 +27,50 @@ @@ -27,50 +27,50 @@
27 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 27 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
28 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 28 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
29 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 29 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
30 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 30 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
31 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 31 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32 * POSSIBILITY OF SUCH DAMAGE. 32 * POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35/* 35/*
36 * USB spec: http://www.usb.org/developers/docs/usbspec.zip 36 * USB spec: http://www.usb.org/developers/docs/usbspec.zip
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.26 2016/04/10 15:40:25 skrll Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.27 2016/04/10 15:42:43 skrll Exp $");
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43 43
44#include <sys/bus.h> 44#include <sys/bus.h>
45#include <sys/device.h> 45#include <sys/device.h>
46#include <sys/kernel.h> 46#include <sys/kernel.h>
47#include <sys/kmem.h> 47#include <sys/kmem.h>
48#include <sys/proc.h> 48#include <sys/proc.h>
49#include <sys/sysctl.h> 49#include <sys/sysctl.h>
50#include <sys/systm.h> 50#include <sys/systm.h>
51 51
52 52
53#include <dev/usb/usb.h> 53#include <dev/usb/usb.h>
54#include <dev/usb/usbdi.h> 54#include <dev/usb/usbdi.h>
55#include <dev/usb/usbdi_util.h> 55#include <dev/usb/usbdi_util.h>
56#include <dev/usb/usbdivar.h> 56#include <dev/usb/usbdivar.h>
57#include <dev/usb/usbhist.h> 57#include <dev/usb/usbhist.h>
58 58
59#ifdef USB_DEBUG 59#ifdef USB_DEBUG
60#ifndef UHUB_DEBUG 60#ifndef UHUB_DEBUG
61#define uhubdebug 0 61#define uhubdebug 0
62#else 62#else
63static int uhubdebug = 10; 63static int uhubdebug = 0;
64 64
65SYSCTL_SETUP(sysctl_hw_uhub_setup, "sysctl hw.uhub setup") 65SYSCTL_SETUP(sysctl_hw_uhub_setup, "sysctl hw.uhub setup")
66{ 66{
67 int err; 67 int err;
68 const struct sysctlnode *rnode; 68 const struct sysctlnode *rnode;
69 const struct sysctlnode *cnode; 69 const struct sysctlnode *cnode;
70 70
71 err = sysctl_createv(clog, 0, NULL, &rnode, 71 err = sysctl_createv(clog, 0, NULL, &rnode,
72 CTLFLAG_PERMANENT, CTLTYPE_NODE, "uhub", 72 CTLFLAG_PERMANENT, CTLTYPE_NODE, "uhub",
73 SYSCTL_DESCR("uhub global controls"), 73 SYSCTL_DESCR("uhub global controls"),
74 NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL); 74 NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
75 75
76 if (err) 76 if (err)