From owner-p4-projects@FreeBSD.ORG Mon Oct 19 16:24:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FFDA1065694; Mon, 19 Oct 2009 16:24:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 214F1106566B for ; Mon, 19 Oct 2009 16:24:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E07B8FC12 for ; Mon, 19 Oct 2009 16:24:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JGOuuH080463 for ; Mon, 19 Oct 2009 16:24:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9JGOumf080461 for perforce@freebsd.org; Mon, 19 Oct 2009 16:24:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 19 Oct 2009 16:24:56 GMT Message-Id: <200910191624.n9JGOumf080461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2009 16:24:57 -0000 http://p4web.freebsd.org/chv.cgi?CH=169601 Change 169601 by hselasky@hselasky_laptop001 on 2009/10/19 16:24:34 USB CORE: - make core debugging parameters tunable - patch from: Andriy Gapon Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#38 (text+ko) ==== @@ -99,6 +99,9 @@ SYSCTL_INT(_hw_usb_ehci, OID_AUTO, no_hs, CTLFLAG_RW, &ehcinohighspeed, 0, "Disable High Speed USB"); +TUNABLE_INT("hw.usb.ehci.debug", &ehcidebug); +TUNABLE_INT("hw.usb.ehci.no_hs", &ehcinohighspeed); + static void ehci_dump_regs(ehci_softc_t *sc); static void ehci_dump_sqh(ehci_softc_t *sc, ehci_qh_t *sqh); ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#30 (text+ko) ==== @@ -84,6 +84,9 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW, &ohcidebug, 0, "ohci debug level"); + +TUNABLE_INT("hw.usb.ohci.debug", &ohcidebug); + static void ohci_dumpregs(ohci_softc_t *); static void ohci_dump_tds(ohci_td_t *); static uint8_t ohci_dump_td(ohci_td_t *); ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#28 (text+ko) ==== @@ -91,6 +91,10 @@ &uhcidebug, 0, "uhci debug level"); SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW, &uhcinoloop, 0, "uhci noloop"); + +TUNABLE_INT("hw.usb.uhci.debug", &uhcidebug); +TUNABLE_INT("hw.usb.uhci.loop", &uhcinoloop); + static void uhci_dumpregs(uhci_softc_t *sc); static void uhci_dump_tds(uhci_td_t *td); ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#36 (text+ko) ==== @@ -105,6 +105,8 @@ SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, no_leds, CTLFLAG_RW, &ukbd_no_leds, 0, "Disables setting of keyboard leds"); +TUNABLE_INT("hw.usb.ukbd.debug", &ukbd_debug); +TUNABLE_INT("hw.usb.ukbd.no_leds", &ukbd_no_leds); #endif #define UPROTO_BOOT_KEYBOARD 1 ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#35 (text+ko) ==== @@ -175,6 +175,8 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass"); SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW, &umass_debug, 0, "umass debug level"); + +TUNABLE_INT("hw.usb.umass.debug", &umass_debug); #else #define DIF(...) do { } while (0) #define DPRINTF(...) do { } while (0) ==== //depot/projects/usb/src/sys/dev/usb/usb_debug.c#11 (text+ko) ==== @@ -67,6 +67,8 @@ SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW, &usb_debug, 0, "Debug level"); +TUNABLE_INT("hw.usb.debug", &usb_debug); + /*------------------------------------------------------------------------* * usb_dump_iface * ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#38 (text+ko) ==== @@ -85,6 +85,8 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, dev, CTLFLAG_RW, 0, "USB device"); SYSCTL_INT(_hw_usb_dev, OID_AUTO, debug, CTLFLAG_RW, &usb_fifo_debug, 0, "Debug Level"); + +TUNABLE_INT("hw.usb.dev.debug", &usb_fifo_debug); #endif #if ((__FreeBSD_version >= 700001) || (__FreeBSD_version == 0) || \ ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#23 (text+ko) ==== @@ -130,6 +130,8 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB generic"); SYSCTL_INT(_hw_usb_ugen, OID_AUTO, debug, CTLFLAG_RW, &ugen_debug, 0, "Debug level"); + +TUNABLE_INT("hw.usb.ugen.debug", &ugen_debug); #endif ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#35 (text+ko) ==== @@ -79,6 +79,8 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB HUB"); SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW, &uhub_debug, 0, "Debug level"); + +TUNABLE_INT("hw.usb.uhub.debug", &uhub_debug); #endif #if USB_HAVE_POWERD ==== //depot/projects/usb/src/sys/dev/usb/usb_process.c#14 (text+ko) ==== @@ -83,6 +83,8 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process"); SYSCTL_INT(_hw_usb_proc, OID_AUTO, debug, CTLFLAG_RW, &usb_proc_debug, 0, "Debug level"); + +TUNABLE_INT("hw.usb.proc.debug", &usb_proc_debug); #endif /*------------------------------------------------------------------------*