Changeset 2e1d5d70 in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-03-21T10:30:06Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0e45e7f, f8e1a2c

Parents:

f0fdc7d (diff), 79c8a96 (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:

Host controller refactoring, move shared stuff to libusb/host

File:

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

uspace/drv/uhci-hcd/batch.h

@@ -39 +39 @@
 #include <usbhc_iface.h>
 #include <usb/usb.h>
+#include <usb/host/device_keeper.h>
+#include <usb/host/batch.h>
 
-#include "uhci_struct/transfer_descriptor.h"
 #include "uhci_struct/queue_head.h"
-#include "utils/device_keeper.h"
-
-typedef struct batch
-{
-        link_t link;
-        usb_speed_t speed;
-        usb_target_t target;
-        usb_transfer_type_t transfer_type;
-        usbhc_iface_transfer_in_callback_t callback_in;
-        usbhc_iface_transfer_out_callback_t callback_out;
-        void *arg;
-        char *transport_buffer;
-        char *setup_buffer;
-        size_t setup_size;
-        char *buffer;
-        size_t buffer_size;
-        size_t max_packet_size;
-        size_t packets;
-        size_t transfered_size;
-        int error;
-        ddf_fun_t *fun;
-        qh_t *qh;
-        td_t *tds;
-        void (*next_step)(struct batch*);
-        device_keeper_t *manager;
-} batch_t;
 
 batch_t * batch_get(
@@ -87 +62 @@
 void batch_dispose(batch_t *instance);
 
-void batch_abort(batch_t *instance);
-
 bool batch_is_complete(batch_t *instance);
 
@@ -102 +75 @@
 
 void batch_bulk_out(batch_t *instance);
+
+qh_t * batch_qh(batch_t *instance);
 #endif
 /**