From owner-svn-src-projects@FreeBSD.ORG Mon Nov 25 19:53:47 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id B4E29126;
Mon, 25 Nov 2013 19:53:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 9662F24F6;
Mon, 25 Nov 2013 19:53:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPJrlor009041;
Mon, 25 Nov 2013 19:53:47 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPJrl2Q009034;
Mon, 25 Nov 2013 19:53:47 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201311251953.rAPJrl2Q009034@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 25 Nov 2013 19:53:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r258583 - in projects/sv: sys/modules/cc usr.sbin/usbdump
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 19:53:47 -0000
Author: emaste
Date: Mon Nov 25 19:53:46 2013
New Revision: 258583
URL: http://svnweb.freebsd.org/changeset/base/258583
Log:
Add changes missing from previous MFC at r219925
(Parts of) r217358, r218010, r218152, r218153, and r218155 were missing
from the projects/sv branch.
Modified:
projects/sv/sys/modules/cc/Makefile
projects/sv/usr.sbin/usbdump/usbdump.8
projects/sv/usr.sbin/usbdump/usbdump.c
Modified: projects/sv/sys/modules/cc/Makefile
==============================================================================
--- projects/sv/sys/modules/cc/Makefile Mon Nov 25 19:24:15 2013 (r258582)
+++ projects/sv/sys/modules/cc/Makefile Mon Nov 25 19:53:46 2013 (r258583)
@@ -1,6 +1,9 @@
# $FreeBSD$
-SUBDIR= cc_cubic \
- cc_htcp
+SUBDIR= cc_chd \
+ cc_cubic \
+ cc_hd \
+ cc_htcp \
+ cc_vegas
.include <bsd.subdir.mk>
Modified: projects/sv/usr.sbin/usbdump/usbdump.8
==============================================================================
--- projects/sv/usr.sbin/usbdump/usbdump.8 Mon Nov 25 19:24:15 2013 (r258582)
+++ projects/sv/usr.sbin/usbdump/usbdump.8 Mon Nov 25 19:53:46 2013 (r258583)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 14, 2010
+.Dd December 4, 2010
.Dt usbdump 8
.Os
.Sh NAME
@@ -41,24 +41,29 @@
.Sh DESCRIPTION
The
.Nm
-utility provides a way to dump USB packets on each host controller.
+utility provides a way to dump USB packets on host controllers.
.Pp
-The following options are accepted.
+The following options are accepted:
.Bl -tag -width ".Fl f Ar file"
.It Fl i Ar ifname
-Listen on USB bus interface.
+Listen on USB bus interface
+.Ar ifname .
.It Fl r Ar file
-Read the raw packets from file.
+Read the raw packets from
+.Ar file .
.It Fl s Ar snaplen
-Snapshot bytes from each packet.
+Snapshot
+.Ar snaplen
+bytes from each packet.
.It Fl v
Enable debugging messages.
-When it defined multiple times the verbose level increases.
+When defined multiple times the verbosity level increases.
.It Fl w Ar file
-Write the raw packets to file.
+Write the raw packets to
+.Ar file .
.El
.Sh EXAMPLES
-Captures the USB raw packets alive on usbus2:
+Captures USB raw packets on usbus2:
.Pp
.Dl "usbdump -i usbus2 -s 256 -v"
.Pp
@@ -67,11 +72,61 @@ size limit:
.Pp
.Dl "usbdump -i usbus2 -s 0 -w /tmp/dump_pkts"
.Pp
-Read the USB raw packets from the file:
+Read the USB raw packets from previous file:
.Pp
.Dl "usbdump -r /tmp/dump_pkts -v"
+.Sh OUTPUT FORMAT
+The output format of
+.Nm
+is as follows:
+.Pp
+.Dl "<time> <bus>.<addr> <ep> <xfertype> <S/D> (<frames>/<length>) <...>"
+.Pp
+The meaning of the output format elements is as follows:
+.Bl -tag -width "<xfertype>"
+.It <time>
+A timestamp preceding all output lines.
+The timestamp has the format "hh:mm:ss.frac" and is as accurate as
+the kernel's clock.
+.It <bus>
+The USB host controller's bus unit number.
+.It <addr>
+The unique number of the USB device as allocated by the host controller driver.
+.It <ep>
+The USB endpoint address that indicates whether the address is
+.Dv OUT
+or
+.Dv IN .
+.It <xfertype>
+The USB transfer type.
+Can be
+.Dv CTRL ,
+.Dv ISOC ,
+.Dv BULK
+or
+.Dv INTR .
+.It <S/D>
+`S' indicates a USB submit.
+`D' indicates a USB transfer done.
+.It <frames>
+Numbers of frames in this packets.
+If this is a USB submit, its value is
+.Li xfer->nframes
+which means how many frames are acceptable or registered to transfer.
+If this is a USB done,
+.Li xfer->aframes
+is the actual number of frames.
+.It <length>
+Total packet size.
+If this is a USB submit, its value is
+.Li xfer->sumlen .
+If this is a USB done, its value is
+.Li xfer->actlen .
+.It <...>
+Optional field used for printing an error string if the packet is from USB done.
+.El
.Sh SEE ALSO
.Xr usbconfig 8
.Sh AUTHORS
.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.Aq weongyo@FreeBSD.org
Modified: projects/sv/usr.sbin/usbdump/usbdump.c
==============================================================================
--- projects/sv/usr.sbin/usbdump/usbdump.c Mon Nov 25 19:24:15 2013 (r258582)
+++ projects/sv/usr.sbin/usbdump/usbdump.c Mon Nov 25 19:53:46 2013 (r258583)
@@ -72,7 +72,7 @@ struct usbcap_filehdr {
static int doexit = 0;
static int pkt_captured = 0;
static int verbose = 0;
-static const char *i_arg = "usbus0";;
+static const char *i_arg = "usbus0";
static const char *r_arg = NULL;
static const char *w_arg = NULL;
static const char *errstr_table[USB_ERR_MAX] = {
@@ -185,11 +185,10 @@ static void
hexdump(const char *region, size_t len)
{
const char *line;
- int x, c;
- char lbuf[80];
-#define EMIT(fmt, args...) do { \
- sprintf(lbuf, fmt , ## args); \
- printf("%s", lbuf); \
+ int x;
+ int c;
+#define EMIT(fmt, ...) do { \
+ printf(fmt,## __VA_ARGS__); \
} while (0)
for (line = region; line < (region + len); line += 16) {