Changeset c6d5f08 in mainline

Timestamp:

2011-12-11T18:31:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fb2ef35

Parents:

ab517f4

Message:

usbinfo: Fix incompatibilities with communication framework.

Location:

uspace/app/usbinfo

Files:

• dev.c (modified) (2 diffs)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/dev.c

@@ -34 +34 @@
  * Representation of queried device.
  */
-#include <usb/dev/pipes.h>
+#include <usb/dev.h>
+#include <usb/hc.h>
 #include <errno.h>
 #include <str_error.h>
@@ -52 +53 @@
         bool transfer_started = false;
 
-        rc = usb_device_connection_initialize(&dev->wire, hc_handle, dev_addr);
+        usb_hc_connection_initialize(&dev->hc_conn, hc_handle);
+
+        rc = usb_device_connection_initialize(
+            &dev->wire, &dev->hc_conn, dev_addr);
         if (rc != EOK) {
                 fprintf(stderr,

uspace/app/usbinfo/usbinfo.h

@@ -44 +44 @@
 
 typedef struct {
+        usb_hc_connection_t hc_conn;
+        usb_device_connection_t wire;
         usb_pipe_t ctrl_pipe;
-        usb_device_connection_t wire;
         usb_standard_device_descriptor_t device_descriptor;
         uint8_t *full_configuration_descriptor;