Changeset 7943c43 in mainline for uspace/app/usbinfo/usbinfo.h

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

File:

• uspace/app/usbinfo/usbinfo.h (modified) (1 diff)

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;