Changeset 474d08e in mainline for uspace/drv/uhci-hcd/batch.c

Timestamp:

2011-03-05T00:44:27Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

00db345a, d20f211

Parents:

80fdffe (diff), eae83aa (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:

Refactoring and SPD support

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, int data_stage, int status_stage);
-static void batch_data(batch_t *instance, int pid);
+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);
@@ -84 +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");
@@ -91 +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;
@@ -152 +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;
@@ -228 +232 @@
 }
 /*----------------------------------------------------------------------------*/
-static void batch_data(batch_t *instance, int pid)
+static void batch_data(batch_t *instance, usb_packet_id pid)
 {
         assert(instance);
@@ -247 +251 @@
                     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, pid, data,
@@ -262 +266 @@
 }
 /*----------------------------------------------------------------------------*/
-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)
 {
         assert(instance);
@@ -270 +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]);
@@ -288 +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,
@@ -301 +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);