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

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -47 +47 @@
 static int batch_schedule(batch_t *instance);
 
-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_control(
+    batch_t *instance, int data_stage, int status_stage);
+static void batch_data(batch_t *instance, int pid);
 static void batch_call_in(batch_t *instance);
 static void batch_call_out(batch_t *instance);
@@ -84 +84 @@
         }
 
-        instance->tds = malloc32(sizeof(td_t) * instance->packets);
+        instance->tds = malloc32(sizeof(transfer_descriptor_t) * instance->packets);
         if (instance->tds == NULL) {
                 usb_log_error("Failed to allocate transfer descriptors.\n");
@@ -91 +91 @@
                 return NULL;
         }
-        bzero(instance->tds, sizeof(td_t) * instance->packets);
+        bzero(instance->tds, sizeof(transfer_descriptor_t) * instance->packets);
 
         const size_t transport_size = max_packet_size * instance->packets;
@@ -152 +152 @@
         size_t i = 0;
         for (;i < instance->packets; ++i) {
-                if (td_is_active(&instance->tds[i])) {
+                if (transfer_descriptor_is_active(&instance->tds[i])) {
                         return false;
                 }
-
-                instance->error = td_status(&instance->tds[i]);
+                instance->error = transfer_descriptor_status(&instance->tds[i]);
                 if (instance->error != EOK) {
+                        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);
-                        if (i > 0)
-                                goto substract_ret;
+                          instance, i, instance->tds[i].status);
                         return true;
                 }
-
-                instance->transfered_size += td_act_size(&instance->tds[i]);
-                if (td_is_short(&instance->tds[i]))
-                        goto substract_ret;
-        }
-substract_ret:
+                instance->transfered_size +=
+                    transfer_descriptor_actual_size(&instance->tds[i]);
+        }
         instance->transfered_size -= instance->setup_size;
         return true;
@@ -232 +228 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_data(batch_t *instance, usb_packet_id pid)
+static void batch_data(batch_t *instance, int pid)
 {
         assert(instance);
@@ -251 +247 @@
                     remain_size : instance->max_packet_size;
 
-                td_init(&instance->tds[packet],
+                transfer_descriptor_init(&instance->tds[packet],
                     DEFAULT_ERROR_COUNT, packet_size, toggle, false, low_speed,
                     instance->target, pid, data,
@@ -266 +262 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_control(batch_t *instance,
-   usb_packet_id data_stage, usb_packet_id status_stage)
+static void batch_control(
+    batch_t *instance, int data_stage, int status_stage)
 {
         assert(instance);
@@ -274 +270 @@
         int toggle = 0;
         /* setup stage */
-        td_init(instance->tds, DEFAULT_ERROR_COUNT,
+        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
             instance->setup_size, toggle, false, low_speed, instance->target,
             USB_PID_SETUP, instance->setup_buffer, &instance->tds[1]);
@@ -292 +288 @@
                     remain_size : instance->max_packet_size;
 
-                td_init(&instance->tds[packet],
+                transfer_descriptor_init(&instance->tds[packet],
                     DEFAULT_ERROR_COUNT, packet_size, toggle, false, low_speed,
                     instance->target, data_stage, data,
@@ -305 +301 @@
         /* status stage */
         assert(packet == instance->packets - 1);
-        td_init(&instance->tds[packet], DEFAULT_ERROR_COUNT,
+        transfer_descriptor_init(&instance->tds[packet], DEFAULT_ERROR_COUNT,
             0, 1, false, low_speed, instance->target, status_stage, NULL, NULL);