Changes in uspace/app/usbinfo/info.c [4e8e1f5:a12917e] in mainline

File:

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

uspace/app/usbinfo/info.c

@@ -39 +39 @@
 #include <usb/usbdrv.h>
 #include <usb/pipes.h>
-#include <usb/recognise.h>
 #include <usb/request.h>
 #include "usbinfo.h"
@@ -48 +47 @@
         usb_device_connection_t wire;
         usb_endpoint_pipe_t ctrl_pipe;
+        ctrl_pipe.hc_phone = -1;
+
+        int hc_phone = devman_device_connect(hc_handle, 0);
+        if (hc_phone < 0) {
+                fprintf(stderr,
+                    NAME ": failed to connect to host controller (%zu): %s.\n",
+                        (size_t) hc_handle, str_error(hc_phone));
+                return hc_phone;
+        }
+
+        /*
+         * Dump information about possible match ids.
+         */
+        match_id_list_t match_id_list;
+        init_match_ids(&match_id_list);
+        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;
+        }
+        dump_match_ids(&match_id_list);
 
         /*
@@ -73 +95 @@
                 goto leave;
         }
-
-        /*
-         * Dump information about possible match ids.
-         */
-        match_id_list_t match_id_list;
-        init_match_ids(&match_id_list);
-        rc = usb_device_create_match_ids(&ctrl_pipe, &match_id_list);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to fetch match ids of the device: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        dump_match_ids(&match_id_list);
 
         /*
@@ -133 +141 @@
 leave:
         /* Ignoring errors here. */
+        ipc_hangup(hc_phone);
         usb_endpoint_pipe_end_session(&ctrl_pipe);