Changes in uspace/app/usbinfo/info.c [9d58539:e2dfa86] in mainline

File:

• uspace/app/usbinfo/info.c (modified) (9 diffs)

uspace/app/usbinfo/info.c

@@ -37 +37 @@
 #include <str_error.h>
 #include <errno.h>
+#include <usb/debug.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/recognise.h>
@@ -44 +45 @@
 #include "usbinfo.h"
 
-void dump_short_device_identification(usbinfo_device_t *dev)
+void dump_short_device_identification(usb_device_t *usb_dev)
 {
         printf("%sDevice 0x%04x by vendor 0x%04x\n", get_indent(0),
-            (int) dev->device_descriptor.product_id,
-            (int) dev->device_descriptor.vendor_id);
+            usb_device_descriptors(usb_dev)->device.product_id,
+            usb_device_descriptors(usb_dev)->device.vendor_id);
 }
 
@@ -66 +67 @@
         }
 
-        usbinfo_device_t *dev = (usbinfo_device_t *) arg;
+        usb_device_t *usb_dev = arg;
+        assert(usb_dev);
 
         usb_standard_interface_descriptor_t *iface
@@ -80 +82 @@
         match_id_list_t matches;
         init_match_ids(&matches);
-        usb_device_create_match_ids_from_interface(&dev->device_descriptor,
-            iface, &matches);
+        usb_device_create_match_ids_from_interface(
+            &usb_device_descriptors(usb_dev)->device, iface, &matches);
         dump_match_ids(&matches, get_indent(1));
         clean_match_ids(&matches);
 }
 
-void dump_device_match_ids(usbinfo_device_t *dev)
+void dump_device_match_ids(usb_device_t *usb_dev)
 {
         match_id_list_t matches;
         init_match_ids(&matches);
         usb_device_create_match_ids_from_device_descriptor(
-            &dev->device_descriptor, &matches);
+                &usb_device_descriptors(usb_dev)->device, &matches);
         printf("%sDevice match ids (0x%04x by 0x%04x, %s)\n", get_indent(0),
-            (int) dev->device_descriptor.product_id,
-            (int) dev->device_descriptor.vendor_id,
-            usb_str_class(dev->device_descriptor.device_class));
+            usb_device_descriptors(usb_dev)->device.product_id,
+            usb_device_descriptors(usb_dev)->device.vendor_id,
+            usb_str_class(usb_device_descriptors(usb_dev)->device.device_class));
         dump_match_ids(&matches, get_indent(1));
         clean_match_ids(&matches);
 
-        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,
-            dump_match_ids_from_interface,
-            dev);
+            dump_match_ids_from_interface, usb_dev);
 }
 
@@ -224 +226 @@
 }
 
-void dump_descriptor_tree_brief(usbinfo_device_t *dev)
-{
-        dump_descriptor_tree_callback((uint8_t *)&dev->device_descriptor,
+void dump_descriptor_tree_brief(usb_device_t *usb_dev)
+{
+        dump_descriptor_tree_callback(
+            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
             (size_t) -1, 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,
-            dump_descriptor_tree_callback,
-            NULL);
-}
-
-void dump_descriptor_tree_full(usbinfo_device_t *dev)
-{
-        dump_descriptor_tree_callback((uint8_t *)&dev->device_descriptor,
-            (size_t) -1, dev);
-        usb_dp_walk_simple(dev->full_configuration_descriptor,
-            dev->full_configuration_descriptor_size,
+            dump_descriptor_tree_callback, NULL);
+}
+
+void dump_descriptor_tree_full(usb_device_t *usb_dev)
+{
+        dump_descriptor_tree_callback(
+            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (size_t) -1, usb_dev);
+
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
             usb_dp_standard_descriptor_nesting,
-            dump_descriptor_tree_callback,
-            dev);
+            dump_descriptor_tree_callback, usb_dev);
 }
 
@@ -285 +291 @@
 
 
-void dump_strings(usbinfo_device_t *dev)
+void dump_strings(usb_device_t *usb_dev)
 {
         /* Find used indexes. Devices with more than 64 strings are very rare.*/
         uint64_t str_mask = 0;
-        find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0,
+        find_string_indexes_callback(
+            (const uint8_t *)&usb_device_descriptors(usb_dev)->device, 0,
             &str_mask);
-        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,
-            find_string_indexes_callback,
-            &str_mask);
+            find_string_indexes_callback, &str_mask);
 
         if (str_mask == 0) {
@@ -305 +313 @@
         l18_win_locales_t *langs;
         size_t langs_count;
-        int rc = usb_request_get_supported_languages(&dev->ctrl_pipe,
-            &langs, &langs_count);
+        int rc = usb_request_get_supported_languages(
+            usb_device_get_default_pipe(usb_dev), &langs, &langs_count);
         if (rc != EOK) {
                 fprintf(stderr,
@@ -334 +342 @@
                         }
                         char *string = NULL;
-                        rc = usb_request_get_string(&dev->ctrl_pipe, idx, lang,
+                        rc = usb_request_get_string(
+                            usb_device_get_default_pipe(usb_dev), idx, lang,
                             &string);
                         if ((rc != EOK) && (rc != EEMPTY)) {
@@ -351 +360 @@
 
 
-void dump_status(usbinfo_device_t *dev)
+void dump_status(usb_device_t *usb_dev)
 {
         int rc;
-        uint16_t device_status = 0;
-        uint16_t ctrl_pipe_status = 0;
+        uint16_t status = 0;
 
         /* Device status first. */
-        rc = usb_request_get_status(&dev->ctrl_pipe,
-            USB_REQUEST_RECIPIENT_DEVICE, 0,
-            &device_status);
+        rc = usb_request_get_status(usb_device_get_default_pipe(usb_dev),
+            USB_REQUEST_RECIPIENT_DEVICE, 0, &status);
         if (rc != EOK) {
                 printf("%sFailed to get device status: %s.\n",
                     get_indent(0), str_error(rc));
-                goto try_ctrl_pipe_status;
-        }
-
-        printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
-            get_indent(0),
-            device_status,
-            device_status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
-            device_status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
+        } else {
+                printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
+                    get_indent(0), status,
+                    status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
+                    status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
+        }
 
         /* Interface is not interesting, skipping ;-). */
 
         /* Control endpoint zero. */
-try_ctrl_pipe_status:
-        rc = usb_request_get_status(&dev->ctrl_pipe,
-            USB_REQUEST_RECIPIENT_ENDPOINT, 0,
-            &ctrl_pipe_status);
+        status = 0;
+        rc = usb_request_get_status(usb_device_get_default_pipe(usb_dev),
+            USB_REQUEST_RECIPIENT_ENDPOINT, 0, &status);
         if (rc != EOK) {
                 printf("%sFailed to get control endpoint status: %s.\n",
                     get_indent(0), str_error(rc));
-                goto leave;
-        }
-
-        printf("%sControl endpoint zero status %04X: halted=%s.\n",
-            get_indent(0),
-            ctrl_pipe_status,
-            ctrl_pipe_status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
-
-leave:
-        return;
+        } else {
+                printf("%sControl endpoint zero status %04X: halted=%s.\n",
+                    get_indent(0), status,
+                    status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
+        }
 }