Changeset f974519 in mainline for uspace/drv/bus/usb/ohci/batch.c

Timestamp:

2011-08-25T16:14:58Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0815000

Parents:

09ace19

Message:

ohci: Fix double enqueue issue, refactoring

File:

• uspace/drv/bus/usb/ohci/batch.c (modified) (12 diffs)

uspace/drv/bus/usb/ohci/batch.c

@@ -61 +61 @@
                 batch_control_write(batch);
 }
-
+/*----------------------------------------------------------------------------*/
 void (*batch_setup[4][3])(usb_transfer_batch_t*) =
 {
@@ -98 +98 @@
         if (!instance)
                 return;
-        free32(instance->device_buffer);
         unsigned i = 0;
         if (instance->tds) {
@@ -107 +106 @@
                 free(instance->tds);
         }
+        free32(instance->device_buffer);
         free(instance);
 }
@@ -122 +122 @@
         } else (void)0
 
-        const ohci_endpoint_t *ohci_ep = ohci_endpoint_get(batch->ep);
-        assert(ohci_ep);
-
         ohci_transfer_batch_t *data = calloc(sizeof(ohci_transfer_batch_t), 1);
         CHECK_NULL_DISPOSE_RETURN(data, "Failed to allocate batch data.\n");
@@ -135 +132 @@
         }
 
-        /* We need an extra place for TD that is assigned to ohci_ep */
+        /* We need an extra place for TD that was left at ED */
         data->tds = calloc(sizeof(td_t*), data->td_count + 1);
         CHECK_NULL_DISPOSE_RETURN(data->tds,
@@ -141 +138 @@
 
         /* Add TD left over by the previous transfer */
-        data->tds[0] = ohci_ep->td;
+        data->ed = ohci_endpoint_get(batch->ep)->ed;
+        data->tds[0] = ohci_endpoint_get(batch->ep)->td;
         data->leave_td = 0;
         unsigned i = 1;
@@ -150 +148 @@
         }
 
-        data->ed = ohci_ep->ed;
-        batch->private_data = data;
-        batch->private_data_dtor = ohci_batch_dispose;
 
         /* NOTE: OHCI is capable of handling buffer that crosses page boundaries
@@ -163 +158 @@
                 CHECK_NULL_DISPOSE_RETURN(data->device_buffer,
                     "Failed to allocate device accessible buffer.\n");
+                /* Copy setup data */
                 memcpy(data->device_buffer, batch->setup_buffer,
                     batch->setup_size);
                 batch->data_buffer = data->device_buffer + batch->setup_size;
         }
+
+        batch->private_data = data;
+        batch->private_data_dtor = ohci_batch_dispose;
 
         assert(batch_setup[batch->ep->transfer_type][batch->ep->direction]);
@@ -221 +220 @@
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(instance->ep);
         assert(ohci_ep);
-        ohci_ep->td = data->tds[i];
+        ohci_ep->td = data->tds[data->leave_td];
         assert(i > 0);
         for (--i;i < data->td_count; ++i)
@@ -363 +362 @@
                 instance->setup_size, toggle);
         td_set_next(data->tds[0], data->tds[1]);
-        usb_log_debug("Created SETUP TD: %x:%x:%x:%x.\n", data->tds[0]->status,
-            data->tds[0]->cbp, data->tds[0]->next, data->tds[0]->be);
+        usb_log_debug("Created CONTROL SETUP TD: %x:%x:%x:%x.\n",
+            data->tds[0]->status, data->tds[0]->cbp, data->tds[0]->next,
+            data->tds[0]->be);
 
         /* data stage */
@@ -378 +378 @@
                     transfer_size, toggle);
                 td_set_next(data->tds[td_current], data->tds[td_current + 1]);
-                usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
+                usb_log_debug("Created CONTROL DATA TD: %x:%x:%x:%x.\n",
                     data->tds[td_current]->status, data->tds[td_current]->cbp,
                     data->tds[td_current]->next, data->tds[td_current]->be);
@@ -392 +392 @@
         td_init(data->tds[td_current], status_dir, NULL, 0, 1);
         td_set_next(data->tds[td_current], data->tds[td_current + 1]);
-        usb_log_debug("Created STATUS TD: %x:%x:%x:%x.\n",
+        usb_log_debug("Created CONTROL STATUS TD: %x:%x:%x:%x.\n",
             data->tds[td_current]->status, data->tds[td_current]->cbp,
             data->tds[td_current]->next, data->tds[td_current]->be);