Changeset 4f66cc7b in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-03-17T12:45:23Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4fec9ee, 6e3b9a58

Parents:

45dd8bf (diff), 039c66c (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:

Merged development changes

File:

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

uspace/drv/uhci-hcd/batch.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup drvusbuhcihc
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief UHCI driver USB transaction structure
  */
 #ifndef DRV_UHCI_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*);
@@ -79 +77 @@
                 device_keeper_t *manager
                 );
+
+void batch_dispose(batch_t *instance);
 
 bool batch_is_complete(batch_t *instance);