Changes in uspace/app/usbinfo/hid.c [feeac0d:e2dfa86] in mainline

File:

• uspace/app/usbinfo/hid.c (modified) (4 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;
@@ -100 +101 @@
         printf("%sParsed HID report descriptor for interface %d\n",
             get_indent(0), iface_no);
-        list_foreach(report->reports, reports_link,
-            usb_hid_report_description_t, description) {
+        list_foreach(report->reports, report_it) {
+                usb_hid_report_description_t *description = list_get_instance(
+                    report_it, usb_hid_report_description_t, reports_link);
                 printf("%sReport %d (type %d)\n", get_indent(1),
                     (int) description->report_id,
                     (int) description->type);
-                list_foreach(description->report_items, ritems_link,
-                    usb_hid_report_field_t, field) {
+                list_foreach(description->report_items, item_it) {
+                        usb_hid_report_field_t *field = list_get_instance(
+                            item_it, usb_hid_report_field_t, ritems_link);
                         printf("%sUsage page = 0x%04x    Usage = 0x%04x\n",
                             get_indent(2),
@@ -211 +214 @@
 
         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);