Changes in uspace/app/usbinfo/main.c [bdddc9d:3e6a98c5] in mainline

File:

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

uspace/app/usbinfo/main.c

@@ -43 +43 @@
 #include <devman.h>
 #include <loc.h>
+#include <usb/hc.h>
 #include <usb/dev.h>
 #include <usb/dev/pipes.h>
@@ -197 +198 @@
 
                 /* The initialization is here only to make compiler happy. */
-                devman_handle_t handle = 0;
-                int rc = usb_resolve_device_handle(devpath, &handle);
+                devman_handle_t hc_handle = 0;
+                usb_address_t dev_addr = 0;
+                int rc = usb_resolve_device_handle(devpath,
+                    &hc_handle, &dev_addr, NULL);
                 if (rc != EOK) {
                         fprintf(stderr, NAME ": device `%s' not found "
@@ -206 +209 @@
                 }
 
-                usb_device_t *usb_dev = usb_device_create(handle);
-
-                if (usb_dev == NULL) {
-                        fprintf(stderr, NAME ": device `%s' not found "
-                            "or not of USB kind, skipping.\n",
-                            devpath);
+                usbinfo_device_t *dev = prepare_device(devpath,
+                    hc_handle, dev_addr);
+                if (dev == NULL) {
                         continue;
                 }
@@ -221 +221 @@
                 while (actions[action].opt != 0) {
                         if (actions[action].active) {
-                                actions[action].action(usb_dev);
+                                actions[action].action(dev);
                         }
                         action++;
                 }
 
-                usb_device_destroy(usb_dev);
+                /* Destroy the control pipe (close the session etc.). */
+                destroy_device(dev);
         }