Changeset 8961c22 in mainline for uspace/drv/uhci-hcd/batch.c

Timestamp:

2011-04-09T08:35:58Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1e1b1a9

Parents:

3e490eb (diff), 61727bf (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 with usb/development

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -80 +80 @@
  * transaction and callback.
  */
-usb_transfer_batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
-    usb_transfer_type_t transfer_type, size_t max_packet_size,
-    usb_speed_t speed, char *buffer, size_t buffer_size,
-    char* setup_buffer, size_t setup_size,
+usb_transfer_batch_t * batch_get(ddf_fun_t *fun, endpoint_t *ep,
+    char *buffer, size_t buffer_size, 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, endpoint_t *ep
-    )
-{
+    usbhc_iface_transfer_out_callback_t func_out, void *arg)
+{
+        assert(ep);
         assert(func_in == NULL || func_out == NULL);
         assert(func_in != NULL || func_out != NULL);
@@ -103 +101 @@
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
+        usb_target_t target =
+            { .address = ep->address, .endpoint = ep->endpoint };
         usb_transfer_batch_init(instance, target,
-            transfer_type, speed, max_packet_size,
+            ep->transfer_type, ep->speed, ep->max_packet_size,
             buffer, NULL, buffer_size, NULL, setup_size, func_in,
             func_out, arg, fun, ep, NULL);
@@ -115 +115 @@
         instance->private_data = data;
 
-        data->transfers = (buffer_size + max_packet_size - 1) / max_packet_size;
-        if (transfer_type == USB_TRANSFER_CONTROL) {
+        data->transfers =
+            (buffer_size + ep->max_packet_size - 1) / ep->max_packet_size;
+        if (ep->transfer_type == USB_TRANSFER_CONTROL) {
                 data->transfers += 2;
         }
@@ -178 +179 @@
                             instance, i, data->tds[i].status);
                         td_print_status(&data->tds[i]);
-                        if (instance->ep != NULL)
-                                endpoint_toggle_set(instance->ep,
-                                    td_toggle(&data->tds[i]));
+                        assert(instance->ep != NULL);
+
+                        endpoint_toggle_set(instance->ep,
+                            td_toggle(&data->tds[i]));
                         if (i > 0)
                                 goto substract_ret;