d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option -x to display output values in hex in addition to decimal.

Browse Source
This commit is contained in:
Greg Lehey 2006-11-23 00:20:54 +00:00
parent 84eab9ad73
commit 9a2a66f1bb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=164531
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.bin/usbhidctl/usbhid.c
View File

@ -54,6 +54,7 @@
int verbose = 0;
int all = 0;
int noname = 0;
int hexdump = 0;
static int reportid;
char **names;
@ -94,8 +95,14 @@ usage(void)
{
extern char *__progname;
fprintf(stderr, "usage: %s -f device [-l] [-n] [-r] [-t tablefile] [-v] name ...\n", __progname);
fprintf(stderr, " %s -f device [-l] [-n] [-r] [-t tablefile] [-v] -a\n", __progname);
fprintf(stderr,
"usage: %s -f device "
"[-l] [-n] [-r] [-t tablefile] [-v] [x] name ...\n",
__progname);
fprintf(stderr,
" %s -f device "
"[-l] [-n] [-r] [-t tablefile] [-v] [x] -a\n",
__progname);
exit(1);
}
@ -105,8 +112,8 @@ dumpitem(const char *label, struct hid_item *h)
if ((h->flags & HIO_CONST) && !verbose)
return;
printf("%s size=%d count=%d page=%s usage=%s%s", label,
h->report_size, h->report_count,
hid_usage_page(HID_PAGE(h->usage)),
h->report_size, h->report_count,
hid_usage_page(HID_PAGE(h->usage)),
hid_usage_in_page(h->usage),
h->flags & HIO_CONST ? " Const" : "");
printf(", logical range %d..%d",
@ -130,7 +137,7 @@ dumpitems(report_desc_t r)
switch (h.kind) {
case hid_collection:
printf("Collection page=%s usage=%s\n",
hid_usage_page(HID_PAGE(h.usage)),
hid_usage_page(HID_PAGE(h.usage)),
hid_usage_in_page(h.usage));
break;
case hid_endcollection:
@ -187,6 +194,8 @@ prdata(u_char *buf, struct hid_item *h)
printf("%d", (int)data);
else
printf("%u", data);
if (hexdump)
printf(" [0x%x]", data);
pos += h->report_size;
}
}
@ -204,7 +213,7 @@ dumpdata(int f, report_desc_t rd, int loop)
char namebuf[10000], *namep;
hids = 0;
for (d = hid_start_parse(rd, 1<<hid_input, reportid);
for (d = hid_start_parse(rd, 1<<hid_input, reportid);
hid_get_item(d, &h); ) {
if (h.kind == hid_collection)
colls[++sp] = h.usage;
@ -265,7 +274,7 @@ main(int argc, char **argv)
int loop = 0;
char *table = 0;
while ((ch = getopt(argc, argv, "af:lnrt:v")) != -1) {
while ((ch = getopt(argc, argv, "af:lnrt:vx")) != -1) {
switch(ch) {
case 'a':
all++;
@ -288,6 +297,9 @@ main(int argc, char **argv)
case 'v':
verbose++;
break;
case 'x':
hexdump ^= 1;
break;
case '?':
default:
usage();
@ -318,9 +330,9 @@ main(int argc, char **argv)
err(1, "%s", dev);
r = hid_get_report_desc(f);
if (r == 0)
if (r == 0)
errx(1, "USB_GET_REPORT_DESC");
if (repdump) {
printf("Report descriptor:\n");
dumpitems(r);

3
usr.bin/usbhidctl/usbhidctl.1
View File

@ -50,6 +50,7 @@
.Op Fl r
.Op Fl t Ar table
.Op Fl v
.Op Fl x
.Op Ar item ...
.Sh DESCRIPTION
The
@ -75,6 +76,8 @@ Dump the report descriptor.
Specify a path name for the HID usage table file.
.It Fl v
Be verbose.
.It Fl x
Dump data in hexadecimal as well as decimal.
.El
.Sh FILES
.Pa /usr/share/misc/usb_hid_usages