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

Timestamp:

2011-04-12T10:09:56Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

508a0ca

Parents:

f13381b

Message:

Remove EP information stored in usb_transfer_batch_t

rename usb_transfer_batch_t.transport_buffer ⇒ data_buffer

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -103 +103 @@
         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, buffer, NULL, buffer_size, NULL, setup_size,
-            func_in, func_out, arg, fun, ep, NULL);
+        usb_transfer_batch_init(instance, ep,
+            buffer, NULL, buffer_size, NULL, setup_size,
+            func_in, func_out, arg, fun, NULL);
 
 
@@ -131 +131 @@
 
         if (buffer_size > 0) {
-                instance->transport_buffer = malloc32(buffer_size);
-                CHECK_NULL_DISPOSE_RETURN(instance->transport_buffer,
+                instance->data_buffer = malloc32(buffer_size);
+                CHECK_NULL_DISPOSE_RETURN(instance->data_buffer,
                     "Failed to allocate device accessible buffer.\n");
         }
@@ -205 +205 @@
         assert(instance);
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
-            instance->buffer_size);
+        memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
         batch_control(instance, USB_PID_OUT, USB_PID_IN);
         instance->next_step = batch_call_out_and_dispose;
@@ -235 +234 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_IN;
+//      instance->direction = USB_DIRECTION_IN;
         batch_data(instance, USB_PID_IN);
         instance->next_step = batch_call_in_and_dispose;
@@ -250 +249 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_OUT;
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
-            instance->buffer_size);
+        memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
         batch_data(instance, USB_PID_OUT);
         instance->next_step = batch_call_out_and_dispose;
@@ -269 +266 @@
         assert(instance);
         batch_data(instance, USB_PID_IN);
-        instance->direction = USB_DIRECTION_IN;
         instance->next_step = batch_call_in_and_dispose;
         usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
@@ -283 +279 @@
 {
         assert(instance);
-        instance->direction = USB_DIRECTION_OUT;
         /* We are data out, we are supposed to provide data */
-        memcpy(instance->transport_buffer, instance->buffer,
+        memcpy(instance->data_buffer, instance->buffer,
             instance->buffer_size);
         batch_data(instance, USB_PID_OUT);
@@ -306 +301 @@
         assert(data);
 
-        const bool low_speed = instance->speed == USB_SPEED_LOW;
+        const bool low_speed = instance->ep->speed == USB_SPEED_LOW;
         int toggle = endpoint_toggle_get(instance->ep);
         assert(toggle == 0 || toggle == 1);
@@ -314 +309 @@
         while (remain_size > 0) {
                 char *trans_data =
-                    instance->transport_buffer + instance->buffer_size
+                    instance->data_buffer + instance->buffer_size
                     - remain_size;
 
                 const size_t packet_size =
-                    (instance->max_packet_size > remain_size) ?
-                    remain_size : instance->max_packet_size;
+                    (instance->ep->max_packet_size > remain_size) ?
+                    remain_size : instance->ep->max_packet_size;
 
                 td_t *next_transfer = (transfer + 1 < data->transfers)
@@ -326 +321 @@
                 assert(transfer < data->transfers);
                 assert(packet_size <= remain_size);
+                usb_target_t target =
+                    { instance->ep->address, instance->ep->endpoint };
 
                 td_init(
                     &data->tds[transfer], DEFAULT_ERROR_COUNT, packet_size,
-                    toggle, false, low_speed, instance->target, pid, trans_data,
+                    toggle, false, low_speed, target, pid, trans_data,
                     next_transfer);
 
@@ -360 +357 @@
         assert(data->transfers >= 2);
 
-        const bool low_speed = instance->speed == USB_SPEED_LOW;
+        const bool low_speed = instance->ep->speed == USB_SPEED_LOW;
         int toggle = 0;
+        const usb_target_t target =
+            { instance->ep->address, instance->ep->endpoint };
+
         /* setup stage */
         td_init(
             data->tds, DEFAULT_ERROR_COUNT, instance->setup_size, toggle, false,
-            low_speed, instance->target, USB_PID_SETUP, instance->setup_buffer,
+            low_speed, target, USB_PID_SETUP, instance->setup_buffer,
             &data->tds[1]);
 
@@ -373 +373 @@
         while (remain_size > 0) {
                 char *control_data =
-                    instance->transport_buffer + instance->buffer_size
+                    instance->data_buffer + instance->buffer_size
                     - remain_size;
 
@@ -379 +379 @@
 
                 const size_t packet_size =
-                    (instance->max_packet_size > remain_size) ?
-                    remain_size : instance->max_packet_size;
+                    (instance->ep->max_packet_size > remain_size) ?
+                    remain_size : instance->ep->max_packet_size;
 
                 td_init(
                     &data->tds[transfer], DEFAULT_ERROR_COUNT, packet_size,
-                    toggle, false, low_speed, instance->target, data_stage,
+                    toggle, false, low_speed, target, data_stage,
                     control_data, &data->tds[transfer + 1]);
 
@@ -398 +398 @@
         td_init(
             &data->tds[transfer], DEFAULT_ERROR_COUNT, 0, 1, false, low_speed,
-            instance->target, status_stage, NULL, NULL);
+            target, status_stage, NULL, NULL);
         td_set_ioc(&data->tds[transfer]);
 
@@ -449 +449 @@
         free32(data->qh);
         free32(instance->setup_buffer);
-        free32(instance->transport_buffer);
+        free32(instance->data_buffer);
         free(data);
         free(instance);