Changes in uspace/app/usbinfo/info.c [b1c6e58:5ccb15c] in mainline

File:

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

uspace/app/usbinfo/info.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usbinfo
+/** @addtogroup usb
  * @{
  */
 /**
  * @file
- * Dumping of generic device properties.
+ * @brief
  */
 #include <stdio.h>
 #include <str_error.h>
 #include <errno.h>
-#include <usb/pipes.h>
-#include <usb/recognise.h>
-#include <usb/request.h>
+#include <usb/usbdrv.h>
 #include "usbinfo.h"
 
-int dump_device(devman_handle_t hc_handle, usb_address_t address)
+int dump_device(int hc_phone, usb_address_t address)
 {
-        int rc;
-        usb_device_connection_t wire;
-        usb_endpoint_pipe_t ctrl_pipe;
-
-        /*
-         * Initialize pipes.
-         */
-        rc = usb_device_connection_initialize(&wire, hc_handle, address);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to create connection to the device: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe, &wire);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to create default control pipe: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to start session on control pipe: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-
         /*
          * Dump information about possible match ids.
@@ -78 +47 @@
         match_id_list_t match_id_list;
         init_match_ids(&match_id_list);
-        rc = usb_device_create_match_ids(&ctrl_pipe, &match_id_list);
+        int rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address);
         if (rc != EOK) {
                 fprintf(stderr,
                     NAME ": failed to fetch match ids of the device: %s.\n",
                     str_error(rc));
-                goto leave;
+                return rc;
         }
         dump_match_ids(&match_id_list);
@@ -91 +60 @@
          */
         usb_standard_device_descriptor_t device_descriptor;
-        rc = usb_request_get_device_descriptor(&ctrl_pipe, &device_descriptor);
+        usb_dprintf(NAME, 1,
+            "usb_drv_req_get_device_descriptor(%d, %d, %p)\n",
+            hc_phone, (int) address, &device_descriptor);
+
+        rc = usb_drv_req_get_device_descriptor(hc_phone, address,
+            &device_descriptor);
         if (rc != EOK) {
                 fprintf(stderr,
                     NAME ": failed to fetch standard device descriptor: %s.\n",
                     str_error(rc));
-                goto leave;
+                return rc;
         }
-        dump_usb_descriptor((uint8_t *)&device_descriptor, sizeof(device_descriptor));
+        dump_standard_device_descriptor(&device_descriptor);
 
         /*
@@ -105 +79 @@
         usb_standard_configuration_descriptor_t config_descriptor;
         int config_index = 0;
-        rc = usb_request_get_bare_configuration_descriptor(&ctrl_pipe,
-            config_index, &config_descriptor);
+        usb_dprintf(NAME, 1,
+            "usb_drv_req_get_bare_configuration_descriptor(%d, %d, %d, %p)\n",
+            hc_phone, (int) address, config_index, &config_descriptor);
+
+        rc = usb_drv_req_get_bare_configuration_descriptor(hc_phone, address,
+            config_index, &config_descriptor );
         if (rc != EOK) {
                 fprintf(stderr,
                     NAME ": failed to fetch standard configuration descriptor: %s.\n",
                     str_error(rc));
-                goto leave;
+                return rc;
         }
-        //dump_standard_configuration_descriptor(config_index, &config_descriptor);
+        dump_standard_configuration_descriptor(config_index,
+            &config_descriptor);
 
         void *full_config_descriptor = malloc(config_descriptor.total_length);
-        rc = usb_request_get_full_configuration_descriptor(&ctrl_pipe,
+        usb_dprintf(NAME, 1,
+            "usb_drv_req_get_full_configuration_descriptor(%d, %d, %d, %p, %zu)\n",
+            hc_phone, (int) address, config_index,
+            full_config_descriptor, config_descriptor.total_length);
+
+        rc = usb_drv_req_get_full_configuration_descriptor(hc_phone, address,
             config_index,
             full_config_descriptor, config_descriptor.total_length, NULL);
@@ -123 +107 @@
                     NAME ": failed to fetch full configuration descriptor: %s.\n",
                     str_error(rc));
-                goto leave;
+                return rc;
         }
+        dump_buffer("Full configuration descriptor:",
+            full_config_descriptor, config_descriptor.total_length);
 
         dump_descriptor_tree(full_config_descriptor,
             config_descriptor.total_length);
 
-        /*
-         * Get supported languages of STRING descriptors.
-         */
-        l18_win_locales_t *langs;
-        size_t langs_count;
-        rc = usb_request_get_supported_languages(&ctrl_pipe,
-            &langs, &langs_count);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to get list of supported languages: %s.\n",
-                    str_error(rc));
-                goto skip_strings;
-        }
-
-        printf("String languages (%zu):", langs_count);
-        size_t i;
-        for (i = 0; i < langs_count; i++) {
-                printf(" 0x%04x", (int) langs[i]);
-        }
-        printf(".\n");
-
-        /*
-         * Dump all strings in all available langages;
-         */
-        for (i = 0; i < langs_count; i++) {
-                l18_win_locales_t lang = langs[i];
-
-                printf("%sStrings for language 0x%04x:\n", get_indent(0),
-                    (int) lang);
-
-                /*
-                 * Try all indexes - we will see what pops-up ;-).
-                 * However, to speed things up, we will stop after
-                 * encountering several broken (or nonexistent ones)
-                 * descriptors in line.
-                 */
-                size_t idx;
-                size_t failed_count = 0;
-                for (idx = 1; idx < 0xFF; idx++) {
-                        char *string;
-                        rc = usb_request_get_string(&ctrl_pipe, idx, lang,
-                            &string);
-                        if (rc != EOK) {
-                                failed_count++;
-                                if (failed_count > 3) {
-                                        break;
-                                }
-                                continue;
-                        }
-                        printf("%sString #%zu: \"%s\"\n", get_indent(1),
-                            idx, string);
-                        free(string);
-                        failed_count = 0; /* Reset failed counter. */
-                }
-        }
-
-
-skip_strings:
-
-        rc = EOK;
-
-leave:
-        /* Ignoring errors here. */
-        usb_endpoint_pipe_end_session(&ctrl_pipe);
-
-        return rc;
+        return EOK;
 }