Changeset 2770b66 in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2017-10-15T15:05:06Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

816f5f4

Parents:

20eaa82

Message:

Fixed few bugs related to control transfers and some deadlocks. Registering control endpoint with HelenOS. Can read out device descriptors through MID and initialize mouse driver!

File:

• uspace/drv/bus/usb/xhci/transfers.c (modified) (4 diffs)

uspace/drv/bus/usb/xhci/transfers.c

@@ -145 +145 @@
         transfer->batch = batch;
         link_initialize(&transfer->link);
-        transfer->hc_buffer = malloc32(batch->buffer_size);
+        transfer->hc_buffer = batch->buffer_size > 0 ? malloc32(batch->buffer_size) : NULL;
 
         return transfer;
@@ -152 +152 @@
 void xhci_transfer_fini(xhci_transfer_t* transfer) {
         if (transfer) {
-                free32(transfer->hc_buffer);
+                if (transfer->batch->buffer_size > 0)
+                        free32(transfer->hc_buffer);
+
+                usb_transfer_batch_destroy(transfer->batch);
+
                 free(transfer);
         }
@@ -179 +183 @@
         /* For the TRB formats, see xHCI specification 6.4.1.2 */
         xhci_transfer_t *transfer = xhci_transfer_alloc(batch);
-        memcpy(transfer->hc_buffer, batch->buffer, batch->buffer_size);
+
+        if (!transfer->direction) {
+                // Sending stuff from host to device, we need to copy the actual data.
+                memcpy(transfer->hc_buffer, batch->buffer, batch->buffer_size);
+        }
 
         xhci_trb_t trb_setup;
@@ -318 +326 @@
         batch->transfered_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb);
         if (transfer->direction) {
+                memcpy(batch->buffer, transfer->hc_buffer, batch->buffer_size);
+
                 /* Device-to-host, IN */
                 if (batch->callback_in)