Changeset 960bee9 in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-03-07T16:51:59Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

97ff14d

Parents:

a6add7a (diff), d4beec3 (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) (4 diffs)

uspace/drv/uhci-hcd/batch.h

@@ -42 +42 @@
 #include "uhci_struct/transfer_descriptor.h"
 #include "uhci_struct/queue_head.h"
+#include "utils/device_keeper.h"
 
 typedef struct batch
@@ -65 +66 @@
         ddf_fun_t *fun;
         queue_head_t *qh;
-        transfer_descriptor_t *tds;
+        td_t *tds;
         void (*next_step)(struct batch*);
+        device_keeper_t *manager;
 } batch_t;
 
@@ -74 +76 @@
                 char *setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out, void *arg);
+    usbhc_iface_transfer_out_callback_t func_out, void *arg,
+                device_keeper_t *manager
+                );
 
 bool batch_is_complete(batch_t *instance);
@@ -86 +90 @@
 void batch_interrupt_out(batch_t *instance);
 
-/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */
-void batch_control_setup_old(batch_t *instance);
+void batch_bulk_in(batch_t *instance);
 
-void batch_control_write_data_old(batch_t *instance);
-
-void batch_control_read_data_old(batch_t *instance);
-
-void batch_control_write_status_old(batch_t *instance);
-
-void batch_control_read_status_old(batch_t *instance);
+void batch_bulk_out(batch_t *instance);
 #endif
 /**