svn commit: r235880 - stable/9/usr.bin/usbhidctl

[Alexander Motin]

Author: mav
Date: Thu May 24 04:23:06 2012
New Revision: 235880
URL: http://svn.freebsd.org/changeset/base/235880

Log:
  MFC r235519:
  Add support for -z option for reading operations. It allows to not request
  current values from device, but only receive changes.
  
  Sponsored by:	iXsystems, Inc.

Modified:
  stable/9/usr.bin/usbhidctl/usbhid.c
  stable/9/usr.bin/usbhidctl/usbhidctl.1
Directory Properties:
  stable/9/usr.bin/usbhidctl/   (props changed)

Modified: stable/9/usr.bin/usbhidctl/usbhid.c
==============================================================================
--- stable/9/usr.bin/usbhidctl/usbhid.c	Thu May 24 04:10:34 2012	(r235879)
+++ stable/9/usr.bin/usbhidctl/usbhid.c	Thu May 24 04:23:06 2012	(r235880)
@@ -182,11 +182,11 @@ usage(void)
 
 	fprintf(stderr,
                 "usage: %s -f device "
-                "[-l] [-n] [-r] [-t tablefile] [-v] [-x] name ...\n",
+                "[-l] [-n] [-r] [-t tablefile] [-v] [-x] [-z] name ...\n",
                 getprogname());
 	fprintf(stderr,
                 "       %s -f device "
-                "[-l] [-n] [-r] [-t tablefile] [-v] [-x] -a\n",
+                "[-l] [-n] [-r] [-t tablefile] [-v] [-x] [-z] -a\n",
                 getprogname());
 	fprintf(stderr,
                 "       %s -f device "
@@ -304,7 +304,7 @@ dumpdata(int f, report_desc_t rd, int lo
 	u_char *dbuf;
 	enum hid_kind kind;
 
-	kind = 0;
+	kind = zflag ? 3 : 0;
 	rid = -1;
 	use_rid = !!hid_get_report_id(f);
 	do {

Modified: stable/9/usr.bin/usbhidctl/usbhidctl.1
==============================================================================
--- stable/9/usr.bin/usbhidctl/usbhidctl.1	Thu May 24 04:10:34 2012	(r235879)
+++ stable/9/usr.bin/usbhidctl/usbhidctl.1	Thu May 24 04:23:06 2012	(r235880)
@@ -47,6 +47,7 @@
 .Op Fl l
 .Op Fl v
 .Op Fl x
+.Op Fl z
 .Fl a
 .Nm
 .Fl f Ar device
@@ -55,6 +56,7 @@
 .Op Fl n
 .Op Fl v
 .Op Fl x
+.Op Fl z
 .Ar item ...
 .Nm
 .Fl f Ar device
@@ -99,9 +101,8 @@ Only 'output' and 'feature' kinds can be
 .It Fl x
 Dump data in hexadecimal as well as decimal.
 .It Fl z
-Reset reports to zero before processing
-.Fl w
-arguments. If not specified, current values will be requested from device.
+Reset reports to zero before processing other arguments.
+If not specified, current values will be requested from device.
 .El
 .Sh SYNTAX
 .Nm