Changeset 50ba203 in mainline for uspace/app/usbinfo/info.c

Timestamp:

2011-02-20T15:46:48Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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 with usb/development

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"
@@ -47 +48 @@
         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);
 
         /*
@@ -95 +73 @@
                 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);
 
         /*
@@ -141 +133 @@
 leave:
         /* Ignoring errors here. */
-        async_hangup(hc_phone);
         usb_endpoint_pipe_end_session(&ctrl_pipe);