Changes in uspace/drv/uhci-hcd/batch.c [bdc8ab1:eae83aa] in mainline

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -47 +47 @@
 static int batch_schedule(batch_t *instance);
 
-static void batch_control(
-    batch_t *instance, int data_stage, int status_stage);
+static void batch_control(batch_t *instance,
+    usb_packet_id data_stage, usb_packet_id status_stage);
+static void batch_data(batch_t *instance, usb_packet_id pid);
 static void batch_call_in(batch_t *instance);
 static void batch_call_out(batch_t *instance);
@@ -83 +84 @@
         }
 
-        instance->tds = malloc32(sizeof(transfer_descriptor_t) * instance->packets);
+        instance->tds = malloc32(sizeof(td_t) * instance->packets);
         if (instance->tds == NULL) {
                 usb_log_error("Failed to allocate transfer descriptors.\n");
@@ -90 +91 @@
                 return NULL;
         }
-        bzero(instance->tds, sizeof(transfer_descriptor_t) * instance->packets);
+        bzero(instance->tds, sizeof(td_t) * instance->packets);
 
         const size_t transport_size = max_packet_size * instance->packets;
@@ -151 +152 @@
         size_t i = 0;
         for (;i < instance->packets; ++i) {
-                if (transfer_descriptor_is_active(&instance->tds[i])) {
+                if (td_is_active(&instance->tds[i])) {
                         return false;
                 }
-                instance->error = transfer_descriptor_status(&instance->tds[i]);
+
+                instance->error = td_status(&instance->tds[i]);
                 if (instance->error != EOK) {
+                        usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
+                            instance, i, instance->tds[i].status);
                         if (i > 0)
-                                instance->transfered_size -= instance->setup_size;
-                        usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
-                          instance, i, instance->tds[i].status);
+                                goto substract_ret;
                         return true;
                 }
-                instance->transfered_size +=
-                    transfer_descriptor_actual_size(&instance->tds[i]);
-        }
+
+                instance->transfered_size += td_act_size(&instance->tds[i]);
+                if (td_is_short(&instance->tds[i]))
+                        goto substract_ret;
+        }
+substract_ret:
         instance->transfered_size -= instance->setup_size;
         return true;
@@ -192 +197 @@
 {
         assert(instance);
-
+        batch_data(instance, USB_PID_IN);
+        instance->next_step = batch_call_in_and_dispose;
+        usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
+        batch_schedule(instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_interrupt_out(batch_t *instance)
+{
+        assert(instance);
+        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
+        batch_data(instance, USB_PID_OUT);
+        instance->next_step = batch_call_out_and_dispose;
+        usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
+        batch_schedule(instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_bulk_in(batch_t *instance)
+{
+        assert(instance);
+        batch_data(instance, USB_PID_IN);
+        instance->next_step = batch_call_in_and_dispose;
+        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
+        batch_schedule(instance);
+}
+/*----------------------------------------------------------------------------*/
+void batch_bulk_out(batch_t *instance)
+{
+        assert(instance);
+        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
+        batch_data(instance, USB_PID_OUT);
+        instance->next_step = batch_call_out_and_dispose;
+        usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
+        batch_schedule(instance);
+}
+/*----------------------------------------------------------------------------*/
+static void batch_data(batch_t *instance, usb_packet_id pid)
+{
+        assert(instance);
         const bool low_speed = instance->speed == USB_SPEED_LOW;
         int toggle = 1;
-        size_t i = 0;
-        for (;i < instance->packets; ++i) {
+
+        size_t packet = 0;
+        size_t remain_size = instance->buffer_size;
+        while (remain_size > 0) {
                 char *data =
-                    instance->transport_buffer + (i  * instance->max_packet_size);
-                transfer_descriptor_t *next = (i + 1) < instance->packets ?
-                    &instance->tds[i + 1] : NULL;
+                    instance->transport_buffer + instance->buffer_size
+                    - remain_size;
+
                 toggle = 1 - toggle;
 
-                transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT,
-                    instance->max_packet_size, toggle, false, low_speed,
-                    instance->target, USB_PID_IN, data, next);
-        }
-
-        instance->tds[i - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
-
-        instance->next_step = batch_call_in_and_dispose;
-        usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
-        batch_schedule(instance);
-}
-/*----------------------------------------------------------------------------*/
-void batch_interrupt_out(batch_t *instance)
-{
-        assert(instance);
-        memcpy(instance->transport_buffer, instance->buffer, instance->buffer_size);
-
-        const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = 1;
-        size_t i = 0;
-        for (;i < instance->packets; ++i) {
-                char *data =
-                    instance->transport_buffer + (i  * instance->max_packet_size);
-                transfer_descriptor_t *next = (i + 1) < instance->packets ?
-                    &instance->tds[i + 1] : NULL;
-                toggle = 1 - toggle;
-
-                transfer_descriptor_init(&instance->tds[i], DEFAULT_ERROR_COUNT,
-                    instance->max_packet_size, toggle++, false, low_speed,
-                    instance->target, USB_PID_OUT, data, next);
-        }
-
-        instance->tds[i - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
-
-        instance->next_step = batch_call_out_and_dispose;
-        usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
-        batch_schedule(instance);
-}
-/*----------------------------------------------------------------------------*/
-static void batch_control(
-    batch_t *instance, int data_stage, int status_stage)
+                const size_t packet_size =
+                    (instance->max_packet_size > remain_size) ?
+                    remain_size : instance->max_packet_size;
+
+                td_init(&instance->tds[packet],
+                    DEFAULT_ERROR_COUNT, packet_size, toggle, false, low_speed,
+                    instance->target, pid, data,
+                    &instance->tds[packet + 1]);
+
+                ++packet;
+                assert(packet <= instance->packets);
+                assert(packet_size <= remain_size);
+                remain_size -= packet_size;
+        }
+
+        instance->tds[packet - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
+        instance->tds[packet - 1].next = 0 | LINK_POINTER_TERMINATE_FLAG;
+}
+/*----------------------------------------------------------------------------*/
+static void batch_control(batch_t *instance,
+   usb_packet_id data_stage, usb_packet_id status_stage)
 {
         assert(instance);
@@ -250 +274 @@
         int toggle = 0;
         /* setup stage */
-        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
+        td_init(instance->tds, DEFAULT_ERROR_COUNT,
             instance->setup_size, toggle, false, low_speed, instance->target,
             USB_PID_SETUP, instance->setup_buffer, &instance->tds[1]);
@@ -268 +292 @@
                     remain_size : instance->max_packet_size;
 
-                transfer_descriptor_init(&instance->tds[packet],
+                td_init(&instance->tds[packet],
                     DEFAULT_ERROR_COUNT, packet_size, toggle, false, low_speed,
                     instance->target, data_stage, data,
@@ -281 +305 @@
         /* status stage */
         assert(packet == instance->packets - 1);
-        transfer_descriptor_init(&instance->tds[packet], DEFAULT_ERROR_COUNT,
+        td_init(&instance->tds[packet], DEFAULT_ERROR_COUNT,
             0, 1, false, low_speed, instance->target, status_stage, NULL, NULL);