Changeset 1b0b86e6 in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-03-13T22:02:44Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b7d8fd9

Parents:

67f54965 (diff), deb4ba7 (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 development/ changes

File:

• uspace/drv/uhci-hcd/batch.h (modified) (2 diffs)

uspace/drv/uhci-hcd/batch.h

@@ -50 +50 @@
         usb_target_t target;
         usb_transfer_type_t transfer_type;
-        union {
-                usbhc_iface_transfer_in_callback_t callback_in;
-                usbhc_iface_transfer_out_callback_t callback_out;
-        };
+        usbhc_iface_transfer_in_callback_t callback_in;
+        usbhc_iface_transfer_out_callback_t callback_out;
         void *arg;
         char *transport_buffer;
@@ -65 +63 @@
         int error;
         ddf_fun_t *fun;
-        queue_head_t *qh;
+        qh_t *qh;
         td_t *tds;
         void (*next_step)(struct batch*);