Changes in uspace/drv/uhci-hcd/batch.c [feb10c88:4ca18ae] in mainline

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, endpoint_t *ep,
-    char *buffer, size_t buffer_size, char* setup_buffer, size_t setup_size,
+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,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out, void *arg)
-{
-        assert(ep);
+    usbhc_iface_transfer_out_callback_t func_out, void *arg, endpoint_t *ep
+    )
+{
         assert(func_in == NULL || func_out == NULL);
         assert(func_in != NULL || func_out != NULL);
@@ -101 +103 @@
         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,
-            ep->transfer_type, ep->speed, ep->max_packet_size,
+            transfer_type, speed, 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 + ep->max_packet_size - 1) / ep->max_packet_size;
-        if (ep->transfer_type == USB_TRANSFER_CONTROL) {
+        data->transfers = (buffer_size + max_packet_size - 1) / max_packet_size;
+        if (transfer_type == USB_TRANSFER_CONTROL) {
                 data->transfers += 2;
         }
@@ -179 +178 @@
                             instance, i, data->tds[i].status);
                         td_print_status(&data->tds[i]);
-                        assert(instance->ep != NULL);
-
-                        endpoint_toggle_set(instance->ep,
-                            td_toggle(&data->tds[i]));
+                        if (instance->ep != NULL)
+                                endpoint_toggle_set(instance->ep,
+                                    td_toggle(&data->tds[i]));
                         if (i > 0)
                                 goto substract_ret;