Changes in uspace/drv/uhci-hcd/batch.h [17ceb72:5620bd4] in mainline

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 drvusbuhcihc
+/** @addtogroup usb
  * @{
  */
 /** @file
- * @brief UHCI driver USB transaction structure
+ * @brief UHCI driver
  */
 #ifndef DRV_UHCI_BATCH_H
@@ -50 +50 @@
         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;
+        union {
+                usbhc_iface_transfer_in_callback_t callback_in;
+                usbhc_iface_transfer_out_callback_t callback_out;
+        };
         void *arg;
         char *transport_buffer;
@@ -63 +65 @@
         int error;
         ddf_fun_t *fun;
-        qh_t *qh;
+        queue_head_t *qh;
         td_t *tds;
         void (*next_step)(struct batch*);
@@ -77 +79 @@
                 device_keeper_t *manager
                 );
-
-void batch_dispose(batch_t *instance);
 
 bool batch_is_complete(batch_t *instance);