Changeset b4b534ac in mainline for uspace/app/usbinfo/main.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

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>
@@ -198 +197 @@
 
                 /* The initialization is here only to make compiler happy. */
-                devman_handle_t hc_handle = 0;
-                usb_address_t dev_addr = 0;
-                int rc = usb_resolve_device_handle(devpath,
-                    &hc_handle, &dev_addr, NULL);
+                devman_handle_t handle = 0;
+                int rc = usb_resolve_device_handle(devpath, &handle);
                 if (rc != EOK) {
                         fprintf(stderr, NAME ": device `%s' not found "
@@ -209 +206 @@
                 }
 
-                usbinfo_device_t *dev = prepare_device(devpath,
-                    hc_handle, dev_addr);
-                if (dev == NULL) {
+                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);
                         continue;
                 }
@@ -221 +221 @@
                 while (actions[action].opt != 0) {
                         if (actions[action].active) {
-                                actions[action].action(dev);
+                                actions[action].action(usb_dev);
                         }
                         action++;
                 }
 
-                /* Destroy the control pipe (close the session etc.). */
-                destroy_device(dev);
+                usb_device_destroy(usb_dev);
         }