From owner-svn-src-stable-8@FreeBSD.ORG Sun Apr 3 22:21:41 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 372B4106566C; Sun, 3 Apr 2011 22:21:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0DF558FC14; Sun, 3 Apr 2011 22:21:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p33MLeAG062934; Sun, 3 Apr 2011 22:21:40 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p33MLeOL062932; Sun, 3 Apr 2011 22:21:40 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201104032221.p33MLeOL062932@svn.freebsd.org> From: Hans Petter Selasky Date: Sun, 3 Apr 2011 22:21:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220310 - stable/8/sys/dev/usb/input X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2011 22:21:41 -0000 Author: hselasky Date: Sun Apr 3 22:21:40 2011 New Revision: 220310 URL: http://svn.freebsd.org/changeset/base/220310 Log: MFC r219848. - Update format of sysctl node. Approved by: thompsa (mentor) Modified: stable/8/sys/dev/usb/input/ums.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/usb/input/ums.c ============================================================================== --- stable/8/sys/dev/usb/input/ums.c Sun Apr 3 22:15:00 2011 (r220309) +++ stable/8/sys/dev/usb/input/ums.c Sun Apr 3 22:21:40 2011 (r220310) @@ -669,7 +669,7 @@ ums_attach(device_t dev) SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "parseinfo", CTLTYPE_STRING|CTLFLAG_RD, sc, 0, ums_sysctl_handler_parseinfo, - "", "Dump UMS report parsing information"); + "", "Dump of parsed HID report descriptor"); return (0); @@ -950,10 +950,10 @@ ums_sysctl_handler_parseinfo(SYSCTL_HAND struct ums_softc *sc = arg1; struct ums_info *info; struct sbuf *sb; - int i, j, err; + int i, j, err, had_output; sb = sbuf_new_auto(); - for (i = 0; i < UMS_INFO_MAX; i++) { + for (i = 0, had_output = 0; i < UMS_INFO_MAX; i++) { info = &sc->sc_info[i]; /* Don't emit empty info */ @@ -963,6 +963,9 @@ ums_sysctl_handler_parseinfo(SYSCTL_HAND info->sc_buttons == 0) continue; + if (had_output) + sbuf_printf(sb, "\n"); + had_output = 1; sbuf_printf(sb, "i%d:", i + 1); if (info->sc_flags & UMS_FLAG_X_AXIS) sbuf_printf(sb, " X:r%d, p%d, s%d;", @@ -996,7 +999,6 @@ ums_sysctl_handler_parseinfo(SYSCTL_HAND (int)info->sc_loc_btn[j].pos, (int)info->sc_loc_btn[j].size); } - sbuf_printf(sb, "\n"); } sbuf_finish(sb); err = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1);