Changeset b4b534ac in mainline for uspace/app/usbinfo/hid.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/app/usbinfo/hid.c (modified) (3 diffs)

uspace/app/usbinfo/hid.c

@@ -36 +36 @@
 #include <stdio.h>
 #include <str_error.h>
+#include <usb/debug.h>
 #include <usb/classes/classes.h>
 #include <usb/dev/request.h>
@@ -50 +51 @@
 
 typedef struct {
-        usbinfo_device_t *dev;
+        usb_device_t *usb_dev;
         hid_dump_type_t dump_type;
         usb_standard_interface_descriptor_t *last_iface;
@@ -211 +212 @@
 
         retrieve_and_dump_hid_report(context->dump_type,
-            &context->dev->ctrl_pipe, context->last_iface->interface_number,
-            report_size);
-}
-
-
-void dump_hidreport_raw(usbinfo_device_t *dev)
+            usb_device_get_default_pipe(context->usb_dev),
+            context->last_iface->interface_number, report_size);
+}
+
+
+void dump_hidreport_raw(usb_device_t *usb_dev)
 {
         descriptor_walk_context_t context = {
-                .dev = dev,
+                .usb_dev = usb_dev,
                 .dump_type = HID_DUMP_RAW,
                 .last_iface = NULL
         };
 
-        usb_dp_walk_simple(dev->full_configuration_descriptor,
-            dev->full_configuration_descriptor_size,
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
             usb_dp_standard_descriptor_nesting,
             descriptor_walk_callback, &context);
 }
 
-void dump_hidreport_usages(usbinfo_device_t *dev)
+void dump_hidreport_usages(usb_device_t *usb_dev)
 {
         descriptor_walk_context_t context = {
-                .dev = dev,
+                .usb_dev = usb_dev,
                 .dump_type = HID_DUMP_USAGES,
                 .last_iface = NULL
         };
 
-        usb_dp_walk_simple(dev->full_configuration_descriptor,
-            dev->full_configuration_descriptor_size,
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
             usb_dp_standard_descriptor_nesting,
             descriptor_walk_callback, &context);