From owner-svn-src-all@freebsd.org Thu May 24 18:02:04 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13577EFA231; Thu, 24 May 2018 18:02:04 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B99897B220; Thu, 24 May 2018 18:02:03 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9AA9F15919; Thu, 24 May 2018 18:02:03 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4OI23qk016045; Thu, 24 May 2018 18:02:03 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4OI23qd016042; Thu, 24 May 2018 18:02:03 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201805241802.w4OI23qd016042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 24 May 2018 18:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334173 - in head: share/man/man4 sys/dev/usb/template X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head: share/man/man4 sys/dev/usb/template X-SVN-Commit-Revision: 334173 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2018 18:02:04 -0000 Author: trasz Date: Thu May 24 18:02:02 2018 New Revision: 334173 URL: https://svnweb.freebsd.org/changeset/base/334173 Log: Clarify that USB bus power consumption is measured in mA at 5V. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/share/man/man4/usb_template.4 head/sys/dev/usb/template/usb_template.c Modified: head/share/man/man4/usb_template.4 ============================================================================== --- head/share/man/man4/usb_template.4 Thu May 24 17:54:08 2018 (r334172) +++ head/share/man/man4/usb_template.4 Thu May 24 18:02:02 2018 (r334173) @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 23, 2018 +.Dd May 24, 2018 .Dt USB_TEMPLATE 4 .Os . @@ -101,7 +101,7 @@ tunables: Currently selected template. Set to -1 to make the device disappear from the USB host point of view. .It Va hw.usb.template_power -USB bus power consumption in mA. +USB bus power consumption in mA at 5V. Must be between 0 and 500. Setting to 0 marks the device as self-powered. Defaults to 500mA. Modified: head/sys/dev/usb/template/usb_template.c ============================================================================== --- head/sys/dev/usb/template/usb_template.c Thu May 24 17:54:08 2018 (r334172) +++ head/sys/dev/usb/template/usb_template.c Thu May 24 18:02:02 2018 (r334173) @@ -120,7 +120,7 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, templates, CTLFLAG_RW, SYSCTL_PROC(_hw_usb, OID_AUTO, template_power, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, 0, sysctl_hw_usb_template_power, - "I", "USB bus power consumption in mA"); + "I", "USB bus power consumption in mA at 5V"); static int usb_template_power = 500; /* 500mA */