Changeset 918e1e84 in mainline for uspace/app/usbinfo/list.c

Timestamp:

2013-01-15T20:01:29Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ef4e8eb

Parents:

16b64b8

Message:

usbinfo: Remove the old way to list devices.

File:

• uspace/app/usbinfo/list.c (modified) (4 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>
 
@@ -60 +58 @@
 {
         printf("  Device %02d: %s\n", addr, path);
-}
-
-static void print_hc_devices(devman_handle_t hc_handle)
-{
-        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);
-                if (rc != EOK) {
-                        continue;
-                }
-                char path[MAX_PATH_LENGTH];
-                rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
-                if (rc != EOK) {
-                        continue;
-                }
-                print_found_dev(addr, path);
-        }
-        usb_hc_connection_close(&conn);
 }
 
@@ -155 +124 @@
         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 %"
@@ -169 +138 @@
                 }
                 print_found_hc(svcs[i], path);
-                (void)print_hc_devices;
 
                 // TODO replace this with something sane