Changes in uspace/app/usbinfo/list.c [3e6a98c5:fe9d542] in mainline

File:

• uspace/app/usbinfo/list.c (modified) (6 diffs)

uspace/app/usbinfo/list.c

@@ -44 +44 @@
 #include <devman.h>
 #include <loc.h>
-#include <usb/dev/hub.h>
-#include <usb/hc.h>
+#include <usb_iface.h>
 
 #include "usbinfo.h"
 
-#define MAX_USB_ADDRESS USB11_ADDRESS_MAX
 #define MAX_PATH_LENGTH 1024
 
@@ -61 +59 @@
 }
 
-static void print_hc_devices(devman_handle_t hc_handle)
+static void print_usb_devices(devman_handle_t bus_handle,
+    devman_handle_t *fhs, size_t count)
 {
-        int rc;
-        usb_hc_connection_t conn;
-
-        usb_hc_connection_initialize(&conn, hc_handle);
-        rc = usb_hc_connection_open(&conn);
-        if (rc != EOK) {
-                printf(NAME ": failed to connect to HC: %s.\n",
-                    str_error(rc));
-                return;
-        }
-        usb_address_t addr;
-        for (addr = 1; addr < MAX_USB_ADDRESS; addr++) {
-                devman_handle_t dev_handle;
-                rc = usb_hc_get_handle_by_address(&conn, addr, &dev_handle);
+        for (size_t i = 0; i < count; ++i) {
+                /* Skip hc ctl function */
+                if (fhs[i] == bus_handle)
+                        continue;
+                char path[MAX_PATH_LENGTH];
+                int rc = devman_fun_get_path(fhs[i], path, MAX_PATH_LENGTH);
                 if (rc != EOK) {
+                        printf(NAME "Failed to get path for device %" PRIun
+                            "\n", fhs[i]);
                         continue;
                 }
-                char path[MAX_PATH_LENGTH];
-                rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
-                if (rc != EOK) {
+                // TODO remove this. Device name contains USB address
+                // and addresses as external id are going away
+                usb_dev_session_t *sess = usb_dev_connect(fhs[i]);
+                if (!sess) {
+                        printf(NAME "Failed to connect to device %" PRIun
+                            "\n", fhs[i]);
                         continue;
                 }
-                print_found_dev(addr, path);
+                async_exch_t *exch = async_exchange_begin(sess);
+                if (!exch) {
+                        printf("Failed to create exchange to dev %" PRIun
+                            "\n", fhs[i]);
+                        usb_dev_disconnect(sess);
+                        continue;
+                }
+                usb_address_t address;
+                rc = usb_get_my_address(exch, &address);
+                async_exchange_end(exch);
+                usb_dev_disconnect(sess);
+                if (rc != EOK) {
+                        printf("Failed to get address for device %" PRIun
+                            "\n", fhs[i]);
+                        continue;
+                }
+                print_found_dev(address, path);
+
         }
-        usb_hc_connection_close(&conn);
 }
 
@@ -95 +107 @@
         service_id_t *svcs;
         size_t count;
-        size_t i;
         int rc;
 
@@ -111 +122 @@
         }
 
-        for (i = 0; i < count; i++) {
+        for (unsigned i = 0; i < count; ++i) {
                 devman_handle_t hc_handle = 0;
-                int rc = usb_ddf_get_hc_handle_by_sid(svcs[i], &hc_handle);
+                int rc = devman_fun_sid_to_handle(svcs[i], &hc_handle);
                 if (rc != EOK) {
                         printf(NAME ": Error resolving handle of HC with SID %"
@@ -119 +130 @@
                         continue;
                 }
+
                 char path[MAX_PATH_LENGTH];
                 rc = devman_fun_get_path(hc_handle, path, MAX_PATH_LENGTH);
@@ -127 +139 @@
                 }
                 print_found_hc(svcs[i], path);
-                print_hc_devices(hc_handle);
+
+                /* Construct device's path.
+                 * That's "hc function path" - ( '/' + "hc function name" ) */
+                // TODO replace this with something sane
+                char name[10];
+                rc = devman_fun_get_name(hc_handle, name, 10);
+                if (rc != EOK) {
+                        printf(NAME ": Error resolving name of HC with SID %"
+                            PRIun ", skipping.\n", svcs[i]);
+                        continue;
+                }
+
+                devman_handle_t fh;
+                path[str_size(path) - str_size(name) - 1] = '\0';
+                rc = devman_fun_get_handle(path, &fh, IPC_FLAG_BLOCKING);
+                if (rc != EOK) {
+                        printf(NAME ": Error resolving parent handle of HC with"
+                            " SID %" PRIun ", skipping.\n", svcs[i]);
+                        continue;
+                }
+                devman_handle_t dh;
+                rc = devman_fun_get_child(fh, &dh);
+                if (rc != EOK) {
+                        printf(NAME ": Error resolving parent handle of HC with"
+                            " SID %" PRIun ", skipping.\n", svcs[i]);
+                        continue;
+                }
+                devman_handle_t *fhs = 0;
+                size_t count;
+                rc = devman_dev_get_functions(dh, &fhs, &count);
+                if (rc != EOK) {
+                        printf(NAME ": Error siblings of HC with"
+                            " SID %" PRIun ", skipping.\n", svcs[i]);
+                        continue;
+                }
+                print_usb_devices(hc_handle, fhs, count);
+                free(fhs);
         }