Changeset e9c02b7 in mainline

Timestamp:

2011-06-17T20:42:13Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051f96b

Parents:

dec55ce

Message:

More human-readable HID report printing

Location:

uspace/app/usbinfo

Files:

• Makefile (modified) (2 diffs)
• hid.c (modified) (3 diffs)

uspace/app/usbinfo/Makefile

@@ -31 +31 @@
 
 LIBS = \
+        $(LIBUSBHID_PREFIX)/libusbhid.a \
         $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSB_PREFIX)/libusb.a \
@@ -37 +38 @@
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBUSBHID_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include
 

uspace/app/usbinfo/hid.c

@@ -38 +38 @@
 #include <usb/classes/classes.h>
 #include <usb/dev/request.h>
+#include <usb/hid/hidparser.h>
 #include <errno.h>
 #include "usbinfo.h"
@@ -84 +85 @@
 }
 
+/** Dumps HID report in pseudo human-readable format.
+ *
+ * @param iface_no USB interface the report belongs to.
+ * @param report Parsed report descriptor.
+ */
+static void dump_hid_report_brief(int iface_no, usb_hid_report_t *report)
+{
+        printf("%sParsed HID report descriptor for interface %d\n",
+            get_indent(0), iface_no);
+        list_foreach(report->reports, report_it) {
+                usb_hid_report_description_t *description = list_get_instance(report_it, usb_hid_report_description_t, link);
+                printf("%sReport %d (type %d)\n", get_indent(1),
+                    (int) description->report_id,
+                    (int) description->type);
+                list_foreach(description->report_items, item_it) {
+                        usb_hid_report_field_t *field = list_get_instance(item_it, usb_hid_report_field_t, link);
+                        printf("%sUsage page = 0x%04x    Usage = 0x%04x\n",
+                            get_indent(2),
+                            (int) field->usage_page, (int) field->usage);
+                }
+        }
+}
+
 /** Retrieves HID report from given USB device and dumps it.
  *
@@ -115 +139 @@
         }
 
+        usb_hid_report_t report;
+        rc = usb_hid_parse_report_descriptor(&report, raw_report, report_size);
+        if (rc != EOK) {
+                usb_log_error("Failed to part report descriptor: %s.\n",
+                    str_error(rc));
+        }
+
         dump_hid_report_raw(iface_no, raw_report, report_size);
+        dump_hid_report_brief(iface_no, &report);
 
         free(raw_report);
+        usb_hid_free_report(&report);
 }