Changeset 06f9a9c9 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2013-01-27T13:17:49Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e2dfa86

Parents:

5b401b9

Message:

usbinfo: Switch to library provided usb_device_t.

File:

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

uspace/app/usbinfo/main.c

@@ -198 +198 @@
 
                 /* The initialization is here only to make compiler happy. */
-                devman_handle_t hc_handle = 0;
-                usb_address_t dev_addr = 0;
+                devman_handle_t handle = 0;
                 int rc = usb_resolve_device_handle(devpath,
-                    &hc_handle, &dev_addr, NULL);
+                    NULL, NULL, &handle);
                 if (rc != EOK) {
                         fprintf(stderr, NAME ": device `%s' not found "
@@ -209 +208 @@
                 }
 
-                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) {
                         continue;
                 }
@@ -221 +220 @@
                 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);
         }